diff --git a/Android.mk b/Android.mk
index 9cb7e2e..81f04f7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,6 +19,7 @@
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 include frameworks/opt/setupwizard/navigationbar/common.mk
+include frameworks/opt/setupwizard/library/common.mk
 include frameworks/base/packages/SettingsLib/common.mk
 
 include $(BUILD_PACKAGE)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 98516ed..f47ef0d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -158,6 +158,17 @@
                 android:value="true" />
         </activity>
 
+        <activity android:name="AirplaneModeVoiceActivity"
+                android:label="@string/wireless_networks_settings_title"
+                android:theme="@android:style/Theme.Material.Light.Voice"
+                android:exported="true">
+            <intent-filter>
+                <action android:name="android.settings.VOICE_CONTROL_AIRPLANE_MODE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE" />
+            </intent-filter>
+        </activity>
+
         <!-- Top-level settings -->
 
         <activity android:name="Settings$WifiSettingsActivity"
@@ -298,6 +309,19 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".wifi.WifiNoInternetDialog"
+                  android:clearTaskOnLaunch="true"
+                  android:excludeFromRecents="true"
+                  android:exported="true"
+                  android:permission="android.permission.CONNECTIVITY_INTERNAL"
+                  android:taskAffinity=""
+                  android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
+            <intent-filter>
+                <action android:name="android.net.conn.PROMPT_UNVALIDATED" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <!-- Suspect activity alias: targetActivity is Settings itself, does not define a name. Remove? -->
         <activity-alias android:name=".wifi.WifiApSettings"
                 android:targetActivity="Settings">
@@ -696,6 +720,10 @@
                 <action android:name="android.settings.ZEN_MODE_AUTOMATION_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.ACTION_CONDITION_PROVIDER_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -709,6 +737,46 @@
                 android:value="true" />
         </activity>
 
+        <activity android:name="Settings$ZenModeScheduleRuleSettingsActivity"
+                android:exported="true"
+                android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.ZEN_MODE_SCHEDULE_RULE_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="com.android.settings.SHORTCUT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.notification.ZenModeScheduleRuleSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/notification_settings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
+        </activity>
+
+        <activity android:name="Settings$ZenModeExternalRuleSettingsActivity"
+                android:exported="true"
+                android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.ZEN_MODE_EXTERNAL_RULE_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="com.android.settings.SHORTCUT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.notification.ZenModeExternalRuleSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/notification_settings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
+        </activity>
+
         <activity android:name="Settings$HomeSettingsActivity"
                 android:label="@string/home_settings"
                 android:taskAffinity="">
@@ -952,6 +1020,16 @@
                 android:value="com.android.settings.notification.NotificationStation" />
         </activity>
 
+        <activity android:name=".notification.ZenModeVoiceActivity"
+                android:theme="@android:style/Theme.Material.Light"
+                android:label="@string/zen_mode_interruptions_voice_title">
+            <intent-filter>
+                <action android:name="android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE" />
+            </intent-filter>
+        </activity>
+
         <!--
         <activity android:name="Settings$AppOpsSummaryActivity"
                 android:label="@string/app_ops_settings"
@@ -1279,22 +1357,26 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="ConfirmLockPattern"/>
+        <activity android:name="ConfirmLockPattern"
+            android:theme="@style/Theme.ConfirmDeviceCredentials"/>
 
         <activity android:name="ConfirmLockPassword"
-            android:windowSoftInputMode="stateVisible|adjustResize"/>
+            android:windowSoftInputMode="stateVisible|adjustResize"
+            android:theme="@style/Theme.ConfirmDeviceCredentials"/>
 
         <activity android:name="FingerprintSettings" android:exported="false"/>
         <activity android:name="FingerprintEnroll" android:exported="false"/>
 
         <!-- Note this must not be exported since it returns the password in the intent -->
         <activity android:name="ConfirmLockPattern$InternalActivity"
-            android:exported="false"/>
+            android:exported="false"
+            android:theme="@style/Theme.ConfirmDeviceCredentials"/>
 
         <!-- Note this must not be exported since it returns the password in the intent -->
         <activity android:name="ConfirmLockPassword$InternalActivity"
             android:exported="false"
-            android:windowSoftInputMode="stateVisible|adjustResize"/>
+            android:windowSoftInputMode="stateVisible|adjustResize"
+            android:theme="@style/Theme.ConfirmDeviceCredentials"/>
 
         <activity android:name="SetupChooseLockGeneric"
             android:taskAffinity="com.android.wizard"
@@ -1395,15 +1477,68 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.deviceinfo.Memory" />
+                android:value="com.android.settings.deviceinfo.StorageSettings" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/storage_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
 
-        <activity android:name=".deviceinfo.MiscFilesHandler"
-                android:theme="@style/Theme.SubSettingsDialogWhenLarge"/>
+        <activity
+                android:name="Settings$StorageVolumeSettingsActivity"
+                android:label="@string/storage_settings_title"
+                android:taskAffinity="com.android.settings"
+                android:parentActivityName="Settings$StorageSettingsActivity">
+            <intent-filter>
+                <action android:name="android.provider.action.DOCUMENT_ROOT_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data
+                    android:scheme="content"
+                    android:host="com.android.externalstorage.documents"
+                    android:mimeType="vnd.android.document/root" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.deviceinfo.PublicVolumeSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/storage_settings" />
+        </activity>
+
+        <!-- Exported for SystemUI to launch into -->
+        <activity android:name=".deviceinfo.StorageWizardInit"
+                android:theme="@style/SuwThemeMaterial.Light"
+                android:taskAffinity="com.android.settings.storage_wizard"
+                android:exported="true"
+                android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
+        <activity android:name=".deviceinfo.StorageWizardFormatConfirm"
+                android:taskAffinity="com.android.settings.storage_wizard"
+                android:exported="false" />
+        <activity android:name=".deviceinfo.StorageWizardFormatProgress"
+                android:taskAffinity="com.android.settings.storage_wizard"
+                android:exported="false" />
+        <activity android:name=".deviceinfo.StorageWizardMigrate"
+                android:taskAffinity="com.android.settings.storage_wizard"
+                android:exported="false" />
+        <activity android:name=".deviceinfo.StorageWizardMigrateConfirm"
+                android:taskAffinity="com.android.settings.storage_wizard"
+                android:exported="false" />
+        <activity android:name=".deviceinfo.StorageWizardMigrateProgress"
+                android:taskAffinity="com.android.settings.storage_wizard"
+                android:exported="false" />
+        <activity android:name=".deviceinfo.StorageWizardReady"
+                android:taskAffinity="com.android.settings.storage_wizard"
+                android:exported="false" />
+
+        <activity android:name=".deviceinfo.StorageWizardMoveConfirm"
+                android:taskAffinity="com.android.settings.storage_wizard"
+                android:exported="false" />
+        <activity android:name=".deviceinfo.StorageWizardMoveProgress"
+                android:taskAffinity="com.android.settings.storage_wizard"
+                android:exported="false" />
+
+        <!-- Exported for SystemUI to trigger -->
+        <receiver android:name=".deviceinfo.StorageUnmountReceiver"
+                android:exported="true"
+                android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
 
         <activity android:name="ApnEditor"
                 android:label="@string/apn_edit">
@@ -1812,6 +1947,17 @@
                 android:value="true" />
         </activity>
 
+        <activity android:name=".fuelgauge.BatterySaverModeVoiceActivity"
+                android:label="@string/power_usage_summary_title"
+                android:theme="@android:style/Theme.Material.Light.Voice"
+                android:exported="true">
+            <intent-filter>
+                <action android:name="android.settings.VOICE_CONTROL_BATTERY_SAVER_MODE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="Settings$AccountSettingsActivity"
             android:label="@string/account_settings_title"
             android:taskAffinity=""
@@ -2039,23 +2185,6 @@
                        android:resource="@id/security_settings" />
         </activity>
 
-        <activity android:name="Settings$ConditionProviderSettingsActivity"
-                  android:label="@string/manage_condition_providers"
-                  android:taskAffinity="">
-            <intent-filter android:priority="1">
-                <action android:name="android.settings.ACTION_CONDITION_PROVIDER_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.notification.ConditionProviderSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                       android:resource="@id/notification_settings" />
-        </activity>
-
         <activity android:name="Settings$NotificationSettingsActivity"
                 android:label="@string/notification_settings"
                 android:exported="true"
diff --git a/CleanSpec.mk b/CleanSpec.mk
index be2e221..6ead46e 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -45,6 +45,7 @@
 #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
 
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Settings_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Settings_intermediates)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/res/anim-ldrtl/slide_back_in.xml b/res/anim-ldrtl/slide_back_in.xml
deleted file mode 100644
index e5ab3e5..0000000
--- a/res/anim-ldrtl/slide_back_in.xml
+++ /dev/null
@@ -1,22 +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.
--->
-
-<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
deleted file mode 100644
index 8717f6a..0000000
--- a/res/anim-ldrtl/slide_back_out.xml
+++ /dev/null
@@ -1,22 +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.
--->
-
-<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
deleted file mode 100644
index 009ea9f..0000000
--- a/res/anim-ldrtl/slide_next_in.xml
+++ /dev/null
@@ -1,22 +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.
--->
-
-<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
deleted file mode 100644
index b7ab2b6..0000000
--- a/res/anim-ldrtl/slide_next_out.xml
+++ /dev/null
@@ -1,22 +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.
--->
-
-<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/fab_elevation.xml b/res/anim/fab_elevation.xml
new file mode 100644
index 0000000..af75db0
--- /dev/null
+++ b/res/anim/fab_elevation.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true" android:state_pressed="true">
+        <set>
+            <objectAnimator
+                android:duration="@android:integer/config_shortAnimTime"
+                android:propertyName="translationZ"
+                android:valueTo="@dimen/fab_press_translation_z"
+                android:valueType="floatType" />
+        </set>
+    </item>
+    <item>
+        <set>
+            <objectAnimator
+                android:duration="@android:integer/config_shortAnimTime"
+                android:propertyName="translationZ"
+                android:valueTo="0"
+                android:valueType="floatType" />
+        </set>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/res/anim/slide_back_in.xml b/res/anim/slide_back_in.xml
deleted file mode 100644
index 009ea9f..0000000
--- a/res/anim/slide_back_in.xml
+++ /dev/null
@@ -1,22 +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.
--->
-
-<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
deleted file mode 100644
index b7ab2b6..0000000
--- a/res/anim/slide_back_out.xml
+++ /dev/null
@@ -1,22 +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.
--->
-
-<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
deleted file mode 100644
index e5ab3e5..0000000
--- a/res/anim/slide_next_in.xml
+++ /dev/null
@@ -1,22 +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.
--->
-
-<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
deleted file mode 100644
index 8717f6a..0000000
--- a/res/anim/slide_next_out.xml
+++ /dev/null
@@ -1,22 +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.
--->
-
-<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_settings_about.png b/res/drawable-hdpi/ic_settings_about.png
deleted file mode 100644
index f4596ed..0000000
--- a/res/drawable-hdpi/ic_settings_about.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_about_alpha.png b/res/drawable-hdpi/ic_settings_about_alpha.png
new file mode 100644
index 0000000..1e38ba5
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_about_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_accessibility.png b/res/drawable-hdpi/ic_settings_accessibility.png
deleted file mode 100644
index 202ec9d..0000000
--- a/res/drawable-hdpi/ic_settings_accessibility.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_accessibility_alpha.png b/res/drawable-hdpi/ic_settings_accessibility_alpha.png
new file mode 100644
index 0000000..74ca88e
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_accessibility_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_accounts.png b/res/drawable-hdpi/ic_settings_accounts.png
deleted file mode 100644
index cdeb8b0..0000000
--- a/res/drawable-hdpi/ic_settings_accounts.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_accounts_alpha.png b/res/drawable-hdpi/ic_settings_accounts_alpha.png
new file mode 100644
index 0000000..c36216c
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_accounts_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_applications.png b/res/drawable-hdpi/ic_settings_applications.png
deleted file mode 100644
index 627b7cb..0000000
--- a/res/drawable-hdpi/ic_settings_applications.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_applications_alpha.png b/res/drawable-hdpi/ic_settings_applications_alpha.png
new file mode 100644
index 0000000..1c46133
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_applications_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_backup.png b/res/drawable-hdpi/ic_settings_backup.png
deleted file mode 100644
index 701b6cf..0000000
--- a/res/drawable-hdpi/ic_settings_backup.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_backup_alpha.png b/res/drawable-hdpi/ic_settings_backup_alpha.png
new file mode 100644
index 0000000..ef8acea
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_backup_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_battery.png b/res/drawable-hdpi/ic_settings_battery.png
deleted file mode 100644
index 75a2af9..0000000
--- a/res/drawable-hdpi/ic_settings_battery.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_battery_alpha.png b/res/drawable-hdpi/ic_settings_battery_alpha.png
new file mode 100644
index 0000000..89013cf
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_battery_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_bluetooth.png b/res/drawable-hdpi/ic_settings_bluetooth.png
deleted file mode 100644
index 3d9015f..0000000
--- a/res/drawable-hdpi/ic_settings_bluetooth.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_bluetooth2.png b/res/drawable-hdpi/ic_settings_bluetooth2.png
deleted file mode 100644
index 9afe435..0000000
--- a/res/drawable-hdpi/ic_settings_bluetooth2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_bluetooth2_alpha.png b/res/drawable-hdpi/ic_settings_bluetooth2_alpha.png
new file mode 100644
index 0000000..9dbc509
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_bluetooth2_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_bluetooth_alpha.png b/res/drawable-hdpi/ic_settings_bluetooth_alpha.png
new file mode 100644
index 0000000..a21982e
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_bluetooth_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_data_usage.png b/res/drawable-hdpi/ic_settings_data_usage.png
deleted file mode 100644
index b274f4f..0000000
--- a/res/drawable-hdpi/ic_settings_data_usage.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_data_usage_alpha.png b/res/drawable-hdpi/ic_settings_data_usage_alpha.png
new file mode 100644
index 0000000..68e0d8a
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_data_usage_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_date_time.png b/res/drawable-hdpi/ic_settings_date_time.png
deleted file mode 100644
index 5a84c33..0000000
--- a/res/drawable-hdpi/ic_settings_date_time.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_date_time_alpha.png b/res/drawable-hdpi/ic_settings_date_time_alpha.png
new file mode 100644
index 0000000..edea4ac
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_date_time_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_development.png b/res/drawable-hdpi/ic_settings_development.png
deleted file mode 100644
index 7f38de0..0000000
--- a/res/drawable-hdpi/ic_settings_development.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_development_alpha.png b/res/drawable-hdpi/ic_settings_development_alpha.png
new file mode 100644
index 0000000..44cfb57
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_development_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_display_am.png b/res/drawable-hdpi/ic_settings_display_am.png
deleted file mode 100644
index 24719b1..0000000
--- a/res/drawable-hdpi/ic_settings_display_am.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_display_am_alpha.png b/res/drawable-hdpi/ic_settings_display_am_alpha.png
new file mode 100644
index 0000000..7b8f909
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_display_am_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_dock.png b/res/drawable-hdpi/ic_settings_dock.png
deleted file mode 100644
index bdeaee7..0000000
--- a/res/drawable-hdpi/ic_settings_dock.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_dock_alpha.png b/res/drawable-hdpi/ic_settings_dock_alpha.png
new file mode 100644
index 0000000..98ef4e8
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_dock_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_home.png b/res/drawable-hdpi/ic_settings_home.png
deleted file mode 100644
index 6a0564a..0000000
--- a/res/drawable-hdpi/ic_settings_home.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_home_alpha.png b/res/drawable-hdpi/ic_settings_home_alpha.png
new file mode 100644
index 0000000..4ab9ae0
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_home_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_language.png b/res/drawable-hdpi/ic_settings_language.png
deleted file mode 100644
index e27035a..0000000
--- a/res/drawable-hdpi/ic_settings_language.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_language_alpha.png b/res/drawable-hdpi/ic_settings_language_alpha.png
new file mode 100644
index 0000000..5a65a5b
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_language_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_location.png b/res/drawable-hdpi/ic_settings_location.png
deleted file mode 100644
index 968253c..0000000
--- a/res/drawable-hdpi/ic_settings_location.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_location_alpha.png b/res/drawable-hdpi/ic_settings_location_alpha.png
new file mode 100644
index 0000000..f90ce84
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_location_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_more.png b/res/drawable-hdpi/ic_settings_more.png
deleted file mode 100644
index 61bb00c..0000000
--- a/res/drawable-hdpi/ic_settings_more.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_more_alpha.png b/res/drawable-hdpi/ic_settings_more_alpha.png
new file mode 100644
index 0000000..38255a2
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_more_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_multiuser.png b/res/drawable-hdpi/ic_settings_multiuser.png
deleted file mode 100644
index c1a6e63..0000000
--- a/res/drawable-hdpi/ic_settings_multiuser.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_multiuser_alpha.png b/res/drawable-hdpi/ic_settings_multiuser_alpha.png
new file mode 100644
index 0000000..c2efeba
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_multiuser_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_nfc_payment_am.png b/res/drawable-hdpi/ic_settings_nfc_payment_am.png
deleted file mode 100644
index 7431cb0..0000000
--- a/res/drawable-hdpi/ic_settings_nfc_payment_am.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_nfc_payment_am_alpha.png b/res/drawable-hdpi/ic_settings_nfc_payment_am_alpha.png
new file mode 100644
index 0000000..0a71416
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_nfc_payment_am_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_notifications.png b/res/drawable-hdpi/ic_settings_notifications.png
deleted file mode 100644
index 6dd91bb..0000000
--- a/res/drawable-hdpi/ic_settings_notifications.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_notifications_alpha.png b/res/drawable-hdpi/ic_settings_notifications_alpha.png
new file mode 100644
index 0000000..fd6df67
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_notifications_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_print.png b/res/drawable-hdpi/ic_settings_print.png
deleted file mode 100644
index 62624ee..0000000
--- a/res/drawable-hdpi/ic_settings_print.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_print_alpha.png b/res/drawable-hdpi/ic_settings_print_alpha.png
new file mode 100644
index 0000000..06f8dac
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_print_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_security.png b/res/drawable-hdpi/ic_settings_security.png
deleted file mode 100644
index abbf3fa..0000000
--- a/res/drawable-hdpi/ic_settings_security.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_security_alpha.png b/res/drawable-hdpi/ic_settings_security_alpha.png
new file mode 100644
index 0000000..33c9505
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_security_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_sound.png b/res/drawable-hdpi/ic_settings_sound.png
deleted file mode 100644
index dec290a..0000000
--- a/res/drawable-hdpi/ic_settings_sound.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_sound_alpha.png b/res/drawable-hdpi/ic_settings_sound_alpha.png
new file mode 100644
index 0000000..beac382
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_sound_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_storage.png b/res/drawable-hdpi/ic_settings_storage.png
deleted file mode 100644
index 5444eeb..0000000
--- a/res/drawable-hdpi/ic_settings_storage.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_storage_alpha.png b/res/drawable-hdpi/ic_settings_storage_alpha.png
new file mode 100644
index 0000000..a25da20
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_storage_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_sync.png b/res/drawable-hdpi/ic_settings_sync.png
deleted file mode 100644
index 96254d6..0000000
--- a/res/drawable-hdpi/ic_settings_sync.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_sync_alpha.png b/res/drawable-hdpi/ic_settings_sync_alpha.png
new file mode 100644
index 0000000..f7c0cc2
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_sync_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_wifi.png b/res/drawable-hdpi/ic_settings_wifi.png
deleted file mode 100644
index b8c3eaa..0000000
--- a/res/drawable-hdpi/ic_settings_wifi.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_wifi_alpha.png b/res/drawable-hdpi/ic_settings_wifi_alpha.png
new file mode 100644
index 0000000..a21982e
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_wifi_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_wireless.png b/res/drawable-hdpi/ic_settings_wireless.png
deleted file mode 100644
index 5c82e8b..0000000
--- a/res/drawable-hdpi/ic_settings_wireless.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_wireless_alpha.png b/res/drawable-hdpi/ic_settings_wireless_alpha.png
new file mode 100644
index 0000000..e5ad5ba
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_wireless_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/illustration_horizontal.jpg b/res/drawable-hdpi/illustration_horizontal.jpg
new file mode 100644
index 0000000..428b2f4
--- /dev/null
+++ b/res/drawable-hdpi/illustration_horizontal.jpg
Binary files differ
diff --git a/res/drawable-hdpi/illustration_tile.jpg b/res/drawable-hdpi/illustration_tile.jpg
new file mode 100644
index 0000000..9931a23
--- /dev/null
+++ b/res/drawable-hdpi/illustration_tile.jpg
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_settings_sound.png b/res/drawable-ldrtl-hdpi/ic_settings_sound.png
deleted file mode 100755
index b703b4e..0000000
--- a/res/drawable-ldrtl-hdpi/ic_settings_sound.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_settings_sound_alpha.png b/res/drawable-ldrtl-hdpi/ic_settings_sound_alpha.png
new file mode 100644
index 0000000..cebb01f
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/ic_settings_sound_alpha.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_settings_sound.png b/res/drawable-ldrtl-mdpi/ic_settings_sound.png
deleted file mode 100644
index 419868f..0000000
--- a/res/drawable-ldrtl-mdpi/ic_settings_sound.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_settings_sound_alpha.png b/res/drawable-ldrtl-mdpi/ic_settings_sound_alpha.png
new file mode 100644
index 0000000..c7fe326
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_settings_sound_alpha.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_settings_sound.png b/res/drawable-ldrtl-xhdpi/ic_settings_sound.png
deleted file mode 100644
index 8d04d42..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_settings_sound.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_settings_sound_alpha.png b/res/drawable-ldrtl-xhdpi/ic_settings_sound_alpha.png
new file mode 100644
index 0000000..7503f50
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_settings_sound_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_about.png b/res/drawable-mdpi/ic_settings_about.png
deleted file mode 100644
index 8c5206e..0000000
--- a/res/drawable-mdpi/ic_settings_about.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_about_alpha.png b/res/drawable-mdpi/ic_settings_about_alpha.png
new file mode 100644
index 0000000..4065701
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_about_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_accessibility.png b/res/drawable-mdpi/ic_settings_accessibility.png
deleted file mode 100644
index d0229f6..0000000
--- a/res/drawable-mdpi/ic_settings_accessibility.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_accessibility_alpha.png b/res/drawable-mdpi/ic_settings_accessibility_alpha.png
new file mode 100644
index 0000000..c040ba0
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_accessibility_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_accounts.png b/res/drawable-mdpi/ic_settings_accounts.png
deleted file mode 100644
index 65008ce..0000000
--- a/res/drawable-mdpi/ic_settings_accounts.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_accounts_alpha.png b/res/drawable-mdpi/ic_settings_accounts_alpha.png
new file mode 100644
index 0000000..769b46a
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_accounts_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_applications.png b/res/drawable-mdpi/ic_settings_applications.png
deleted file mode 100644
index 60ebf38..0000000
--- a/res/drawable-mdpi/ic_settings_applications.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_applications_alpha.png b/res/drawable-mdpi/ic_settings_applications_alpha.png
new file mode 100644
index 0000000..f2ea795
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_applications_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_backup.png b/res/drawable-mdpi/ic_settings_backup.png
deleted file mode 100644
index 4595bda..0000000
--- a/res/drawable-mdpi/ic_settings_backup.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_backup_alpha.png b/res/drawable-mdpi/ic_settings_backup_alpha.png
new file mode 100644
index 0000000..932d354
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_backup_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_battery.png b/res/drawable-mdpi/ic_settings_battery.png
deleted file mode 100644
index 7a001fc..0000000
--- a/res/drawable-mdpi/ic_settings_battery.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_battery_alpha.png b/res/drawable-mdpi/ic_settings_battery_alpha.png
new file mode 100644
index 0000000..970e6ed
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_battery_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_bluetooth.png b/res/drawable-mdpi/ic_settings_bluetooth.png
deleted file mode 100644
index 8cf80c0..0000000
--- a/res/drawable-mdpi/ic_settings_bluetooth.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_bluetooth2.png b/res/drawable-mdpi/ic_settings_bluetooth2.png
deleted file mode 100644
index f556bb4..0000000
--- a/res/drawable-mdpi/ic_settings_bluetooth2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_bluetooth2_alpha.png b/res/drawable-mdpi/ic_settings_bluetooth2_alpha.png
new file mode 100644
index 0000000..f51e5ca
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_bluetooth2_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_bluetooth_alpha.png b/res/drawable-mdpi/ic_settings_bluetooth_alpha.png
new file mode 100644
index 0000000..31be004
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_bluetooth_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_data_usage.png b/res/drawable-mdpi/ic_settings_data_usage.png
deleted file mode 100644
index e5d464d..0000000
--- a/res/drawable-mdpi/ic_settings_data_usage.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_data_usage_alpha.png b/res/drawable-mdpi/ic_settings_data_usage_alpha.png
new file mode 100644
index 0000000..a368371
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_data_usage_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_date_time.png b/res/drawable-mdpi/ic_settings_date_time.png
deleted file mode 100644
index 80be678..0000000
--- a/res/drawable-mdpi/ic_settings_date_time.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_date_time_alpha.png b/res/drawable-mdpi/ic_settings_date_time_alpha.png
new file mode 100644
index 0000000..6837c11
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_date_time_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_development.png b/res/drawable-mdpi/ic_settings_development.png
deleted file mode 100644
index 44aaa29..0000000
--- a/res/drawable-mdpi/ic_settings_development.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_development_alpha.png b/res/drawable-mdpi/ic_settings_development_alpha.png
new file mode 100644
index 0000000..cdc3ffe
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_development_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_display_am.png b/res/drawable-mdpi/ic_settings_display_am.png
deleted file mode 100644
index c794f76..0000000
--- a/res/drawable-mdpi/ic_settings_display_am.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_display_am_alpha.png b/res/drawable-mdpi/ic_settings_display_am_alpha.png
new file mode 100644
index 0000000..f894832
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_display_am_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_dock.png b/res/drawable-mdpi/ic_settings_dock.png
deleted file mode 100644
index 62ccb3c..0000000
--- a/res/drawable-mdpi/ic_settings_dock.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_dock_alpha.png b/res/drawable-mdpi/ic_settings_dock_alpha.png
new file mode 100644
index 0000000..3ef7ab2
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_dock_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_home.png b/res/drawable-mdpi/ic_settings_home.png
deleted file mode 100644
index b18ca3e..0000000
--- a/res/drawable-mdpi/ic_settings_home.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_home_alpha.png b/res/drawable-mdpi/ic_settings_home_alpha.png
new file mode 100644
index 0000000..ad90fb8
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_home_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_language.png b/res/drawable-mdpi/ic_settings_language.png
deleted file mode 100644
index 604a710..0000000
--- a/res/drawable-mdpi/ic_settings_language.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_language_alpha.png b/res/drawable-mdpi/ic_settings_language_alpha.png
new file mode 100644
index 0000000..9149bb1
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_language_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_location.png b/res/drawable-mdpi/ic_settings_location.png
deleted file mode 100644
index de70e6f..0000000
--- a/res/drawable-mdpi/ic_settings_location.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_location_alpha.png b/res/drawable-mdpi/ic_settings_location_alpha.png
new file mode 100644
index 0000000..0b42099
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_location_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_more.png b/res/drawable-mdpi/ic_settings_more.png
deleted file mode 100644
index bad02c8..0000000
--- a/res/drawable-mdpi/ic_settings_more.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_more_alpha.png b/res/drawable-mdpi/ic_settings_more_alpha.png
new file mode 100644
index 0000000..809bf53
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_more_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_multiuser.png b/res/drawable-mdpi/ic_settings_multiuser.png
deleted file mode 100644
index d6f8501..0000000
--- a/res/drawable-mdpi/ic_settings_multiuser.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_multiuser_alpha.png b/res/drawable-mdpi/ic_settings_multiuser_alpha.png
new file mode 100644
index 0000000..4a90287
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_multiuser_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_nfc_payment_am.png b/res/drawable-mdpi/ic_settings_nfc_payment_am.png
deleted file mode 100644
index 1cf5e86..0000000
--- a/res/drawable-mdpi/ic_settings_nfc_payment_am.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_nfc_payment_am_alpha.png b/res/drawable-mdpi/ic_settings_nfc_payment_am_alpha.png
new file mode 100644
index 0000000..1a66a30
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_nfc_payment_am_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_notifications.png b/res/drawable-mdpi/ic_settings_notifications.png
deleted file mode 100644
index 407ec8c..0000000
--- a/res/drawable-mdpi/ic_settings_notifications.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_notifications_alpha.png b/res/drawable-mdpi/ic_settings_notifications_alpha.png
new file mode 100644
index 0000000..8e255ae
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_notifications_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_print.png b/res/drawable-mdpi/ic_settings_print.png
deleted file mode 100644
index 76234a6..0000000
--- a/res/drawable-mdpi/ic_settings_print.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_print_alpha.png b/res/drawable-mdpi/ic_settings_print_alpha.png
new file mode 100644
index 0000000..e65113d
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_print_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_security.png b/res/drawable-mdpi/ic_settings_security.png
deleted file mode 100644
index cd65dd2..0000000
--- a/res/drawable-mdpi/ic_settings_security.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_security_alpha.png b/res/drawable-mdpi/ic_settings_security_alpha.png
new file mode 100644
index 0000000..b1a7cd0
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_security_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_sound.png b/res/drawable-mdpi/ic_settings_sound.png
deleted file mode 100644
index 17b2cc4..0000000
--- a/res/drawable-mdpi/ic_settings_sound.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_sound_alpha.png b/res/drawable-mdpi/ic_settings_sound_alpha.png
new file mode 100644
index 0000000..4a292ee
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_sound_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_storage.png b/res/drawable-mdpi/ic_settings_storage.png
deleted file mode 100644
index ff6af99..0000000
--- a/res/drawable-mdpi/ic_settings_storage.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_storage_alpha.png b/res/drawable-mdpi/ic_settings_storage_alpha.png
new file mode 100644
index 0000000..ddbde7c
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_storage_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_sync.png b/res/drawable-mdpi/ic_settings_sync.png
deleted file mode 100644
index fbd03ba..0000000
--- a/res/drawable-mdpi/ic_settings_sync.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_sync_alpha.png b/res/drawable-mdpi/ic_settings_sync_alpha.png
new file mode 100644
index 0000000..850e594
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_sync_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_wifi.png b/res/drawable-mdpi/ic_settings_wifi.png
deleted file mode 100644
index e8f3129..0000000
--- a/res/drawable-mdpi/ic_settings_wifi.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_wifi_alpha.png b/res/drawable-mdpi/ic_settings_wifi_alpha.png
new file mode 100644
index 0000000..31be004
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_wifi_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_wireless.png b/res/drawable-mdpi/ic_settings_wireless.png
deleted file mode 100644
index 6b81932f..0000000
--- a/res/drawable-mdpi/ic_settings_wireless.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_wireless_alpha.png b/res/drawable-mdpi/ic_settings_wireless_alpha.png
new file mode 100644
index 0000000..7bb2dfb
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_wireless_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/illustration_horizontal.jpg b/res/drawable-mdpi/illustration_horizontal.jpg
new file mode 100644
index 0000000..52e7993
--- /dev/null
+++ b/res/drawable-mdpi/illustration_horizontal.jpg
Binary files differ
diff --git a/res/drawable-mdpi/illustration_tile.jpg b/res/drawable-mdpi/illustration_tile.jpg
new file mode 100644
index 0000000..7923fb4
--- /dev/null
+++ b/res/drawable-mdpi/illustration_tile.jpg
Binary files differ
diff --git a/res/drawable-nodpi/illustration_generic.jpg b/res/drawable-nodpi/illustration_generic.jpg
new file mode 100644
index 0000000..f37eaf4
--- /dev/null
+++ b/res/drawable-nodpi/illustration_generic.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/illustration_generic.jpg b/res/drawable-sw600dp-hdpi/illustration_generic.jpg
new file mode 100644
index 0000000..7aac7f9
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/illustration_generic.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/illustration_generic.jpg b/res/drawable-sw600dp-mdpi/illustration_generic.jpg
new file mode 100644
index 0000000..34d0f33
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/illustration_generic.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/illustration_generic.jpg b/res/drawable-sw600dp-xhdpi/illustration_generic.jpg
new file mode 100644
index 0000000..4fe849f
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/illustration_generic.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-xxhdpi/illustration_generic.jpg b/res/drawable-sw600dp-xxhdpi/illustration_generic.jpg
new file mode 100644
index 0000000..48bca97
--- /dev/null
+++ b/res/drawable-sw600dp-xxhdpi/illustration_generic.jpg
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_about.png b/res/drawable-xhdpi/ic_settings_about.png
deleted file mode 100644
index 188b362..0000000
--- a/res/drawable-xhdpi/ic_settings_about.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_about_alpha.png b/res/drawable-xhdpi/ic_settings_about_alpha.png
new file mode 100644
index 0000000..c64616f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_about_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_accessibility.png b/res/drawable-xhdpi/ic_settings_accessibility.png
deleted file mode 100644
index 297a08b..0000000
--- a/res/drawable-xhdpi/ic_settings_accessibility.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_accessibility_alpha.png b/res/drawable-xhdpi/ic_settings_accessibility_alpha.png
new file mode 100644
index 0000000..d7f5c4d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_accessibility_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_accounts.png b/res/drawable-xhdpi/ic_settings_accounts.png
deleted file mode 100644
index 8538036..0000000
--- a/res/drawable-xhdpi/ic_settings_accounts.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_accounts_alpha.png b/res/drawable-xhdpi/ic_settings_accounts_alpha.png
new file mode 100644
index 0000000..6937eb1
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_accounts_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_applications.png b/res/drawable-xhdpi/ic_settings_applications.png
deleted file mode 100644
index f8122ba..0000000
--- a/res/drawable-xhdpi/ic_settings_applications.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_applications_alpha.png b/res/drawable-xhdpi/ic_settings_applications_alpha.png
new file mode 100644
index 0000000..1d022e6
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_applications_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_backup.png b/res/drawable-xhdpi/ic_settings_backup.png
deleted file mode 100644
index 73d718b..0000000
--- a/res/drawable-xhdpi/ic_settings_backup.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_backup_alpha.png b/res/drawable-xhdpi/ic_settings_backup_alpha.png
new file mode 100644
index 0000000..93e7399
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_backup_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_battery.png b/res/drawable-xhdpi/ic_settings_battery.png
deleted file mode 100644
index 6825b71..0000000
--- a/res/drawable-xhdpi/ic_settings_battery.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_battery_alpha.png b/res/drawable-xhdpi/ic_settings_battery_alpha.png
new file mode 100644
index 0000000..16d290d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_battery_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_bluetooth.png b/res/drawable-xhdpi/ic_settings_bluetooth.png
deleted file mode 100644
index a75b550..0000000
--- a/res/drawable-xhdpi/ic_settings_bluetooth.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_bluetooth2.png b/res/drawable-xhdpi/ic_settings_bluetooth2.png
deleted file mode 100644
index 3767382..0000000
--- a/res/drawable-xhdpi/ic_settings_bluetooth2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_bluetooth2_alpha.png b/res/drawable-xhdpi/ic_settings_bluetooth2_alpha.png
new file mode 100644
index 0000000..a3e09db
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_bluetooth2_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_bluetooth_alpha.png b/res/drawable-xhdpi/ic_settings_bluetooth_alpha.png
new file mode 100644
index 0000000..cee4e67
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_bluetooth_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_data_usage.png b/res/drawable-xhdpi/ic_settings_data_usage.png
deleted file mode 100644
index 57cf2b1..0000000
--- a/res/drawable-xhdpi/ic_settings_data_usage.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_data_usage_alpha.png b/res/drawable-xhdpi/ic_settings_data_usage_alpha.png
new file mode 100644
index 0000000..8ef9d09
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_data_usage_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_date_time.png b/res/drawable-xhdpi/ic_settings_date_time.png
deleted file mode 100644
index 8a40de8..0000000
--- a/res/drawable-xhdpi/ic_settings_date_time.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_date_time_alpha.png b/res/drawable-xhdpi/ic_settings_date_time_alpha.png
new file mode 100644
index 0000000..ad45114
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_date_time_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_development.png b/res/drawable-xhdpi/ic_settings_development.png
deleted file mode 100644
index 22050369..0000000
--- a/res/drawable-xhdpi/ic_settings_development.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_development_alpha.png b/res/drawable-xhdpi/ic_settings_development_alpha.png
new file mode 100644
index 0000000..3a4b3d9
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_development_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_display_am.png b/res/drawable-xhdpi/ic_settings_display_am.png
deleted file mode 100644
index be367f3..0000000
--- a/res/drawable-xhdpi/ic_settings_display_am.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_display_am_alpha.png b/res/drawable-xhdpi/ic_settings_display_am_alpha.png
new file mode 100644
index 0000000..05e82fb
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_display_am_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_dock.png b/res/drawable-xhdpi/ic_settings_dock.png
deleted file mode 100644
index e7eb120..0000000
--- a/res/drawable-xhdpi/ic_settings_dock.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_dock_alpha.png b/res/drawable-xhdpi/ic_settings_dock_alpha.png
new file mode 100644
index 0000000..eb01a66
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_dock_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_home.png b/res/drawable-xhdpi/ic_settings_home.png
deleted file mode 100644
index 3cb118d..0000000
--- a/res/drawable-xhdpi/ic_settings_home.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_home_alpha.png b/res/drawable-xhdpi/ic_settings_home_alpha.png
new file mode 100644
index 0000000..7098fbf
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_home_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_language.png b/res/drawable-xhdpi/ic_settings_language.png
deleted file mode 100644
index 4e44c01..0000000
--- a/res/drawable-xhdpi/ic_settings_language.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_language_alpha.png b/res/drawable-xhdpi/ic_settings_language_alpha.png
new file mode 100644
index 0000000..9b922e3
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_language_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_location.png b/res/drawable-xhdpi/ic_settings_location.png
deleted file mode 100644
index cd2e7b5..0000000
--- a/res/drawable-xhdpi/ic_settings_location.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_location_alpha.png b/res/drawable-xhdpi/ic_settings_location_alpha.png
new file mode 100644
index 0000000..fca5cf2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_location_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_more.png b/res/drawable-xhdpi/ic_settings_more.png
deleted file mode 100644
index 8b9fe07..0000000
--- a/res/drawable-xhdpi/ic_settings_more.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_more_alpha.png b/res/drawable-xhdpi/ic_settings_more_alpha.png
new file mode 100644
index 0000000..0747c87
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_more_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_multiuser.png b/res/drawable-xhdpi/ic_settings_multiuser.png
deleted file mode 100644
index e1b3932..0000000
--- a/res/drawable-xhdpi/ic_settings_multiuser.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_multiuser_alpha.png b/res/drawable-xhdpi/ic_settings_multiuser_alpha.png
new file mode 100644
index 0000000..b51072e
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_multiuser_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_nfc_payment_am.png b/res/drawable-xhdpi/ic_settings_nfc_payment_am.png
deleted file mode 100644
index 4cf007d..0000000
--- a/res/drawable-xhdpi/ic_settings_nfc_payment_am.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_nfc_payment_am_alpha.png b/res/drawable-xhdpi/ic_settings_nfc_payment_am_alpha.png
new file mode 100644
index 0000000..9aa2fd2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_nfc_payment_am_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_notifications.png b/res/drawable-xhdpi/ic_settings_notifications.png
deleted file mode 100644
index a67930e..0000000
--- a/res/drawable-xhdpi/ic_settings_notifications.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_notifications_alpha.png b/res/drawable-xhdpi/ic_settings_notifications_alpha.png
new file mode 100644
index 0000000..a5fd6ae
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_notifications_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_print.png b/res/drawable-xhdpi/ic_settings_print.png
deleted file mode 100644
index 9ea3b85..0000000
--- a/res/drawable-xhdpi/ic_settings_print.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_print_alpha.png b/res/drawable-xhdpi/ic_settings_print_alpha.png
new file mode 100644
index 0000000..9afa8d2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_print_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_security.png b/res/drawable-xhdpi/ic_settings_security.png
deleted file mode 100644
index 5ead24e..0000000
--- a/res/drawable-xhdpi/ic_settings_security.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_security_alpha.png b/res/drawable-xhdpi/ic_settings_security_alpha.png
new file mode 100644
index 0000000..cc79239
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_security_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_sound.png b/res/drawable-xhdpi/ic_settings_sound.png
deleted file mode 100644
index 644e593..0000000
--- a/res/drawable-xhdpi/ic_settings_sound.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_sound_alpha.png b/res/drawable-xhdpi/ic_settings_sound_alpha.png
new file mode 100644
index 0000000..603bc71
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_sound_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_storage.png b/res/drawable-xhdpi/ic_settings_storage.png
deleted file mode 100644
index 51ded7e..0000000
--- a/res/drawable-xhdpi/ic_settings_storage.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_storage_alpha.png b/res/drawable-xhdpi/ic_settings_storage_alpha.png
new file mode 100644
index 0000000..556abdf
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_storage_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_sync.png b/res/drawable-xhdpi/ic_settings_sync.png
deleted file mode 100644
index 50f3bf8..0000000
--- a/res/drawable-xhdpi/ic_settings_sync.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_sync_alpha.png b/res/drawable-xhdpi/ic_settings_sync_alpha.png
new file mode 100644
index 0000000..87e01fb
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_sync_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_wifi.png b/res/drawable-xhdpi/ic_settings_wifi.png
deleted file mode 100644
index 2bd4648..0000000
--- a/res/drawable-xhdpi/ic_settings_wifi.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_wifi_alpha.png b/res/drawable-xhdpi/ic_settings_wifi_alpha.png
new file mode 100644
index 0000000..cee4e67
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_wifi_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_wireless.png b/res/drawable-xhdpi/ic_settings_wireless.png
deleted file mode 100644
index ad6a98e..0000000
--- a/res/drawable-xhdpi/ic_settings_wireless.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_wireless_alpha.png b/res/drawable-xhdpi/ic_settings_wireless_alpha.png
new file mode 100644
index 0000000..cd7c175
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_wireless_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/illustration_horizontal.jpg b/res/drawable-xhdpi/illustration_horizontal.jpg
new file mode 100644
index 0000000..2733f8e
--- /dev/null
+++ b/res/drawable-xhdpi/illustration_horizontal.jpg
Binary files differ
diff --git a/res/drawable-xhdpi/illustration_tile.jpg b/res/drawable-xhdpi/illustration_tile.jpg
new file mode 100644
index 0000000..57bccca
--- /dev/null
+++ b/res/drawable-xhdpi/illustration_tile.jpg
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_about.png b/res/drawable-xxhdpi/ic_settings_about.png
deleted file mode 100644
index ae91bad..0000000
--- a/res/drawable-xxhdpi/ic_settings_about.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_about_alpha.png b/res/drawable-xxhdpi/ic_settings_about_alpha.png
new file mode 100644
index 0000000..f4cbde6
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_about_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_accessibility.png b/res/drawable-xxhdpi/ic_settings_accessibility.png
deleted file mode 100644
index 08ee9c4..0000000
--- a/res/drawable-xxhdpi/ic_settings_accessibility.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_accessibility_alpha.png b/res/drawable-xxhdpi/ic_settings_accessibility_alpha.png
new file mode 100644
index 0000000..b3dbab6
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_accessibility_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_accounts.png b/res/drawable-xxhdpi/ic_settings_accounts.png
deleted file mode 100644
index 6371c62..0000000
--- a/res/drawable-xxhdpi/ic_settings_accounts.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_accounts_alpha.png b/res/drawable-xxhdpi/ic_settings_accounts_alpha.png
new file mode 100644
index 0000000..b7ebc4b
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_accounts_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_applications.png b/res/drawable-xxhdpi/ic_settings_applications.png
deleted file mode 100644
index db8c9c4..0000000
--- a/res/drawable-xxhdpi/ic_settings_applications.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_applications_alpha.png b/res/drawable-xxhdpi/ic_settings_applications_alpha.png
new file mode 100644
index 0000000..cb1caf9
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_applications_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_backup.png b/res/drawable-xxhdpi/ic_settings_backup.png
deleted file mode 100644
index d7add84..0000000
--- a/res/drawable-xxhdpi/ic_settings_backup.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_backup_alpha.png b/res/drawable-xxhdpi/ic_settings_backup_alpha.png
new file mode 100644
index 0000000..762095d
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_backup_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_battery.png b/res/drawable-xxhdpi/ic_settings_battery.png
deleted file mode 100644
index 1648ee4..0000000
--- a/res/drawable-xxhdpi/ic_settings_battery.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_battery_alpha.png b/res/drawable-xxhdpi/ic_settings_battery_alpha.png
new file mode 100644
index 0000000..733a787
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_battery_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_bluetooth2.png b/res/drawable-xxhdpi/ic_settings_bluetooth2.png
deleted file mode 100644
index ad5e802..0000000
--- a/res/drawable-xxhdpi/ic_settings_bluetooth2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_bluetooth2_alpha.png b/res/drawable-xxhdpi/ic_settings_bluetooth2_alpha.png
new file mode 100644
index 0000000..2cc0577
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_bluetooth2_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_data_usage.png b/res/drawable-xxhdpi/ic_settings_data_usage.png
deleted file mode 100644
index 4460509..0000000
--- a/res/drawable-xxhdpi/ic_settings_data_usage.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_data_usage_alpha.png b/res/drawable-xxhdpi/ic_settings_data_usage_alpha.png
new file mode 100644
index 0000000..6586a5c
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_data_usage_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_date_time.png b/res/drawable-xxhdpi/ic_settings_date_time.png
deleted file mode 100644
index dd13084..0000000
--- a/res/drawable-xxhdpi/ic_settings_date_time.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_date_time_alpha.png b/res/drawable-xxhdpi/ic_settings_date_time_alpha.png
new file mode 100644
index 0000000..875e1dd
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_date_time_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_development.png b/res/drawable-xxhdpi/ic_settings_development.png
deleted file mode 100644
index 35555d4..0000000
--- a/res/drawable-xxhdpi/ic_settings_development.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_development_alpha.png b/res/drawable-xxhdpi/ic_settings_development_alpha.png
new file mode 100644
index 0000000..fc23084
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_development_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_display_am.png b/res/drawable-xxhdpi/ic_settings_display_am.png
deleted file mode 100644
index a16ee17..0000000
--- a/res/drawable-xxhdpi/ic_settings_display_am.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_display_am_alpha.png b/res/drawable-xxhdpi/ic_settings_display_am_alpha.png
new file mode 100644
index 0000000..9dd90a1
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_display_am_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_dock.png b/res/drawable-xxhdpi/ic_settings_dock.png
deleted file mode 100644
index 24f2351..0000000
--- a/res/drawable-xxhdpi/ic_settings_dock.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_dock_alpha.png b/res/drawable-xxhdpi/ic_settings_dock_alpha.png
new file mode 100644
index 0000000..f8550be
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_dock_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_home.png b/res/drawable-xxhdpi/ic_settings_home.png
deleted file mode 100644
index 5a7e813..0000000
--- a/res/drawable-xxhdpi/ic_settings_home.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_home_alpha.png b/res/drawable-xxhdpi/ic_settings_home_alpha.png
new file mode 100644
index 0000000..653c08c
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_home_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_language.png b/res/drawable-xxhdpi/ic_settings_language.png
deleted file mode 100644
index 3d6559d..0000000
--- a/res/drawable-xxhdpi/ic_settings_language.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_language_alpha.png b/res/drawable-xxhdpi/ic_settings_language_alpha.png
new file mode 100644
index 0000000..9db2b5d
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_language_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_location.png b/res/drawable-xxhdpi/ic_settings_location.png
deleted file mode 100644
index 3fe4b9d..0000000
--- a/res/drawable-xxhdpi/ic_settings_location.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_location_alpha.png b/res/drawable-xxhdpi/ic_settings_location_alpha.png
new file mode 100644
index 0000000..b7c2776
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_location_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_more.png b/res/drawable-xxhdpi/ic_settings_more.png
deleted file mode 100644
index 0e0ba13..0000000
--- a/res/drawable-xxhdpi/ic_settings_more.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_more_alpha.png b/res/drawable-xxhdpi/ic_settings_more_alpha.png
new file mode 100644
index 0000000..7b44cac
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_more_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_multiuser.png b/res/drawable-xxhdpi/ic_settings_multiuser.png
deleted file mode 100644
index b5155d7..0000000
--- a/res/drawable-xxhdpi/ic_settings_multiuser.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_multiuser_alpha.png b/res/drawable-xxhdpi/ic_settings_multiuser_alpha.png
new file mode 100644
index 0000000..25ba926
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_multiuser_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_nfc_payment_am.png b/res/drawable-xxhdpi/ic_settings_nfc_payment_am.png
deleted file mode 100644
index 0b9e41e..0000000
--- a/res/drawable-xxhdpi/ic_settings_nfc_payment_am.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_nfc_payment_am_alpha.png b/res/drawable-xxhdpi/ic_settings_nfc_payment_am_alpha.png
new file mode 100644
index 0000000..6e09248
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_nfc_payment_am_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_notifications.png b/res/drawable-xxhdpi/ic_settings_notifications.png
deleted file mode 100644
index 3f0e063..0000000
--- a/res/drawable-xxhdpi/ic_settings_notifications.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_notifications_alpha.png b/res/drawable-xxhdpi/ic_settings_notifications_alpha.png
new file mode 100644
index 0000000..946c31a
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_notifications_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_print.png b/res/drawable-xxhdpi/ic_settings_print.png
deleted file mode 100644
index a0058dc..0000000
--- a/res/drawable-xxhdpi/ic_settings_print.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_print_alpha.png b/res/drawable-xxhdpi/ic_settings_print_alpha.png
new file mode 100644
index 0000000..4fe082e
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_print_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_security.png b/res/drawable-xxhdpi/ic_settings_security.png
deleted file mode 100644
index 0c317aa..0000000
--- a/res/drawable-xxhdpi/ic_settings_security.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_security_alpha.png b/res/drawable-xxhdpi/ic_settings_security_alpha.png
new file mode 100644
index 0000000..c815e43
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_security_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_sound.png b/res/drawable-xxhdpi/ic_settings_sound.png
deleted file mode 100644
index 5283caf..0000000
--- a/res/drawable-xxhdpi/ic_settings_sound.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_sound_alpha.png b/res/drawable-xxhdpi/ic_settings_sound_alpha.png
new file mode 100644
index 0000000..4461c1f
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_sound_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_storage.png b/res/drawable-xxhdpi/ic_settings_storage.png
deleted file mode 100644
index 45c42a7..0000000
--- a/res/drawable-xxhdpi/ic_settings_storage.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_storage_alpha.png b/res/drawable-xxhdpi/ic_settings_storage_alpha.png
new file mode 100644
index 0000000..ec53b8a
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_storage_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_sync.png b/res/drawable-xxhdpi/ic_settings_sync.png
deleted file mode 100644
index 2a09495..0000000
--- a/res/drawable-xxhdpi/ic_settings_sync.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_sync_alpha.png b/res/drawable-xxhdpi/ic_settings_sync_alpha.png
new file mode 100644
index 0000000..3a36ef3
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_sync_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_wireless.png b/res/drawable-xxhdpi/ic_settings_wireless.png
deleted file mode 100644
index 3058e98..0000000
--- a/res/drawable-xxhdpi/ic_settings_wireless.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_wireless_alpha.png b/res/drawable-xxhdpi/ic_settings_wireless_alpha.png
new file mode 100644
index 0000000..3640551
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_wireless_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/illustration_horizontal.jpg b/res/drawable-xxhdpi/illustration_horizontal.jpg
new file mode 100644
index 0000000..aec8d0f
--- /dev/null
+++ b/res/drawable-xxhdpi/illustration_horizontal.jpg
Binary files differ
diff --git a/res/drawable-xxhdpi/illustration_tile.jpg b/res/drawable-xxhdpi/illustration_tile.jpg
new file mode 100644
index 0000000..2ba33fa
--- /dev/null
+++ b/res/drawable-xxhdpi/illustration_tile.jpg
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_about.png b/res/drawable-xxxhdpi/ic_settings_about.png
deleted file mode 100644
index b39842f..0000000
--- a/res/drawable-xxxhdpi/ic_settings_about.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_about_alpha.png b/res/drawable-xxxhdpi/ic_settings_about_alpha.png
new file mode 100644
index 0000000..746900d
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_about_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_accessibility.png b/res/drawable-xxxhdpi/ic_settings_accessibility.png
deleted file mode 100644
index d289f02..0000000
--- a/res/drawable-xxxhdpi/ic_settings_accessibility.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_accessibility_alpha.png b/res/drawable-xxxhdpi/ic_settings_accessibility_alpha.png
new file mode 100644
index 0000000..1da61c9
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_accessibility_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_accounts.png b/res/drawable-xxxhdpi/ic_settings_accounts.png
deleted file mode 100644
index d1c389b..0000000
--- a/res/drawable-xxxhdpi/ic_settings_accounts.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_accounts_alpha.png b/res/drawable-xxxhdpi/ic_settings_accounts_alpha.png
new file mode 100644
index 0000000..c479acc
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_accounts_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_applications.png b/res/drawable-xxxhdpi/ic_settings_applications.png
deleted file mode 100644
index 07f5785..0000000
--- a/res/drawable-xxxhdpi/ic_settings_applications.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_applications_alpha.png b/res/drawable-xxxhdpi/ic_settings_applications_alpha.png
new file mode 100644
index 0000000..133f363
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_applications_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_backup.png b/res/drawable-xxxhdpi/ic_settings_backup.png
deleted file mode 100644
index 2a3f313..0000000
--- a/res/drawable-xxxhdpi/ic_settings_backup.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_backup_alpha.png b/res/drawable-xxxhdpi/ic_settings_backup_alpha.png
new file mode 100644
index 0000000..01efd94
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_backup_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_battery.png b/res/drawable-xxxhdpi/ic_settings_battery.png
deleted file mode 100644
index d45c6ef..0000000
--- a/res/drawable-xxxhdpi/ic_settings_battery.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_battery_alpha.png b/res/drawable-xxxhdpi/ic_settings_battery_alpha.png
new file mode 100644
index 0000000..6a060c7
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_battery_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_bluetooth2.png b/res/drawable-xxxhdpi/ic_settings_bluetooth2.png
deleted file mode 100644
index d354eb6..0000000
--- a/res/drawable-xxxhdpi/ic_settings_bluetooth2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_bluetooth2_alpha.png b/res/drawable-xxxhdpi/ic_settings_bluetooth2_alpha.png
new file mode 100644
index 0000000..284c94e
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_bluetooth2_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_data_usage.png b/res/drawable-xxxhdpi/ic_settings_data_usage.png
deleted file mode 100644
index 54d464b..0000000
--- a/res/drawable-xxxhdpi/ic_settings_data_usage.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_data_usage_alpha.png b/res/drawable-xxxhdpi/ic_settings_data_usage_alpha.png
new file mode 100644
index 0000000..55941d4
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_data_usage_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_date_time.png b/res/drawable-xxxhdpi/ic_settings_date_time.png
deleted file mode 100644
index 736bb3f..0000000
--- a/res/drawable-xxxhdpi/ic_settings_date_time.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_date_time_alpha.png b/res/drawable-xxxhdpi/ic_settings_date_time_alpha.png
new file mode 100644
index 0000000..4a5d491
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_date_time_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_development.png b/res/drawable-xxxhdpi/ic_settings_development.png
deleted file mode 100644
index eaf1f2c..0000000
--- a/res/drawable-xxxhdpi/ic_settings_development.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_development_alpha.png b/res/drawable-xxxhdpi/ic_settings_development_alpha.png
new file mode 100644
index 0000000..47f4547
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_development_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_display_am.png b/res/drawable-xxxhdpi/ic_settings_display_am.png
deleted file mode 100644
index 4f6933d..0000000
--- a/res/drawable-xxxhdpi/ic_settings_display_am.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_display_am_alpha.png b/res/drawable-xxxhdpi/ic_settings_display_am_alpha.png
new file mode 100644
index 0000000..ba90acc
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_display_am_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_dock.png b/res/drawable-xxxhdpi/ic_settings_dock.png
deleted file mode 100644
index 56aac4b..0000000
--- a/res/drawable-xxxhdpi/ic_settings_dock.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_dock_alpha.png b/res/drawable-xxxhdpi/ic_settings_dock_alpha.png
new file mode 100644
index 0000000..d5e4855
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_dock_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_home.png b/res/drawable-xxxhdpi/ic_settings_home.png
deleted file mode 100644
index 5d37a94..0000000
--- a/res/drawable-xxxhdpi/ic_settings_home.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_home_alpha.png b/res/drawable-xxxhdpi/ic_settings_home_alpha.png
new file mode 100644
index 0000000..2242f5e
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_home_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_language.png b/res/drawable-xxxhdpi/ic_settings_language.png
deleted file mode 100644
index c9447bd..0000000
--- a/res/drawable-xxxhdpi/ic_settings_language.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_language_alpha.png b/res/drawable-xxxhdpi/ic_settings_language_alpha.png
new file mode 100644
index 0000000..b5135c8
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_language_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_location.png b/res/drawable-xxxhdpi/ic_settings_location.png
deleted file mode 100644
index 67f5bad..0000000
--- a/res/drawable-xxxhdpi/ic_settings_location.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_location_alpha.png b/res/drawable-xxxhdpi/ic_settings_location_alpha.png
new file mode 100644
index 0000000..5ff19aa
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_location_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_more.png b/res/drawable-xxxhdpi/ic_settings_more.png
deleted file mode 100644
index b2083ba..0000000
--- a/res/drawable-xxxhdpi/ic_settings_more.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_more_alpha.png b/res/drawable-xxxhdpi/ic_settings_more_alpha.png
new file mode 100644
index 0000000..36384be
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_more_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_multiuser.png b/res/drawable-xxxhdpi/ic_settings_multiuser.png
deleted file mode 100644
index aad5c64..0000000
--- a/res/drawable-xxxhdpi/ic_settings_multiuser.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_multiuser_alpha.png b/res/drawable-xxxhdpi/ic_settings_multiuser_alpha.png
new file mode 100644
index 0000000..51fb328
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_multiuser_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_nfc_payment_am.png b/res/drawable-xxxhdpi/ic_settings_nfc_payment_am.png
deleted file mode 100644
index 01e1e0b..0000000
--- a/res/drawable-xxxhdpi/ic_settings_nfc_payment_am.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_nfc_payment_am_alpha.png b/res/drawable-xxxhdpi/ic_settings_nfc_payment_am_alpha.png
new file mode 100644
index 0000000..6c29a53
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_nfc_payment_am_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_notifications.png b/res/drawable-xxxhdpi/ic_settings_notifications.png
deleted file mode 100644
index 1619240..0000000
--- a/res/drawable-xxxhdpi/ic_settings_notifications.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_notifications_alpha.png b/res/drawable-xxxhdpi/ic_settings_notifications_alpha.png
new file mode 100644
index 0000000..bd3bebe
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_notifications_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_print.png b/res/drawable-xxxhdpi/ic_settings_print.png
deleted file mode 100644
index f0ffb52..0000000
--- a/res/drawable-xxxhdpi/ic_settings_print.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_print_alpha.png b/res/drawable-xxxhdpi/ic_settings_print_alpha.png
new file mode 100644
index 0000000..8634ca1
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_print_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_security.png b/res/drawable-xxxhdpi/ic_settings_security.png
deleted file mode 100644
index 9a3959b..0000000
--- a/res/drawable-xxxhdpi/ic_settings_security.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_security_alpha.png b/res/drawable-xxxhdpi/ic_settings_security_alpha.png
new file mode 100644
index 0000000..6abec60
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_security_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_sound.png b/res/drawable-xxxhdpi/ic_settings_sound.png
deleted file mode 100644
index 15352de..0000000
--- a/res/drawable-xxxhdpi/ic_settings_sound.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_sound_alpha.png b/res/drawable-xxxhdpi/ic_settings_sound_alpha.png
new file mode 100644
index 0000000..3292db8
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_sound_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_storage.png b/res/drawable-xxxhdpi/ic_settings_storage.png
deleted file mode 100644
index be02ffb..0000000
--- a/res/drawable-xxxhdpi/ic_settings_storage.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_storage_alpha.png b/res/drawable-xxxhdpi/ic_settings_storage_alpha.png
new file mode 100644
index 0000000..48581a6
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_storage_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_sync.png b/res/drawable-xxxhdpi/ic_settings_sync.png
deleted file mode 100644
index 7a741a7..0000000
--- a/res/drawable-xxxhdpi/ic_settings_sync.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_sync_alpha.png b/res/drawable-xxxhdpi/ic_settings_sync_alpha.png
new file mode 100644
index 0000000..450647a
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_sync_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_wireless.png b/res/drawable-xxxhdpi/ic_settings_wireless.png
deleted file mode 100644
index bcc4233..0000000
--- a/res/drawable-xxxhdpi/ic_settings_wireless.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_wireless_alpha.png b/res/drawable-xxxhdpi/ic_settings_wireless_alpha.png
new file mode 100644
index 0000000..a5d14b3
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_wireless_alpha.png
Binary files differ
diff --git a/res/drawable/bg_voice_position.xml b/res/drawable/bg_voice_position.xml
new file mode 100644
index 0000000..2fb29c2
--- /dev/null
+++ b/res/drawable/bg_voice_position.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2015 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/voice_interaction_highlight" />
+</shape>
diff --git a/res/drawable/fab_background.xml b/res/drawable/fab_background.xml
new file mode 100644
index 0000000..a692a2a
--- /dev/null
+++ b/res/drawable/fab_background.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/fab_ripple">
+    <item>
+        <shape>
+            <solid android:color="@color/fab_shape" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/res/drawable/ic_delete.xml b/res/drawable/ic_delete.xml
new file mode 100644
index 0000000..d4f79e3
--- /dev/null
+++ b/res/drawable/ic_delete.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2015 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24.0dp"
+        android:height="24.0dp"
+        android:tint="?android:attr/colorControlNormal"
+        android:viewportWidth="48.0"
+        android:viewportHeight="48.0">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12.0,38.0c0.0,2.21 1.79,4.0 4.0,4.0l16.0,0.0c2.21,0.0 4.0,-1.79 4.0,-4.0L36.0,14.0L12.0,14.0l0.0,24.0zM38.0,8.0l-7.0,0.0l-2.0,-2.0L19.0,6.0l-2.0,2.0l-7.0,0.0l0.0,4.0l28.0,0.0L38.0,8.0z"/>
+</vector>
diff --git a/res/drawable/ic_fingerprint.xml b/res/drawable/ic_fingerprint.xml
new file mode 100644
index 0000000..2f27753
--- /dev/null
+++ b/res/drawable/ic_fingerprint.xml
@@ -0,0 +1,36 @@
+<!--
+  ~ Copyright (C) 2015 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="32dp"
+        android:height="32dp"
+        android:viewportWidth="32.0"
+        android:viewportHeight="32.0">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M23.7,5.9c-0.1,0.0 -0.2,0.0 -0.3,-0.1C21.0,4.5 18.6,3.9 16.0,3.9c-2.5,0.0 -4.6,0.6 -6.9,1.9C8.8,6.0 8.3,5.9 8.1,5.5C7.9,5.2 8.0,4.7 8.4,4.5c2.5,-1.4 4.9,-2.1 7.7,-2.1c2.8,0.0 5.4,0.7 8.0,2.1c0.4,0.2 0.5,0.6 0.3,1.0C24.2,5.7 24.0,5.9 23.7,5.9z"/>
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M5.3,13.2c-0.1,0.0 -0.3,0.0 -0.4,-0.1c-0.3,-0.2 -0.4,-0.7 -0.2,-1.0c1.3,-1.9 2.9,-3.4 4.9,-4.5c4.1,-2.2 9.3,-2.2 13.4,0.0c1.9,1.1 3.6,2.5 4.9,4.4c0.2,0.3 0.1,0.8 -0.2,1.0c-0.3,0.2 -0.8,0.1 -1.0,-0.2c-1.2,-1.7 -2.6,-3.0 -4.3,-4.0c-3.7,-2.0 -8.3,-2.0 -12.0,0.0c-1.7,0.9 -3.2,2.3 -4.3,4.0C5.7,13.1 5.5,13.2 5.3,13.2z"/>
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M13.3,29.6c-0.2,0.0 -0.4,-0.1 -0.5,-0.2c-1.1,-1.2 -1.7,-2.0 -2.6,-3.6c-0.9,-1.7 -1.4,-3.7 -1.4,-5.9c0.0,-4.1 3.3,-7.4 7.4,-7.4c4.1,0.0 7.4,3.3 7.4,7.4c0.0,0.4 -0.3,0.7 -0.7,0.7s-0.7,-0.3 -0.7,-0.7c0.0,-3.3 -2.7,-5.9 -5.9,-5.9c-3.3,0.0 -5.9,2.7 -5.9,5.9c0.0,2.0 0.4,3.8 1.2,5.2c0.8,1.6 1.4,2.2 2.4,3.3c0.3,0.3 0.3,0.8 0.0,1.0C13.7,29.5 13.5,29.6 13.3,29.6z"/>
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M22.6,27.1c-1.6,0.0 -2.9,-0.4 -4.1,-1.2c-1.9,-1.4 -3.1,-3.6 -3.1,-6.0c0.0,-0.4 0.3,-0.7 0.7,-0.7s0.7,0.3 0.7,0.7c0.0,1.9 0.9,3.7 2.5,4.8c0.9,0.6 1.9,1.0 3.2,1.0c0.3,0.0 0.8,0.0 1.3,-0.1c0.4,-0.1 0.8,0.2 0.8,0.6c0.1,0.4 -0.2,0.8 -0.6,0.8C23.4,27.1 22.8,27.1 22.6,27.1z"/>
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M20.0,29.9c-0.1,0.0 -0.1,0.0 -0.2,0.0c-2.1,-0.6 -3.4,-1.4 -4.8,-2.9c-1.8,-1.9 -2.8,-4.4 -2.8,-7.1c0.0,-2.2 1.8,-4.1 4.1,-4.1c2.2,0.0 4.1,1.8 4.1,4.1c0.0,1.4 1.2,2.6 2.6,2.6c1.4,0.0 2.6,-1.2 2.6,-2.6c0.0,-5.1 -4.2,-9.3 -9.3,-9.3c-3.6,0.0 -6.9,2.1 -8.4,5.4C7.3,17.1 7.0,18.4 7.0,19.8c0.0,1.1 0.1,2.7 0.9,4.9c0.1,0.4 -0.1,0.8 -0.4,0.9c-0.4,0.1 -0.8,-0.1 -0.9,-0.4c-0.6,-1.8 -0.9,-3.6 -0.9,-5.4c0.0,-1.6 0.3,-3.1 0.9,-4.4c1.7,-3.8 5.6,-6.3 9.8,-6.3c5.9,0.0 10.7,4.8 10.7,10.7c0.0,2.2 -1.8,4.1 -4.1,4.1s-4.0,-1.8 -4.0,-4.1c0.0,-1.4 -1.2,-2.6 -2.6,-2.6c-1.4,0.0 -2.6,1.2 -2.6,2.6c0.0,2.3 0.9,4.5 2.4,6.1c1.2,1.3 2.4,2.0 4.2,2.5c0.4,0.1 0.6,0.5 0.5,0.9C20.6,29.7 20.3,29.9 20.0,29.9z"/>
+</vector>
diff --git a/res/drawable/ic_fingerprint_error.xml b/res/drawable/ic_fingerprint_error.xml
new file mode 100644
index 0000000..d00280d
--- /dev/null
+++ b/res/drawable/ic_fingerprint_error.xml
@@ -0,0 +1,30 @@
+<!--
+  ~ Copyright (C) 2015 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="32dp"
+        android:height="32dp"
+        android:viewportWidth="32.0"
+        android:viewportHeight="32.0">
+    <path
+        android:fillColor="@color/warning"
+        android:pathData="M15.99,2.5C8.53,2.5 2.5,8.54 2.5,16.0s6.03,13.5 13.49,13.5S29.5,23.46 29.5,16.0S23.45,2.5 15.99,2.5zM16.0,26.8c-5.97,0.0 -10.8,-4.83 -10.8,-10.8S10.03,5.2 16.0,5.2S26.8,10.03 26.8,16.0S21.97,26.8 16.0,26.8z"/>
+    <path
+        android:fillColor="@color/warning"
+        android:pathData="M14.65,20.05l2.7,0.0l0.0,2.7l-2.7,0.0z"/>
+    <path
+        android:fillColor="@color/warning"
+        android:pathData="M14.65,9.25l2.7,0.0l0.0,8.1l-2.7,0.0z"/>
+</vector>
diff --git a/res/drawable/ic_settings_about.xml b/res/drawable/ic_settings_about.xml
new file mode 100644
index 0000000..8266b90
--- /dev/null
+++ b/res/drawable/ic_settings_about.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_about_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_accessibility.xml b/res/drawable/ic_settings_accessibility.xml
new file mode 100644
index 0000000..63a8f77
--- /dev/null
+++ b/res/drawable/ic_settings_accessibility.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_accessibility_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_accounts.xml b/res/drawable/ic_settings_accounts.xml
new file mode 100644
index 0000000..bdd569d
--- /dev/null
+++ b/res/drawable/ic_settings_accounts.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_accounts_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_applications.xml b/res/drawable/ic_settings_applications.xml
new file mode 100644
index 0000000..e56fe7e
--- /dev/null
+++ b/res/drawable/ic_settings_applications.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_applications_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_backup.xml b/res/drawable/ic_settings_backup.xml
new file mode 100644
index 0000000..23f8081
--- /dev/null
+++ b/res/drawable/ic_settings_backup.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_backup_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_battery.xml b/res/drawable/ic_settings_battery.xml
new file mode 100644
index 0000000..a983b69
--- /dev/null
+++ b/res/drawable/ic_settings_battery.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_battery_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_bluetooth.xml b/res/drawable/ic_settings_bluetooth.xml
new file mode 100644
index 0000000..a76cd2c
--- /dev/null
+++ b/res/drawable/ic_settings_bluetooth.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_bluetooth_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_bluetooth2.xml b/res/drawable/ic_settings_bluetooth2.xml
new file mode 100644
index 0000000..df0f866
--- /dev/null
+++ b/res/drawable/ic_settings_bluetooth2.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_bluetooth2_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_data_usage.xml b/res/drawable/ic_settings_data_usage.xml
new file mode 100644
index 0000000..16da024
--- /dev/null
+++ b/res/drawable/ic_settings_data_usage.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_data_usage_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_date_time.xml b/res/drawable/ic_settings_date_time.xml
new file mode 100644
index 0000000..c722fce
--- /dev/null
+++ b/res/drawable/ic_settings_date_time.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_date_time_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_development.xml b/res/drawable/ic_settings_development.xml
new file mode 100644
index 0000000..42d043e
--- /dev/null
+++ b/res/drawable/ic_settings_development.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_development_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_display.xml b/res/drawable/ic_settings_display.xml
index 29cc3e4..ad846ce 100644
--- a/res/drawable/ic_settings_display.xml
+++ b/res/drawable/ic_settings_display.xml
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-/*
- * Copyright 2014, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/ic_settings_display_am"
-        android:autoMirrored="true"
-        />
+    android:src="@drawable/ic_settings_display_am_alpha"
+    android:tint="?android:attr/colorAccent"
+    android:autoMirrored="true" />
+
diff --git a/res/drawable/ic_settings_dock.xml b/res/drawable/ic_settings_dock.xml
new file mode 100644
index 0000000..c6d6571
--- /dev/null
+++ b/res/drawable/ic_settings_dock.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_dock_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_home.xml b/res/drawable/ic_settings_home.xml
new file mode 100644
index 0000000..86e108f
--- /dev/null
+++ b/res/drawable/ic_settings_home.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_home_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_language.xml b/res/drawable/ic_settings_language.xml
new file mode 100644
index 0000000..0130baa
--- /dev/null
+++ b/res/drawable/ic_settings_language.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_language_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_location.xml b/res/drawable/ic_settings_location.xml
new file mode 100644
index 0000000..da64367
--- /dev/null
+++ b/res/drawable/ic_settings_location.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_location_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_more.xml b/res/drawable/ic_settings_more.xml
new file mode 100644
index 0000000..7df6e1d
--- /dev/null
+++ b/res/drawable/ic_settings_more.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_more_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_multiuser.xml b/res/drawable/ic_settings_multiuser.xml
new file mode 100644
index 0000000..b793360
--- /dev/null
+++ b/res/drawable/ic_settings_multiuser.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_multiuser_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_nfc_payment.xml b/res/drawable/ic_settings_nfc_payment.xml
index 10672a9..897cd8b 100644
--- a/res/drawable/ic_settings_nfc_payment.xml
+++ b/res/drawable/ic_settings_nfc_payment.xml
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-/*
- * Copyright 2014, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/ic_settings_nfc_payment_am"
-        android:autoMirrored="true"
-        />
+    android:src="@drawable/ic_settings_nfc_payment_am_alpha"
+    android:tint="?android:attr/colorAccent"
+    android:autoMirrored="true" />
+
diff --git a/res/drawable/ic_settings_notifications.xml b/res/drawable/ic_settings_notifications.xml
new file mode 100644
index 0000000..da5aa38
--- /dev/null
+++ b/res/drawable/ic_settings_notifications.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_notifications_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_print.xml b/res/drawable/ic_settings_print.xml
new file mode 100644
index 0000000..4f30edf
--- /dev/null
+++ b/res/drawable/ic_settings_print.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_print_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_security.xml b/res/drawable/ic_settings_security.xml
new file mode 100644
index 0000000..fd23658
--- /dev/null
+++ b/res/drawable/ic_settings_security.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_security_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_sound.xml b/res/drawable/ic_settings_sound.xml
new file mode 100644
index 0000000..b84c224
--- /dev/null
+++ b/res/drawable/ic_settings_sound.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_sound_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_storage.xml b/res/drawable/ic_settings_storage.xml
new file mode 100644
index 0000000..b6714a9
--- /dev/null
+++ b/res/drawable/ic_settings_storage.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_storage_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_sync.xml b/res/drawable/ic_settings_sync.xml
new file mode 100644
index 0000000..2d30dac
--- /dev/null
+++ b/res/drawable/ic_settings_sync.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_sync_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_wifi.xml b/res/drawable/ic_settings_wifi.xml
new file mode 100644
index 0000000..9b58909
--- /dev/null
+++ b/res/drawable/ic_settings_wifi.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_wifi_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_wireless.xml b/res/drawable/ic_settings_wireless.xml
new file mode 100644
index 0000000..f663599
--- /dev/null
+++ b/res/drawable/ic_settings_wireless.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_wireless_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index 4158c88..d8da8fe 100644
--- a/res/layout-land/confirm_lock_password.xml
+++ b/res/layout-land/confirm_lock_password.xml
@@ -1,104 +1,92 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 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.
-*/
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
 -->
-<!-- This is basically the same layout as choose_lock_password. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/topLayout"
     android:orientation="vertical"
-    android:gravity="center_horizontal">
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent">
 
-    <LinearLayout
-        android:layout_width="match_parent"
+    <TextView
+        style="@android:style/TextAppearance.Material.Title"
+        android:id="@+id/headerText"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginTop="12dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
-        <!-- "Enter PIN(Password) to unlock" -->
-        <TextView android:id="@+id/headerText"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="horizontal"
-            android:layout_marginEnd="6dip"
-            android:layout_marginStart="6dip"
-            android:layout_marginTop="10dip"
-            android:layout_marginBottom="10dip"
-            android:gravity="start"
-            android:ellipsize="marquee"
-            android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="?android:attr/colorAccent"/>
+
+    <TextView
+        style="@android:style/TextAppearance.Material.Body1"
+        android:id="@+id/detailsText"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginTop="8dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         />
 
-        <!-- Password entry field -->
-        <EditText android:id="@+id/password_entry"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dip"
-            android:layout_marginBottom="5dip"
-            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:inputType="textPassword"
-            android:imeOptions="actionNext"
-            android:gravity="center"
-            android:textSize="24sp"
-            style="@style/TextAppearance.PasswordEntry"
-        />
-    </LinearLayout>
-
-    <!-- Spacer between password entry and keyboard -->
     <View
         android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1" />
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
 
-    <!-- Alphanumeric keyboard -->
-    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#00000000"
-        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
-        android:visibility="gone"
-    />
-
-    <RelativeLayout
+    <FrameLayout
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:background="@android:drawable/bottom_bar"
-        android:visibility="gone">
+        android:orientation="horizontal">
 
-        <Button android:id="@+id/cancel_button"
-            android:layout_width="150dip"
+        <Button
+            style="@android:style/Widget.Material.Button.Borderless"
+            android:id="@+id/cancelButton"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="5dip"
-            android:layout_alignParentStart="true"
-            android:text="@string/lockpassword_cancel_label"
-        />
+            android:layout_gravity="start|bottom"
+            android:text="@string/cancel"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="14dp"/>
 
-        <Button android:id="@+id/next_button"
-            android:layout_width="150dip"
+        <EditText android:id="@+id/password_entry"
+            android:layout_width="208dp"
             android:layout_height="wrap_content"
-            android:layout_margin="5dip"
-            android:layout_alignParentEnd="true"
-            android:drawableEnd="@drawable/ic_btn_next"
-            android:drawablePadding="10dip"
-            android:text="@string/lockpassword_continue_label"
-        />
+            android:layout_gravity="center_horizontal|bottom"
+            android:layout_marginBottom="26dp"
+            android:inputType="textPassword"
+            android:imeOptions="actionNext|flagNoFullscreen"
+            android:gravity="center"
+            android:textSize="16sp"
+            style="@style/TextAppearance.PasswordEntry"/>
 
-    </RelativeLayout>
+        <TextView style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
+            android:id="@+id/errorText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal|bottom"
+            android:layout_marginBottom="10dp"/>
 
-</LinearLayout>
+        <ImageView
+            android:id="@+id/fingerprintIcon"
+            android:layout_gravity="end|bottom"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="28dp"
+            android:layout_marginEnd="20dp"
+            android:visibility="gone"/>
+    </FrameLayout>
 
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-land/confirm_lock_pattern.xml b/res/layout-land/confirm_lock_pattern.xml
index b58b46f..0567fad 100644
--- a/res/layout-land/confirm_lock_pattern.xml
+++ b/res/layout-land/confirm_lock_pattern.xml
@@ -13,56 +13,102 @@
      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"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/topLayout"
     android:orientation="horizontal"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:clipChildren="false"
+    android:clipToPadding="false">
 
-    <!-- left side: instructions and messages -->
     <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1.0"
-            >
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_weight="1"
+        android:orientation="vertical">
 
-        <!-- header message -->
-        <TextView android:id="@+id/headerText"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:layout_marginTop="16dp"
-                  android:gravity="center"
-                  android:textSize="18sp"/>
+        <TextView
+            style="@android:style/TextAppearance.Material.Headline"
+            android:id="@+id/headerText"
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?android:attr/colorAccent"/>
 
-        <!-- fill space between header and button below -->
-        <View
-            android:layout_weight="1.0"
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            />
+        <TextView
+            style="@android:style/TextAppearance.Material.Body1"
+            android:id="@+id/detailsText"
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
+            android:layout_marginTop="12dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
 
-        <!-- footer message -->
-        <TextView android:id="@+id/footerText"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:gravity="center"
-                  android:textSize="14sp"/>
+        <Button
+            style="@android:style/Widget.Material.Button.Borderless"
+            android:id="@+id/cancelButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/cancel"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginTop="16dp"/>
     </LinearLayout>
 
-    <View
-         android:background="@*android:drawable/code_lock_left"
-         android:layout_width="2dip"
-         android:layout_height="match_parent" />
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:orientation="horizontal"
+        android:clipChildren="false"
+        android:clipToPadding="false">
 
-    <!-- right side: lock pattern -->
-    <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-         android:layout_width="match_parent"
-         android:layout_height="match_parent"
-         android:background="@color/lock_pattern_background" />
+        <View
+            android:id="@+id/leftSpacer"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.4"/>
 
+        <FrameLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:clipChildren="false"
+            android:clipToPadding="false">
+
+            <com.android.internal.widget.LockPatternView
+                android:id="@+id/lockPattern"
+                android:layout_width="288dp"
+                android:layout_height="288dp"
+                android:layout_marginStart="-42dp"
+                android:layout_marginEnd="-42dp"
+                android:layout_gravity="center_vertical"/>
+
+            <TextView
+                style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
+                android:id="@+id/errorText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|center_horizontal"
+                android:layout_marginBottom="24dp"/>
+        </FrameLayout>
+
+        <View
+            android:id="@+id/rightSpacer"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"/>
+
+        <ImageView
+            android:id="@+id/fingerprintIcon"
+            android:layout_gravity="center_vertical"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:visibility="gone"/>
+    </LinearLayout>
 
 </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
 
diff --git a/res/layout-sw600dp-land/confirm_lock_password.xml b/res/layout-sw600dp-land/confirm_lock_password.xml
deleted file mode 100644
index cbaad7a..0000000
--- a/res/layout-sw600dp-land/confirm_lock_password.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 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.
-*/
--->
-
-<!-- This is the same layout as choose_lock_password. TODO: find out why merge tag fails -->
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dip"
-        android:orientation="horizontal">
-
-        <!-- "Enter PIN(Password) to unlock" -->
-        <TextView android:id="@+id/headerText"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="horizontal"
-            android:layout_marginEnd="6dip"
-            android:layout_marginStart="6dip"
-            android:layout_marginTop="10dip"
-            android:layout_marginBottom="10dip"
-            android:gravity="start"
-            android:ellipsize="marquee"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-        />
-
-        <!-- Password entry field -->
-        <EditText android:id="@+id/password_entry"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dip"
-            android:layout_marginBottom="5dip"
-            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:inputType="textPassword"
-            android:imeOptions="actionNext"
-            android:gravity="center"
-            android:textSize="24sp"
-            style="@style/TextAppearance.PasswordEntry"
-        />
-    </LinearLayout>
-
-    <!-- confirm / restart buttons -->
-    <LinearLayout
-        style="@style/SecurityPreferenceButtonContainer"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:orientation="horizontal">
-
-        <!-- left / top button: skip, or re-try -->
-        <Button android:id="@+id/cancel_button"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpassword_cancel_label"/>
-
-        <!-- right / bottom button: confirm or ok -->
-        <Button android:id="@+id/next_button"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpassword_continue_label"/>
-
-    </LinearLayout>
-    <!-- Alphanumeric keyboard -->
-    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#00000000"
-        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
-        android:visibility="gone"
-    />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp-land/confirm_lock_pattern.xml b/res/layout-sw600dp-land/confirm_lock_pattern.xml
deleted file mode 100644
index a090a6f..0000000
--- a/res/layout-sw600dp-land/confirm_lock_pattern.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/topLayout"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal">
-
-    <!-- header message -->
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:layout_marginTop="40dip">
-
-        <TextView android:id="@+id/headerText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    </ScrollView>
-
-    <!-- footer message -->
-    <TextView android:id="@+id/footerText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dip"
-        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="0.6"/>
-
-    <!-- lock pattern widget -->
-    <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-        android:layout_width="354dip"
-        android:layout_height="354dip"
-        android:background="@color/lock_pattern_background"
-        aspect="square"/>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"/>
-
-</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
-
diff --git a/res/layout-sw600dp/confirm_lock_password.xml b/res/layout-sw600dp/confirm_lock_password.xml
index 12b6ab2..1649aaa 100644
--- a/res/layout-sw600dp/confirm_lock_password.xml
+++ b/res/layout-sw600dp/confirm_lock_password.xml
@@ -1,103 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-**
-** Copyright 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.
-*/
--->
+  ~ Copyright (C) 2015 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="48dp">
 
-<!-- This is the same layout as choose_lock_password -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:gravity="center_horizontal">
-
-    <!-- header text ('Enter Pin') -->
-    <TextView android:id="@+id/headerText"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    <!-- spacer above text entry field -->
-    <View
-        android:id="@+id/spacerBottom"
-        android:layout_width="fill_parent"
-        android:layout_height="1dip"
-        android:layout_marginTop="6dip"
-        android:background="@android:drawable/divider_horizontal_dark"
-    />
-
-    <!-- Password entry field -->
-    <EditText android:id="@+id/password_entry"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="15dip"
-        android:layout_marginStart="30dip"
-        android:layout_marginEnd="30dip"
-        android:layout_gravity="center"
-        android:inputType="textPassword"
-        android:imeOptions="actionNext"
-        android:gravity="center"
-        android:textSize="32sp"
-        style="@style/TextAppearance.PasswordEntry"
-    />
-
-    <!-- Spacer between password entry and keyboard -->
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1" />
-
-    <!-- Alphanumeric keyboard -->
-    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#00000000"
-        android:layout_marginBottom="30dip"
-        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
-        android:visibility="gone"
-    />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-    />
-
-    <RelativeLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent">
-
-        <LinearLayout
-            style="@style/SecurityPreferenceButtonContainer"
-            android:layout_alignParentEnd="true"
-            android:orientation="horizontal">
-
-            <Button android:id="@+id/cancel_button"
-                style="@style/SecurityPreferenceButton"
-                android:text="@string/lockpassword_cancel_label"/>
-
-            <Button android:id="@+id/next_button"
-                style="@style/SecurityPreferenceButton"
-                android:text="@string/lockpassword_continue_label"/>
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</LinearLayout>
-
+    <include layout="@layout/confirm_lock_password_base"
+        android:layout_width="328dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_horizontal"/>
+</FrameLayout>
diff --git a/res/layout-sw600dp/confirm_lock_pattern.xml b/res/layout-sw600dp/confirm_lock_pattern.xml
index 12e2b86..55e4fa1 100644
--- a/res/layout-sw600dp/confirm_lock_pattern.xml
+++ b/res/layout-sw600dp/confirm_lock_pattern.xml
@@ -13,48 +13,12 @@
      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:orientation="vertical"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal">
+    android:layout_height="match_parent">
 
-    <!-- top: instructions and buttons -->
-    <!-- header message -->
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:layout_marginTop="96dip">
-
-        <TextView android:id="@+id/headerText"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    </ScrollView>
-
-    <!-- footer message -->
-    <TextView android:id="@+id/footerText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dip"
-        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    <!-- bottom: lock pattern -->
-    <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-         android:layout_width="354dip"
-         android:layout_height="354dip"
-         android:layout_marginTop="80dip"
-         android:background="@color/lock_pattern_background"
-         aspect="square"/>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"/>
-
-</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
+    <include layout="@layout/confirm_lock_pattern_base"
+        android:layout_width="328dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_horizontal"/>
+</FrameLayout>
diff --git a/res/layout/app_preference_item.xml b/res/layout/app_preference_item.xml
index 22ee37e..b02f835 100755
--- a/res/layout/app_preference_item.xml
+++ b/res/layout/app_preference_item.xml
@@ -24,18 +24,29 @@
         android:id="@+id/app_image"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
+        android:adjustViewBounds="true"
         android:padding="6dip"
     />
-    <CheckedTextView
+    <TextView
         android:id="@+id/app_label"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:minHeight="?android:attr/listPreferredItemHeight"
-        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textAppearance="?android:attr/textAppearanceMedium"
         android:textColor="?android:attr/textColorAlertDialogListItem"
         android:gravity="center_vertical"
         android:paddingEnd="7dip"
-        android:checkMark="?android:attr/listChoiceIndicatorSingle"
         android:ellipsize="marquee"
     />
+    <TextView
+        android:id="@+id/default_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/listPreferredItemHeight"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:gravity="center_vertical"
+        android:text="@string/default_app"
+        android:visibility="gone"
+        android:paddingEnd="7dip"
+    />
 </LinearLayout>
diff --git a/res/layout/confirm_lock_password.xml b/res/layout/confirm_lock_password.xml
deleted file mode 100644
index c9a0bbe..0000000
--- a/res/layout/confirm_lock_password.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 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.
-*/
--->
-
-<!-- This is the same layout as choose_lock_password -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:gravity="center_horizontal">
-
-    <!-- header text ('Enter Pin') -->
-    <TextView android:id="@+id/headerText"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        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_marginStart="30dip"
-        android:layout_marginEnd="30dip"
-        android:layout_gravity="center"
-        android:inputType="textPassword"
-        android:imeOptions="actionNext"
-        android:gravity="center"
-        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" />
-
-    <!-- Alphanumeric keyboard -->
-    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#00000000"
-        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
-        android:visibility="gone"
-    />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-    />
-
-    <LinearLayout
-        style="@style/SecurityPreferenceButtonContainer"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:orientation="horizontal">
-
-        <!-- left / top button: skip, or re-try -->
-        <Button android:id="@+id/cancel_button"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpattern_tutorial_cancel_label"/>
-
-        <!-- right / bottom button: confirm or ok -->
-        <Button android:id="@+id/next_button"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpattern_tutorial_continue_label"/>
-
-    </LinearLayout>
-
-</LinearLayout>
-
diff --git a/res/layout/confirm_lock_password_base.xml b/res/layout/confirm_lock_password_base.xml
new file mode 100644
index 0000000..af4ffe8
--- /dev/null
+++ b/res/layout/confirm_lock_password_base.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/topLayout"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent">
+
+    <TextView
+        style="@android:style/TextAppearance.Material.Headline"
+        android:id="@+id/headerText"
+        android:layout_marginStart="?attr/confirmDeviceCredentialsSideMargin"
+        android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin"
+        android:layout_marginTop="?attr/confirmDeviceCredentialsTopMargin"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="?android:attr/colorAccent"/>
+
+    <TextView
+        style="@android:style/TextAppearance.Material.Body1"
+        android:id="@+id/detailsText"
+        android:layout_marginStart="?attr/confirmDeviceCredentialsSideMargin"
+        android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin"
+        android:layout_marginTop="12dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        />
+
+    <Button
+        style="@android:style/Widget.Material.Button.Borderless"
+        android:id="@+id/cancelButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/cancel"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="16dp"/>
+
+    <View android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <EditText
+        android:id="@+id/password_entry"
+        android:layout_width="208dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="-40dp"
+        android:inputType="textPassword"
+        android:imeOptions="actionNext"
+        android:gravity="center"
+        android:textSize="16sp"
+        style="@style/TextAppearance.PasswordEntry"/>
+
+    <TextView
+        style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
+        android:id="@+id/errorText"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
+        android:gravity="center_vertical"/>
+
+    <ImageView
+        android:id="@+id/fingerprintIcon"
+        android:layout_gravity="center_horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="24dp"
+        android:visibility="gone"/>
+
+</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
\ No newline at end of file
diff --git a/res/layout/confirm_lock_pattern.xml b/res/layout/confirm_lock_pattern.xml
deleted file mode 100644
index 4426242..0000000
--- a/res/layout/confirm_lock_pattern.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
-        xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/topLayout"
-    android:orientation="vertical"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent">
-
-    <TextView android:id="@+id/headerText"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1.0"
-        android:gravity="center"
-        android:textSize="18sp"/>
-
-    <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-         android:layout_width="match_parent"
-         android:layout_height="match_parent"
-         android:background="@color/lock_pattern_background" />
-
-    <TextView android:id="@+id/footerText"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1.0"
-        android:gravity="center"
-        android:textSize="14sp"/>
-
-</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout/confirm_lock_pattern_base.xml b/res/layout/confirm_lock_pattern_base.xml
new file mode 100644
index 0000000..029b856
--- /dev/null
+++ b/res/layout/confirm_lock_pattern_base.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/topLayout"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent">
+
+    <TextView
+        style="@android:style/TextAppearance.Material.Headline"
+        android:id="@+id/headerText"
+        android:layout_marginStart="?attr/confirmDeviceCredentialsSideMargin"
+        android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin"
+        android:layout_marginTop="?attr/confirmDeviceCredentialsTopMargin"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="?android:attr/colorAccent"/>
+
+    <TextView
+        style="@android:style/TextAppearance.Material.Body1"
+        android:id="@+id/detailsText"
+        android:layout_marginStart="?attr/confirmDeviceCredentialsSideMargin"
+        android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin"
+        android:layout_marginTop="12dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        />
+
+    <Button
+        style="@android:style/Widget.Material.Button.Borderless"
+        android:id="@+id/cancelButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/cancel"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="16dp"/>
+
+    <View android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="0.5"/>
+
+    <com.android.internal.widget.LockPatternView
+        android:id="@+id/lockPattern"
+        android:layout_width="312dp"
+        android:layout_height="312dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="-46dp"
+        android:layout_marginBottom="-46dp"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <TextView
+            style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
+            android:id="@+id/errorText"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="12dp"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp"
+            android:gravity="center_vertical"/>
+
+        <ImageView
+            android:id="@+id/fingerprintIcon"
+            android:layout_gravity="center_horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="24dp"
+            android:visibility="gone"/>
+    </LinearLayout>
+
+</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
\ No newline at end of file
diff --git a/res/layout/loading_container.xml b/res/layout/loading_container.xml
new file mode 100644
index 0000000..eb67044
--- /dev/null
+++ b/res/layout/loading_container.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/loading_container"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:visibility="gone"
+    android:gravity="center">
+
+    <ProgressBar style="?android:attr/progressBarStyleLarge"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <TextView android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:text="@string/settings_safetylegal_activity_loading"
+        android:paddingTop="4dip"
+        android:singleLine="true" />
+
+</LinearLayout>
diff --git a/res/layout/mac_preference.xml b/res/layout/mac_preference.xml
deleted file mode 100644
index f096b07..0000000
--- a/res/layout/mac_preference.xml
+++ /dev/null
@@ -1,79 +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:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall"
-    android:gravity="center_vertical"
-    android:orientation="vertical"
-    android:background="?android:attr/selectableItemBackground">
-
-    <View
-        android:layout_width="fill_parent"
-        android:layout_height="@dimen/wifi_divider_height"
-        android:background="@color/wifi_divider" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="?android:attr/listPreferredItemHeightSmall"
-        android:gravity="center_vertical"
-        android:background="?android:attr/selectableItemBackground">
-
-        <RelativeLayout
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:paddingTop="6dip"
-            android:paddingBottom="6dip">
-
-            <TextView
-                android:id="@+android:id/title"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:paddingStart="16dip"
-                android:paddingEnd="16dip"
-                android:singleLine="true"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:ellipsize="marquee"
-                android:fadingEdge="horizontal" />
-
-            <TextView
-                android:id="@android:id/summary"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_below="@android:id/title"
-                android:layout_alignStart="@android:id/title"
-                android:paddingStart="16dip"
-                android:layout_marginEnd="16dip"
-                android:visibility="gone"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorSecondary"
-                android:maxLines="4" />
-
-        </RelativeLayout>
-
-        <LinearLayout
-            android:id="@android:id/widget_frame"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:orientation="vertical" />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/res/layout/manage_applications_apps.xml b/res/layout/manage_applications_apps.xml
index 1e0518d..044cdb4 100644
--- a/res/layout/manage_applications_apps.xml
+++ b/res/layout/manage_applications_apps.xml
@@ -52,25 +52,7 @@
 
         </LinearLayout>
 
-        <LinearLayout android:id="@+id/loading_container"
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="gone"
-                android:gravity="center">
-
-            <ProgressBar style="?android:attr/progressBarStyleLarge"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-            <TextView android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:text="@string/settings_safetylegal_activity_loading"
-                    android:paddingTop="4dip"
-                    android:singleLine="true" />
-
-        </LinearLayout>
+        <include layout="@layout/loading_container" />
 
     </FrameLayout>
 
diff --git a/res/layout/manage_applications_running.xml b/res/layout/manage_applications_running.xml
index 485523a..6a9d4e5 100644
--- a/res/layout/manage_applications_running.xml
+++ b/res/layout/manage_applications_running.xml
@@ -29,25 +29,7 @@
                 android:layout_height="match_parent"
                 android:visibility="gone" />
 
-        <LinearLayout android:id="@+id/loading_container"
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="gone"
-                android:gravity="center">
-
-            <ProgressBar style="?android:attr/progressBarStyleLarge"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-            <TextView android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:text="@string/settings_safetylegal_activity_loading"
-                    android:paddingTop="4dip"
-                    android:singleLine="true" />
-
-        </LinearLayout>
+        <include layout="@layout/loading_container" />
 
     </FrameLayout>
 
diff --git a/res/layout/preference_list_fragment.xml b/res/layout/preference_list_fragment.xml
index b47e175..1412381 100644
--- a/res/layout/preference_list_fragment.xml
+++ b/res/layout/preference_list_fragment.xml
@@ -29,20 +29,39 @@
                  android:layout_height="wrap_content"
                  android:visibility="gone" />
 
-    <ListView android:id="@android:id/list"
-              style="@style/PreferenceFragmentListSinglePane"
-              android:layout_width="match_parent"
-              android:layout_height="0px"
-              android:layout_weight="1"
-              android:paddingStart="@dimen/settings_side_margin"
-              android:paddingEnd="@dimen/settings_side_margin"
-              android:paddingTop="@dimen/dashboard_padding_top"
-              android:paddingBottom="@dimen/dashboard_padding_bottom"
-              android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle"
-              android:clipToPadding="false"
-              android:drawSelectorOnTop="false"
-              android:elevation="@dimen/dashboard_category_elevation"
-              android:scrollbarAlwaysDrawVerticalTrack="true" />
+    <FrameLayout android:layout_height="0px"
+                 android:layout_weight="1"
+                 android:layout_width="match_parent">
+
+        <ListView android:id="@android:id/list"
+                  style="@style/PreferenceFragmentListSinglePane"
+                  android:layout_width="match_parent"
+                  android:layout_height="match_parent"
+                  android:paddingStart="@dimen/settings_side_margin"
+                  android:paddingEnd="@dimen/settings_side_margin"
+                  android:paddingTop="@dimen/dashboard_padding_top"
+                  android:paddingBottom="@dimen/dashboard_padding_bottom"
+                  android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle"
+                  android:clipToPadding="false"
+                  android:drawSelectorOnTop="false"
+                  android:elevation="@dimen/dashboard_category_elevation"
+                  android:scrollbarAlwaysDrawVerticalTrack="true" />
+
+        <include layout="@layout/loading_container" />
+
+        <com.android.settings.widget.FloatingActionButton
+                  android:id="@+id/fab"
+                  android:visibility="gone"
+                  android:clickable="true"
+                  android:layout_width="@dimen/fab_size"
+                  android:layout_height="@dimen/fab_size"
+                  android:layout_gravity="bottom|end"
+                  android:layout_marginEnd="@dimen/fab_margin"
+                  android:layout_marginBottom="@dimen/fab_margin"
+                  android:elevation="@dimen/fab_elevation"
+                  android:background="@drawable/fab_background" />
+
+    </FrameLayout>
 
     <TextView android:id="@android:id/empty"
               android:layout_width="match_parent"
diff --git a/res/layout/preference_storage_action.xml b/res/layout/preference_storage_action.xml
new file mode 100644
index 0000000..10f138b
--- /dev/null
+++ b/res/layout/preference_storage_action.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/unmount"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:paddingStart="16dip"
+        android:paddingEnd="16dip"
+        android:contentDescription="@string/storage_menu_unmount"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:textSize="30sp"
+        android:background="?android:attr/selectableItemBackground" />
+
+    <!--
+    <ImageView
+        android:id="@+id/eject"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:paddingStart="16dip"
+        android:paddingEnd="16dip"
+        android:src="@drawable/ic_sync_green_holo"
+        android:contentDescription="@string/storage_menu_eject"
+        android:layout_gravity="center"
+        android:background="?android:attr/selectableItemBackground" />
+    -->
+</LinearLayout>
diff --git a/res/layout/settings_storage_miscfiles.xml b/res/layout/settings_storage_miscfiles.xml
deleted file mode 100644
index 0360cde..0000000
--- a/res/layout/settings_storage_miscfiles.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2010, 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.settings.deviceinfo.FileItemInfoLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:paddingEnd="?android:attr/scrollbarSize"
-    android:background="?android:attr/selectableItemBackground"
-    android:gravity="center_vertical"
-    android:focusable="true">
-
-    <CheckBox android:id="@+id/misc_checkbox"
-              android:layout_width="wrap_content"
-              android:layout_height="match_parent"
-              android:layout_alignParentStart="true"
-              android:paddingStart="16dip"
-              android:scaleType="fitCenter"
-              android:layout_centerVertical="true"/>
-
-    <TextView android:id="@+id/misc_filename"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_toEndOf="@id/misc_checkbox"
-              android:maxLines="1"
-              android:paddingStart="16dip"
-              android:textAppearance="?android:attr/textAppearanceSmall"/>
-
-    <TextView android:id="@+id/misc_filesize"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_toEndOf="@id/misc_checkbox"
-              android:layout_below="@id/misc_filename"
-              android:maxLines="1"
-              android:paddingStart="16dip"
-              android:textStyle="bold"
-              android:textAppearance="?android:attr/textAppearanceSmall" />
-</com.android.settings.deviceinfo.FileItemInfoLayout>
-
diff --git a/res/layout/settings_storage_miscfiles_list.xml b/res/layout/settings_storage_miscfiles_list.xml
deleted file mode 100644
index b712073..0000000
--- a/res/layout/settings_storage_miscfiles_list.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingEnd="16dip"
-    android:paddingStart="16dip">
-
-    <ListView android:id="@android:id/list"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"/>
-
-</FrameLayout>
-
diff --git a/res/layout/setup_wifi_required_info.xml b/res/layout/setup_wifi_required_info.xml
deleted file mode 100644
index 574366a..0000000
--- a/res/layout/setup_wifi_required_info.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/wifi_required_info"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="@dimen/setup_wizard_margin_top"
-    android:paddingBottom="6dip"
-    android:paddingStart="@dimen/setup_wizard_margin_sides"
-    android:paddingEnd="@dimen/setup_wizard_margin_sides"
-    android:text="@string/wifi_required_info_text"
-    android:textAppearance="@style/TextAppearance.SetupWizardDescription" />
diff --git a/res/layout/storage_internal_format.xml b/res/layout/storage_internal_format.xml
new file mode 100644
index 0000000..b7a36ca
--- /dev/null
+++ b/res/layout/storage_internal_format.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+        <TextView
+            android:id="@+id/body"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="@dimen/suw_description_margin_top"
+            android:paddingBottom="@dimen/suw_description_margin_bottom"
+            android:paddingStart="@dimen/suw_layout_margin_sides"
+            android:paddingEnd="@dimen/suw_layout_margin_sides"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="?android:attr/textColorPrimary" />
+    </ScrollView>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="4dp">
+        <Button
+            android:id="@+id/confirm"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/storage_menu_format" />
+    </FrameLayout>
+
+</LinearLayout>
diff --git a/res/layout/storage_internal_unmount.xml b/res/layout/storage_internal_unmount.xml
new file mode 100644
index 0000000..4779829
--- /dev/null
+++ b/res/layout/storage_internal_unmount.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+        <TextView
+            android:id="@+id/body"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="@dimen/suw_description_margin_top"
+            android:paddingBottom="@dimen/suw_description_margin_bottom"
+            android:paddingStart="@dimen/suw_layout_margin_sides"
+            android:paddingEnd="@dimen/suw_layout_margin_sides"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="?android:attr/textColorPrimary" />
+    </ScrollView>
+
+    <Space
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="4dp">
+        <Button
+            android:id="@+id/confirm"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/storage_menu_unmount" />
+    </FrameLayout>
+
+</LinearLayout>
diff --git a/res/layout/storage_wizard_generic.xml b/res/layout/storage_wizard_generic.xml
new file mode 100644
index 0000000..4f0cef9
--- /dev/null
+++ b/res/layout/storage_wizard_generic.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.setupwizardlib.SetupWizardLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:suwBackgroundTile="@drawable/illustration_tile"
+    app:suwIllustrationHorizontalTile="@drawable/illustration_horizontal"
+    app:suwIllustrationImage="@drawable/illustration_generic">
+
+    <LinearLayout
+        style="@style/SuwContentFrame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/storage_wizard_body"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/suw_description_margin_top"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="?android:attr/textColorPrimary" />
+
+        <TextView
+            android:id="@+id/storage_wizard_second_body"
+            android:visibility="gone"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/suw_description_margin_top"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="?android:attr/textColorPrimary" />
+
+    </LinearLayout>
+
+</com.android.setupwizardlib.SetupWizardLayout>
diff --git a/res/layout/storage_wizard_init.xml b/res/layout/storage_wizard_init.xml
new file mode 100644
index 0000000..421477c
--- /dev/null
+++ b/res/layout/storage_wizard_init.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.setupwizardlib.SetupWizardLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:suwBackgroundTile="@drawable/illustration_tile"
+    app:suwIllustrationHorizontalTile="@drawable/illustration_horizontal"
+    app:suwIllustrationImage="@drawable/illustration_generic">
+
+    <!-- android:layout="@layout/suw_template_short" -->
+
+    <LinearLayout
+        style="@style/SuwContentFrame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <RadioButton
+            android:id="@+id/storage_wizard_init_external_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/suw_description_margin_top"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+            android:textColor="?android:attr/textColorPrimary"
+            android:text="@string/storage_wizard_init_external_title" />
+        <TextView
+            android:id="@+id/storage_wizard_init_external_summary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="?android:attr/textColorSecondary"
+            android:text="@string/storage_wizard_init_external_summary" />
+
+        <RadioButton
+            android:id="@+id/storage_wizard_init_internal_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/suw_description_margin_top"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+            android:textColor="?android:attr/textColorPrimary"
+            android:text="@string/storage_wizard_init_internal_title" />
+        <TextView
+            android:id="@+id/storage_wizard_init_internal_summary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="?android:attr/textColorSecondary"
+            android:text="@string/storage_wizard_init_internal_summary" />
+
+    </LinearLayout>
+
+</com.android.setupwizardlib.SetupWizardLayout>
diff --git a/res/layout/storage_wizard_migrate.xml b/res/layout/storage_wizard_migrate.xml
new file mode 100644
index 0000000..827a5d2
--- /dev/null
+++ b/res/layout/storage_wizard_migrate.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.setupwizardlib.SetupWizardLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:suwBackgroundTile="@drawable/illustration_tile"
+    app:suwIllustrationHorizontalTile="@drawable/illustration_horizontal"
+    app:suwIllustrationImage="@drawable/illustration_generic">
+
+    <LinearLayout
+        style="@style/SuwContentFrame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/storage_wizard_body"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/suw_description_margin_top"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="?android:attr/textColorPrimary" />
+
+        <RadioButton
+            android:id="@+id/storage_wizard_migrate_now"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/suw_description_margin_top"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+            android:textColor="?android:attr/textColorPrimary"
+            android:text="@string/storage_wizard_migrate_now" />
+        <RadioButton
+            android:id="@+id/storage_wizard_migrate_later"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+            android:textColor="?android:attr/textColorPrimary"
+            android:text="@string/storage_wizard_migrate_later" />
+
+    </LinearLayout>
+
+</com.android.setupwizardlib.SetupWizardLayout>
diff --git a/res/layout/storage_wizard_progress.xml b/res/layout/storage_wizard_progress.xml
new file mode 100644
index 0000000..52fd203
--- /dev/null
+++ b/res/layout/storage_wizard_progress.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.setupwizardlib.SetupWizardLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:suwBackgroundTile="@drawable/illustration_tile"
+    app:suwIllustrationHorizontalTile="@drawable/illustration_horizontal"
+    app:suwIllustrationImage="@drawable/illustration_generic">
+
+    <LinearLayout
+        style="@style/SuwContentFrame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <ProgressBar
+            android:id="@+id/storage_wizard_progress"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/suw_description_margin_top"
+            android:indeterminate="false"
+            style="?android:attr/progressBarStyleHorizontal" />
+        <TextView
+            android:id="@+id/storage_wizard_progress_summary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="?android:attr/textColorSecondary" />
+
+        <TextView
+            android:id="@+id/storage_wizard_body"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/suw_description_margin_top"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="?android:attr/textColorPrimary" />
+
+    </LinearLayout>
+
+</com.android.setupwizardlib.SetupWizardLayout>
diff --git a/res/layout/storage_wizard_ready.xml b/res/layout/storage_wizard_ready.xml
new file mode 100644
index 0000000..5cb2e33
--- /dev/null
+++ b/res/layout/storage_wizard_ready.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.setupwizardlib.SetupWizardLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:suwBackgroundTile="@drawable/illustration_tile"
+    app:suwIllustrationHorizontalTile="@drawable/illustration_horizontal"
+    app:suwIllustrationImage="@drawable/illustration_generic">
+
+    <LinearLayout
+        style="@style/SuwContentFrame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/storage_wizard_ready_body"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/suw_description_margin_top"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="?android:attr/textColorPrimary" />
+
+    </LinearLayout>
+
+</com.android.setupwizardlib.SetupWizardLayout>
diff --git a/res/layout/switch_bar.xml b/res/layout/switch_bar.xml
index 4d33518..7136624 100644
--- a/res/layout/switch_bar.xml
+++ b/res/layout/switch_bar.xml
@@ -24,6 +24,8 @@
               android:layout_width="0dp"
               android:layout_weight="1"
               android:layout_gravity="center_vertical"
+              android:maxLines="2"
+              android:ellipsize="end"
               android:textAppearance="@style/TextAppearance.Switch"
               android:textColor="?android:attr/textColorPrimary"
               android:textAlignment="viewStart" />
diff --git a/res/layout/voice_interaction.xml b/res/layout/voice_interaction.xml
new file mode 100644
index 0000000..ed0cd1a
--- /dev/null
+++ b/res/layout/voice_interaction.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:padding="8dp"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="@color/voice_interaction_highlight"
+        android:id="@+id/voice_fragment_header" />
+    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/voice_fragment_root"
+        android:padding="8dp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>
diff --git a/res/layout/voice_item_row.xml b/res/layout/voice_item_row.xml
new file mode 100644
index 0000000..eca5ac9
--- /dev/null
+++ b/res/layout/voice_item_row.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+    <LinearLayout
+        android:id="@+id/row_one"
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_marginTop="15dp"
+        android:layout_marginBottom="15dp">
+
+        <TextView
+            android:layout_width="0px"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:id="@+id/voice_item_label" />
+
+        <TextView
+            android:layout_width="80px"
+            android:layout_height="80px"
+            android:gravity="center_horizontal|center_vertical"
+            android:background="@drawable/bg_voice_position"
+            android:textAppearance="?android:attr/textAppearanceMediumInverse"
+            android:textStyle="bold"
+            android:id="@+id/voice_item_position" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/layout/zen_rule_name.xml b/res/layout/zen_rule_name.xml
new file mode 100755
index 0000000..a192c83
--- /dev/null
+++ b/res/layout/zen_rule_name.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content" >
+
+    <EditText
+        android:id="@+id/rule_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:singleLine="true"
+        android:layout_marginLeft="22dp"
+        android:layout_marginRight="22dp" >
+
+        <requestFocus />
+
+    </EditText>
+
+    <RadioGroup
+        android:id="@+id/rule_types"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="22dp"
+        android:layout_marginRight="22dp"
+        android:layout_marginTop="16dp"
+        android:orientation="vertical"
+        android:checkedButton="@+id/rule_type_schedule" >
+
+        <RadioButton android:id="@+id/rule_type_schedule"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/zen_schedule_rule_type_name" />
+
+        <RadioButton android:id="@+id/rule_type_2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <RadioButton android:id="@+id/rule_type_3"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <RadioButton android:id="@+id/rule_type_4"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </RadioGroup>
+
+</LinearLayout>
diff --git a/res/layout/zen_downtime_day.xml b/res/layout/zen_schedule_rule_day.xml
similarity index 92%
rename from res/layout/zen_downtime_day.xml
rename to res/layout/zen_schedule_rule_day.xml
index 8d2fa73..1d300d2 100755
--- a/res/layout/zen_downtime_day.xml
+++ b/res/layout/zen_schedule_rule_day.xml
@@ -20,4 +20,4 @@
     android:minHeight="?android:attr/listPreferredItemHeightSmall"
     android:textAppearance="?android:attr/textAppearanceMedium"
     android:gravity="center_vertical"
-    android:paddingStart="@dimen/zen_downtime_checkbox_padding" />
+    android:paddingStart="@dimen/zen_schedule_rule_checkbox_padding" />
diff --git a/res/menu/manage_apps.xml b/res/menu/manage_apps.xml
index 577e981..225f974 100644
--- a/res/menu/manage_apps.xml
+++ b/res/menu/manage_apps.xml
@@ -18,6 +18,25 @@
     <item
         android:id="@+id/advanced"
         android:title="@string/advanced_apps"
-        android:icon="@drawable/ic_settings_24dp"
-        android:showAsAction="collapseActionView|ifRoom" />
+        android:showAsAction="never" />
+    <item
+        android:id="@+id/show_system"
+        android:title="@string/menu_show_system"
+        android:showAsAction="never" />
+    <item
+        android:id="@+id/hide_system"
+        android:title="@string/menu_hide_system"
+        android:showAsAction="never" />
+    <item
+        android:id="@+id/sort_order_alpha"
+        android:title="@string/sort_order_alpha"
+        android:showAsAction="never" />
+    <item
+        android:id="@+id/sort_order_size"
+        android:title="@string/sort_order_size"
+        android:showAsAction="never" />
+    <item
+        android:id="@+id/reset_app_preferences"
+        android:title="@string/reset_app_preferences"
+        android:showAsAction="never" />
 </menu>
diff --git a/res/menu/storage_volume.xml b/res/menu/storage_volume.xml
new file mode 100644
index 0000000..093a4bb
--- /dev/null
+++ b/res/menu/storage_volume.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/storage_rename"
+        android:title="@string/storage_menu_rename" />
+    <item
+        android:id="@+id/storage_mount"
+        android:title="@string/storage_menu_mount" />
+    <item
+        android:id="@+id/storage_unmount"
+        android:title="@string/storage_menu_unmount" />
+    <item
+        android:id="@+id/storage_format"
+        android:title="@string/storage_menu_format" />
+    <item
+        android:id="@+id/storage_usb"
+        android:title="@string/storage_menu_usb" />
+</menu>
diff --git a/res/menu/zen_mode_rule.xml b/res/menu/zen_mode_rule.xml
new file mode 100644
index 0000000..eea30a8
--- /dev/null
+++ b/res/menu/zen_mode_rule.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/delete"
+        android:title="@string/zen_mode_delete_rule"
+        android:icon="@drawable/ic_delete"
+        android:visible="true"
+        android:showAsAction="collapseActionView|ifRoom" />
+</menu>
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 402523d..b86fc70 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Druk knoppie"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"laag"</item>
     <item msgid="4212263919458209842">"kritiek"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Af"</item>
-    <item msgid="5656544177755411222">"Beperkte onderbrekings"</item>
-    <item msgid="8735337502532332056">"Geen onderbrekings nie"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normaal"</item>
     <item msgid="866544120205026771">"Matig"</item>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index cae7ad0..a751800 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kaart"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Instaan-instellings"</string>
     <string name="cancel" msgid="6859253417269739139">"Kanselleer"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"KANSELLEER"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"GAAN VOORT"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"JA"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NEE"</string>
-    <string name="forget" msgid="7267115980248732932">"VERGEET"</string>
+    <string name="forget" msgid="1400428660472591263">"Vergeet"</string>
+    <string name="save" msgid="879993180139353333">"Stoor"</string>
+    <string name="done" msgid="6942539184162713160">"Klaar"</string>
     <string name="settings_label" msgid="1626402585530130914">"Instellings"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Instellings"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Instellingskortpad"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Prop jou laaier in en probeer weer."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Geen skermslot-PIN of -wagwoord nie"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Jy moet \'n PIN of wagwoord vir die skermslot stel, voordat jy met enkripsie kan begin."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Jy moet jou ontsluitpatroon teken om die enkriptering van jou toestel te bevestig."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Enkripteer?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Die enkripsiehandeling is onomkeerbaar en as jy dit onderbreek, sal jy data verloor. Enkripsie neem \'n uur of langer en in daardie tyd sal die tablet \'n paar keer herbegin."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Die enkripsiehandeling is onomkeerbaar en as jy dit onderbreek, sal jy data verloor. Enkripsie neem \'n uur of langer en in daardie tyd sal die foon \'n paar keer herbegin."</string>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Gevorderd"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Gevorderde Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Wanneer Bluetooth aangeskakel is, kan jou toestel met ander nabygeleë Bluetooth-toestelle kommunikeer."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"Om liggingakkuraatheid te verbeter, sal Google-dienste Bluetooth-toestelle soek selfs wanneer Bluetooth af is. Jy kan dit in LINK_BEGINsoekinstellingsLINK_END verander."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Om liggingakkuraatheid te verbeter, sal programme en dienste Bluetooth-toestelle soek, selfs as Bluetooth af is. Jy kan dit in <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>soekinstellings<xliff:g id="LINK_END_1">LINK_END</xliff:g> verander."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Koppel aan…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sal van mediaoudio ontkoppel word."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>sal van vryhandse oudio ontkoppel word."</string>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"Om liggingakkuraatheid te verbeter, sal Google-dienste Wi-Fi-netwerke soek selfs wanneer Wi-Fi af is. Jy kan dit in LINK_BEGINsoekinstellingsLINK_END verander."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Om liggingakkuraatheid te verbeter, sal programme en dienste Wi-Fi-netwerke soek, selfs as Wi-Fi af is. Jy kan dit in <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>soekinstellings<xliff:g id="LINK_END_1">LINK_END</xliff:g> verander."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Moenie weer wys nie"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Hou Wi-Fi aan tydens sluimer"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi aan tydens slaap"</string>
@@ -604,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skandeer"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Gevorderd"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Wys programme"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Wys Wi-Fi-sterkte"</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>
@@ -663,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Meld aan om te koppel?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> eis dat jy voor netwerkkoppeling aanlyn aanmeld."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"KOPPEL"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Hierdie netwerk het nie internettoegang nie. Moet hierdie netwerk in elk geval gebruik word?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Moenie weer vir hierdie netwerk vra nie"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Koppel"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Netwerkverbinding het misluk"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Vergeet"</string>
@@ -729,21 +726,17 @@
     <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> draagbare Wi-Fi-warmkol"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi-oproepe"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Oproepvoorkeur"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi-oproepmodus"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Verkieslik Wi-Fi"</item>
     <item msgid="5267397515594230396">"Verkieslik sellulêr"</item>
-    <item msgid="3132912693346866895">"Net Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"As Wi-Fi-oproepe aan is, kan jou foon oproepe deur Wi-Fi-netwerke of jou diensverskaffer se netwerk roeteer, afhangend van jou voorkeur en watter sein die sterkste is. Voordat jy hierdie kenmerk aanskakel, vind by jou diensverskaffer oor tariewe en ander besonderhede uit."</string>
     <string name="home_settings" msgid="212375129455718176">"Tuis"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skerm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Klank"</string>
@@ -915,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Beskikbaar (leesalleen)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Totale spasie"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Bereken tans…"</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Programme (programdata en media-inhoud)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Programme en programdata"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Aflaaisels"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Prente, video\'s"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Oudio (musiek, luitone, podsendings ens.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Diverse"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Ander lêers"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Gekasseerde data"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Ontheg gedeelde berging"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Ontheg SD-kaart"</string>
@@ -953,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Onthegting besig"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Bergingspasie is besig om min te raak"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Sommige stelselfunksies, soos sinkronisasie, werk moontlik nie korrek nie. Probeer om ruimte te skep deur items, soos programme of media-inhoud, uit te vee of los te speld."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Hernoem"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Monteer"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Demonteer"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Vee uit en formateer"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Vee uit en formateer as intern"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB-rekenaaraansluiting"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-rekenaaraansluiting"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Koppel as"</string>
@@ -963,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Laat MIDI-geaktiveerde programme deur USB met MIDI-sagteware op jou rekenaar werk."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Ander gebruikers"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Toestelberging"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Verwyderbare berging"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> beskikbaar (Totaal <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> is gemonteer"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Kon <xliff:g id="NAME">%1$s</xliff:g> nie monteer nie"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> is veilig gedemonteer"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Kon <xliff:g id="NAME">%1$s</xliff:g> nie veilig demonteer nie"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> is geformateer"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Kon <xliff:g id="NAME">%1$s</xliff:g> nie formateer nie"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Hernoem berging"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Nadat dit geformateer is, kan jy hierdie <xliff:g id="NAME_0">^1</xliff:g> in ander toestelle gebruik. \n\nAlle data op hierdie <xliff:g id="NAME_1">^1</xliff:g> sal uitgevee word. Oorweeg dit om dit eers te rugsteun. \n\n"<b>"Rugsteun foto\'s en ander media"</b>" \nSkuif jou medialêers na alternatiewe berging in hierdie toestel, of dra hulle met gebruik van \'n USB-kabel na \'n rekenaar oor. \n\n"<b>"Rugsteun programme"</b>" \nAlle programme wat op hierdie <xliff:g id="NAME_6">^1</xliff:g> geberg is, sal gedeïnstalleer word, en hul data sal uitgevee word. Skuif hierdie programme na alternatiewe berging in hierdie toestel om hulle te hou."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"As jy hierdie <xliff:g id="NAME_0">^1</xliff:g> uithaal, sal programme daarop ophou werk, en medialêers wat daarop geberg is, sal nie beskikbaar wees voordat dit weer ingesit word nie."</b>" \n\nHierdie <xliff:g id="NAME_1">^1</xliff:g> is geformateer om net in hierdie toestel te werk. Dit sal nie in enige ander toestelle werk nie."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Stel jou <xliff:g id="NAME">^1</xliff:g> op"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Gebruik as draagbare berging"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Om foto\'s en ander media tussen toestelle te skuif."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Gebruik as interne berging"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Om enigiets, insluitend programme en foto\'s, net in hierdie toestel te berg. Daarvoor word formatering vereis wat keer dat dit in ander toestelle werk."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formateer as interne berging"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Dit vereis dat die <xliff:g id="NAME_0">^1</xliff:g> geformateer word om dit veilig te maak. \n\nNadat dit geformateer is, sal hierdie <xliff:g id="NAME_1">^1</xliff:g> net in hierdie toestel werk. \n\n"<b>"Formatering vee alle data uit wat tans op die <xliff:g id="NAME_2">^1</xliff:g> geberg is."</b>" Oorweeg dit om die data te rugsteun om te keer dat jy dit verloor."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Vee uit en formateer"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formateer tans <xliff:g id="NAME">^1</xliff:g> …"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Moenie die <xliff:g id="NAME">^1</xliff:g> verwyder terwyl dit geformateer word nie."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Skuif data na nuwe berging"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Jy kan jou foto\'s, lêers en programdata na hierdie nuwe <xliff:g id="NAME">^1</xliff:g> skuif. \n\nDit sal sowat <xliff:g id="TIME">^2</xliff:g> neem om te skuif en sal <xliff:g id="SIZE">^3</xliff:g> interne berging beskikbaar stel. Sommige programme sal nie werk terwyl dit besig is nie."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Skuif nou"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Skuif later"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Skuif data nou"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Dit neem sowat <xliff:g id="TIME">^1</xliff:g> om te skuif. Dit sal <xliff:g id="SIZE">^2</xliff:g> interne berging beskikbaar stel."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Skuif"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Skuif tans data …"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Terwyl daar geskuif word: \n• Moenie die <xliff:g id="NAME">^1</xliff:g> verwyder nie. \n• Sommige programme sal nie reg werk nie. \n• Hou die toestel gelaai."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> is gereed"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Jou <xliff:g id="NAME">^1</xliff:g> is gereed om saam met foto\'s en ander media te gebruik."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Jou nuwe <xliff:g id="NAME">^1</xliff:g> werk nou. \n\nOm foto\'s, lêers en programdata na hierdie toestel te skuif, gaan na Instellings &gt; Berging."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Skuif <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Dit sal \'n kort rukkie vat om <xliff:g id="APP">^1</xliff:g> en sy data na <xliff:g id="NAME_0">^2</xliff:g> te skuif. Jy sal nie die program kan gebruik voordat dit klaar geskuif is nie. \n\nMoenie die <xliff:g id="NAME_1">^2</xliff:g> verwyder terwyl daar geskuif word nie."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Skuif tans <xliff:g id="APP">^1</xliff:g> …"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Moenie die <xliff:g id="NAME">^1</xliff:g> verwyder terwyl daar geskuif word nie. \n\nDie <xliff:g id="APP">^2</xliff:g>-program in hierdie toestel sal nie beskikbaar wees voordat dit klaar geskuif is nie."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Kanselleer skuif"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Batterystatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Batteryvlak"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Toegangspuntname"</string>
@@ -1007,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Stel terug na verstek"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Terugstel van verstek APN-instellings voltooi"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Terugstelling van netwerkinstellings"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Dit sal alle instellings wat verband hou met netwerke terugstel na die fabriekverstekke, insluitend:\n\n"<li>"Wi-Fi"</li>\n<li>"Mobiele data"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Dit sal alle netwerkinstellings terugstel, insluitend:\n\n"<li>"Wi‑Fi"</li>\n<li>"Sellulêre data"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Stel instellings terug"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Stel alle netwerkinstellings terug? Jy kan nie hierdie handeling omkeer nie!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Stel alle netwerkinstellings terug? Jy kan nie hierdie handeling ontdoen nie!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Stel instellings terug"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Jy moet jou ontsluitpatroon teken om \'n terugstelling van netwerkinstellings te bevestig."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Stel terug?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Terugstelling van netwerkinstellings"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Netwerkinstellings is teruggestel"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Stel toestel terug"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrieksterugstelling"</string>
     <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>
@@ -1029,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Vee al die data op die SD-kaart uit, soos musiek of foto\'s."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Stel tablet terug"</string>
     <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_desc" msgid="1062841478823409667">"Vee al jou persoonlike inligting en afgelaaide programme uit? Jy kan nie hierdie handeling ontdoen nie!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Vee alles uit"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Fabriekterugstelling is nie vir hierdie gebruiker beskikbaar nie"</string>
@@ -1048,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Stel stemboodskapdiens, oproepaanstuur, oproep wag, beller-ID op"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-verbinding"</string>
@@ -1081,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hulp"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Sellulêre netwerke"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobiele plan"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Verstel SMS-program"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS-program"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Verander SMS-program?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Gebruik <xliff:g id="NEW_APP">%1$s</xliff:g> in plaas van <xliff:g id="CURRENT_APP">%2$s</xliff:g> as jou SMS-program?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Gebruik <xliff:g id="NEW_APP">%s</xliff:g> as jou SMS-program?"</string>
@@ -1112,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Gebruik GPS om ligging te bepaal"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Skandeer"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skandeer"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi soek tans"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Verbeter ligging deur programme en dienste toe te laat om Wi-Fi-netwerke te soek selfs as Wi-Fi af is"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth soek tans"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Verbeter ligging deur stelseldienste toe te laat om Bluetooth-toestelle te soek, selfs as Bluetooth af is"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi- en selnetwerkligging"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Laat programme Google se liggingsdiens gebruik om jou ligging vinniger te beraam. Anonieme liggingsdata sal ingesamel word en aan Google gestuur word."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Ligging deur Wi-Fi vasgestel"</string>
@@ -1157,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Wagwoord is gestel"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN is gestel"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Patroon is ingestel"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Gebruik jou toestelpatroon om voort te gaan."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Voer jou toestel-PIN in om voort te gaan."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Voer jou toestelwagwoord in om voort te gaan."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Verkeerde PIN"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Verkeerde wagwoord"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Verkeerde patroon"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Toestelsekuriteit"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Verander ontsluitpatroon"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Verander ontsluit-PIN"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Bevestig gestoorde patroon"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Probeer weer:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Teken \'n ontsluitpatroon"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Druk Kieslys vir hulp."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Lig vinger op wanneer jy klaar is"</string>
@@ -1183,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Stel ontsluitpatroon"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Verander ontsluitpatroon"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Hoe om \'n ontsluitpatroon te teken"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Te veel verkeerde pogings!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Probeer weer oor <xliff:g id="NUMBER">%d</xliff:g> sekondes."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Te veel verkeerde pogings. Probeer oor <xliff:g id="NUMBER">%d</xliff:g> sekondes weer."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Die program is nie op jou foon geïnstalleer nie."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Bestuur programme"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Bestuur en verwyder geïnstalleerde programme"</string>
@@ -1235,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Rangskik volgens grootte"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Wys lopende dienste"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Wys gekaste prosesse"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Noodprogram"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Stel programvoorkeure terug"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Stel programvoorkeure terug?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Dit sal al die voorkeure terugstel vir:\n\n "<li>"Gedeaktiveerde programme"</li>\n" "<li>"Gedeaktiveerde programkennisgewings"</li>\n" "<li>"Verstek programme vir handelinge"</li>\n" "<li>"Agtergronddatabeperkings vir programme"</li>\n" "<li>"Enige toestemmingbeperkings"</li>\n\n" Jy sal nie enige programdata verloor nie."</string>
@@ -1440,8 +1479,6 @@
     <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="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="select_logd_size_title" msgid="7433137108348553508">"Loggerbuffer se groottes"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 uur"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dag"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Wys stelsel"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Versteek stelsel"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Gebruik Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistiektipe"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Agtergrond"</string>
@@ -1838,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Huidige wagwoord:"</string>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Gebruiker"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Beperkte profiel"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Voeg nuwe gebruiker by?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Jy kan hierdie toestel met ander mense deel deur bykomende gebruikers te skep. Elke gebruiker het sy eie spasie wat hulle kan pasmaak met hul eie programme, muurpapier, en so aan. Gebruikers kan ook hul toestelinstellings, soos Wi‑Fi wat almal raak, aanpas.\n\nWanneer jy \'n nuwe gebruiker byvoeg, moet daardie persoon hul spasie opstel.\n\nEnige gebruiker kan programme vir al die ander gebruikers opdateer."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Jy kan hierdie toestel met ander mense deel deur bykomende gebruikers te skep. Elke gebruiker het sy eie area wat hy kan pasmaak met programme, muurpapier en so meer. Gebruikers kan ook toestelinstellings wat almal raak, soos Wi-Fi, aanpas.\n\nWanneer jy \'n nuwe gebruiker byvoeg, moet daardie persoon sy eie area opstel.\n\nEnige gebruiker kan programme vir alle ander gebruikers opdateer."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Wanneer jy \'n nuwe gebruiker byvoeg, moet daardie persoon hul spasie opstel.\n\nEnige gebruiker kan programme vir al die ander gebruikers opdateer."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Moet die gebruiker nou opgestel word?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Maak seker die persoon is beskikbaar om die toestel te vat en hul spasie op te stel"</string>
@@ -2393,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"beperking beperk is beperk"</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_reset_apps" msgid="6420313678620788457">"terugstel voorkeure verstek"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"nood in-geval-van-nood-program verstek"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"programme aflaai programme stelsel"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"programme toestemmings sekuriteit"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"programme verstek"</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>
@@ -2411,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Wekkervolume"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Luivolume"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Kennisgewingvolume"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Blokkeer onderbrekings"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"\'Net prioriteit\' laat toe"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Outomatiese reëls"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Wanneer oproepe en 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_alarms" msgid="7380265858042606857">"Laat net wekkers toe"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Moenie onderbreek nie"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Net prioriteit"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Net wekkers"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Geen onderbrekings nie"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Foon-luitoon"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Verstekkennisgewingluitoon"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibreer ook vir oproepe"</string>
@@ -2451,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Geen kennisgewingluisteraars is geïnstalleer nie."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Aktiveer <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> sal alle kennisgewings kan lees wat deur die stelsel of deur enige geïnstalleerde program geplaas is, wat dalk persoonlike inligting soos kontakname en die teks van boodskappe wat na jou gestuur is, kan insluit. Dit sal ook hierdie kennisgewings kan verwerp of handelingknoppies daarbinne kan aanraak."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Voorwaardesverskaffers"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Geen programme voorsien voorwaardes nie"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d programme bied voorwaardes</item>
-      <item quantity="one">%d program bied voorwaardes</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Geen voorwaardeverskaffers is geïnstalleer nie."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Aktiveer <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> sal uitgaanvoorwaardes by die Moenie steur nie-modus kan voeg."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Laai tans programme …"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokkeer almal"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Moet nooit kennisgewings van hierdie program af wys nie"</string>
@@ -2473,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioriteit"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitief"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Reëlnaam"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Voeg reël by"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Vee reël uit"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Vee \"<xliff:g id="RULE">%1$s</xliff:g>\"-reël uit?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Vee uit"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Reëltipe"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Onbekend"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Stel reël op"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Skeduleer reël"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Reël is nie gevind nie."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dae"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Geen"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Elke dag"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nooit"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> tot <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2493,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Wekkers"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Onthounotas"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Geleenthede"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Uitgesoekte bellers"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Herhaalbellers"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"As dieselfde persoon binne \'n tydperk van <xliff:g id="MINUTES">%d</xliff:g> minuut \'n tweede keer bel, laat dit toe"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Sit outomaties aan"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nooit"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Elke nag"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> volgende dag"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Wanneer sal jy onderbreek wil word?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Vir hoe lank?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Onbepaald"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minute</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuut</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> uur</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> uur</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Verander onbepaald na net prioriteitkennisgewings"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Verander na net prioriteitkennisgewings vir <xliff:g id="DURATION">%1$d</xliff:g> minute tot <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Verander na net prioriteitkennisgewings vir een minuut tot <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Verander na net prioriteitkennisgewings vir <xliff:g id="DURATION">%1$d</xliff:g> uur (tot <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Verander na net prioriteitkennisgewings vir een uur tot <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Verander onbepaald na net wekkers"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Verander na net wekkers vir <xliff:g id="DURATION">%1$d</xliff:g> minute (tot <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Verander na net wekkers vir een minuut tot <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Verander na net wekkers vir <xliff:g id="DURATION">%1$d</xliff:g> uur tot <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Verander na net wekkers vir een uur tot <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Verander onbepaald na moenie onderbreek nie"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Verander na moenie onderbreek nie vir <xliff:g id="DURATION">%1$d</xliff:g> minute (tot <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Verander na moenie onderbreek nie vir een minuut tot <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Verander na moenie onderbreek nie vir <xliff:g id="DURATION">%1$d</xliff:g> uur tot <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Verander na moenie onderbreek nie vir een uur tot <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Verander na onderbreek altyd"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"vir altyd"</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>
@@ -2566,7 +2659,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> toestemmings verleen</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> toestemming verleen</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> van <xliff:g id="COUNT_3">%d</xliff:g> toestemmings verleen</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> van <xliff:g id="COUNT_1">%d</xliff:g> toestemming verleen</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Sommige verstekke gestel"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Geen verstekke gestel nie"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Alle programme"</string>
@@ -2577,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioriteit"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensitief"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Met domein-URL\'e"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Stel voorkeure vir alle programme terug na verstekwaardes"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> programme geïnstalleer, insluitend stelsel- en afgelaaide programme"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Gedeaktiveer deur administrateur"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Gevorderd"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Onbekende program"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Kies profiel"</string>
@@ -2593,4 +2688,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> programme kan hul domein-URL\'e oopmaak</item>
       <item quantity="one">Een program kan sy domein-URL\'e oopmaak</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Nie herken nie"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Verstekprogramme"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Blaaierprogram"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Geen verstekblaaier nie"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Verstek)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index f53dd55..e44c822 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"ሲም"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"አዝራር ተጫን"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"ዝቅተኛ"</item>
     <item msgid="4212263919458209842">"አሳሳቢ"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"ጠፍቷል"</item>
-    <item msgid="5656544177755411222">"የተገደቡ ማቋረጦች"</item>
-    <item msgid="8735337502532332056">"ዜሮ ማቋረጦች"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"መደበኛ"</item>
     <item msgid="866544120205026771">"መጠነኛ"</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 92f32af..20cd760 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD ካርድ"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"የእጅ አዙር ቅንብሮች"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"አዎ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"አይ"</string>
-    <string name="forget" msgid="7267115980248732932">"እርሳ"</string>
+    <string name="forget" msgid="1400428660472591263">"እርሳ"</string>
+    <string name="save" msgid="879993180139353333">"አስቀምጥ"</string>
+    <string name="done" msgid="6942539184162713160">"ተከናውኗል"</string>
     <string name="settings_label" msgid="1626402585530130914">"ቅንብሮች"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"ቅንብሮች"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"የቅንብሮች አቋራጭ"</string>
@@ -374,7 +372,6 @@
     <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_title" msgid="5100339496381875522">"ይመስጠር?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"የምስጠራ ክንውኑ የማይመለስ ነው እና ካቋረጡት፤ ውሂብ ያጣሉ።ምስጠራ 1 ሰዓት ወይም ከዛ የበለጠ ይወስዳል፤ በዛ ጊዜ ስልኩ ለብዙ ጊዜያቶች በድጋሚ ይነሳል።"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"የምስጠራ ክንውኑ የማይመለስ ነው እና ካቋረጡት፤ ውሂብ ያጣሉ።ምስጠራ 1 ሰዓት ወይም ከዛ የበለጠ ይወስዳል፤ በዛ ጊዜ ስልኩ ለብዙ ጊዜያቶች በድጋሚ ይነሳል።"</string>
@@ -521,7 +518,7 @@
     <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="ble_scan_notify_text" msgid="9019985398053764737">"የመገኛ አካባቢነት ትክክለኛነት ለማሻሻል፣ Google አገልግሎቶች የBluetooth መሣሪያዎችን ምንም እንኳን Bluetooth የጠፋ እንኳ ቢሆን ይቃኛቸዋል። ይህን ለውጥ በLINK_BEGINቅንጅቶችን መቃኘትLINK_END ላይ ሊለውጡት ይችላሉ።"</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"የመገኛ አካባቢነት ትክክለኛነት ለማሻሻል፣ ምንም እንኳን Bluetooth የጠፋ እንኳ ቢሆን Bluetoothን መሣሪያዎችን ለመፈለግ መተግበሪያዎች እና አገልግሎቶች ይቃኛሉ። ይህን ለውጥ በ<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ቅንጅቶችን መቃኘት<xliff:g id="LINK_END_1">LINK_END</xliff:g> ላይ ሊለውጡት ይችላሉ።"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"ወደ..... አያይዝ"</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>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"የመገኛ አካባቢነት ትክክለኛነት ለማሻሻል፣ Google አገልግሎቶች የ Wi‑Fi አውታረመረቦችን ምንም እንኳን  Wi‑Fi የጠፋ እንኳ ቢሆን ይቃኛቸዋል። ይህን ለውጥ በLINK_BEGINቅንጅቶችን መቃኘትLINK_END ላይ ሊለውጡት ይችላሉ።"</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"የመገኛ አካባቢነት ትክክለኛነት ለማሻሻል፣ ምንም እንኳን Wi‑Fi የጠፋ እንኳ ቢሆን Wi‑Fiን አውታረ መረቦችን ለመፈለግ መተግበሪያዎች እና አገልግሎቶች ይቃኛሉ። ይህን ለውጥ በ<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ቅንጅቶችን መቃኘት<xliff:g id="LINK_END_1">LINK_END</xliff:g> ላይ ሊለውጡት ይችላሉ።"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"ዳግመኛ አታሳይ"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"በሚተኛበት Wi-Fi እንደበራ ይቆይ"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"በእንቅልፍ ጊዜ Wi‑Fi ይበራል"</string>
@@ -604,8 +601,6 @@
     <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_apps" msgid="6003687912727859577">"መተግበሪያዎችን አሳይ"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"የWiFi ጥንካሬን አሳይ"</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>
@@ -663,6 +658,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"አገናኝ"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"ይህ አውታረመረብ ምንም የበይነመረብ ግንኙነት የለውም። የሆነ ሆኖ ይህን አውታረመረብ ይጠቀም?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"ለዚህ አውታረመረብ ዳግመኛ አትጠይቅ"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"አያይዝ"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ከአውታረ መረቡ ጋር መገናኘት አልተሳካም"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"እርሳ"</string>
@@ -734,12 +731,10 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi ተመራጭ"</item>
     <item msgid="5267397515594230396">"የተንቀሳቃሽ ስልክ ተመራጭ"</item>
-    <item msgid="3132912693346866895">"Wi-Fi ብቻ"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"የWi-Fi ጥሪ ሲበራ የእርስዎ ስልክ በምርጫዎ እና በየትኛው ይበልጥ ጠንካራ እንደሆነ የሚወሰን ሆኖ ጥሪዎችን በWi-Fi አውታረ መረቦች ወይም በአገልግሎት አቅራቢዎ አውታረ መረብ በኩል ሊያዞር ይችላል። ይህን ባህሪ ከማብራትዎ በፊት ክፍያዎችን እና ሌሎች ዝርዝሮችን በተመለከተ አገልግሎት አቅራቢዎን ያነጋግሩ።"</string>
     <string name="home_settings" msgid="212375129455718176">"መነሻ"</string>
@@ -913,12 +908,12 @@
     <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="5128673488173839077">"መተግበሪያዎች እና የመተግበሪያ ውሂብ"</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_media_misc_usage" msgid="235452944021647124">"ልዩ ልዩ"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"ሌሎች ፋይሎች"</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>
@@ -951,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"ንቀል በሂደት ላይ"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"የማከማቻ ቦታ እያለቀ ነው"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"እንደማመሳሰል ያሉ አንዳንድ የስርዓት ተግባራት በትክክል ላይሰሩ ይችላሉ። እንደመተግበሪያዎች ወይም የሚዲያ ይዘቶች ያሉ ንጥሎች በመሰረዝ ወይም ባለመሰካት ነጻ ቦታ ለመጨመር ሞክር።"</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"እንደገና ሰይም"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"አፈናጥ"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"አስወጣ"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"ደምስስ እና ቅረጽ"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"ደምስስ እና እንደ ውስጣዊ ማከማቻ ቅረጽ"</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>
@@ -961,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"በMIDI የነቁ መተግበሪያዎች በዩኤስቢ ላይ ከMIDI ሶፍትዌር ጋር በእርስዎ ኮምፒውተር ላይ እንዲሰሩ ያስችላቸዋል።"</string>
     <string name="storage_other_users" msgid="808708845102611856">"ሌሎች ተጠቃሚዎች"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"የመሣሪያ ማከማቻ"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"መወገድ የሚችል ማከማቻ"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> ነጻ (በድምሩ <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> ተፈናጧል"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g> ማፈናጠጥ አልተቻለም"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> ደህንነቱ ተጠብቆ ወጥቷል"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"ደህንነቱ እንደተጠበቀ <xliff:g id="NAME">%1$s</xliff:g>ን ማስወጣት አልተቻልም"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> ተቀርጿል"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> መቅረጽ አልተቻለም"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"ማከማቻ ዳግም ሰይም"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"ቅርጸት ከሰሩ በኋላ ይህን <xliff:g id="NAME_0">^1</xliff:g> በሌሎች መሣሪያዎች ላይ መጠቀም ይችላሉ። \n\nበዚህ <xliff:g id="NAME_1">^1</xliff:g> ውስጥ ያለ ሁሉም ውሂብ ይሰረዛል። መጀመሪያ የእሱን ምትኬ ማስቀመጡን ያስቡበት። \n\n"<b>"የፎቶዎች እና የሌላ ማህደረመረጃ ምትኬ ያስቀምጡ"</b>" \nየማህደረመረጃ ፋይሎችዎን በዚህ መሣሪያ ላይ ወዳለ ተለዋጭ ማከማቻ ይውሰዱ ወይም የዩኤስቢ ገመድ ተጠቅመው ወደ አንድ ኮምፒውትወር ያስተላልፏቸው። \n\n"<b>"የመተግበሪያዎች ምትኬን ያስቀምጡ"</b>" \nበዚህ <xliff:g id="NAME_6">^1</xliff:g> ላይ የተቀመጡ መተግበሪያዎች ሁሉ ይራገፉና ውሂባቸው ይሰረዛል። እነዚህን መተግበሪያዎች ለማቆየት በዚህ መሣሪያ ላይ ወዳለ ተለዋጭ ማከማቻ ይውሰዷቸው።"</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"ይህን <xliff:g id="NAME_0">^1</xliff:g> ሲያስወጡት በእሱ ላይ የተከማቹ መተግበሪያዎች መስራት ያቆማሉ፣ እና ዳግም እስኪገባ ድረስ በእሱ ላይ የተከማቹ የማህደረመረጃ ፋይሎች አይገኙም።"</b>" \n\nይህ <xliff:g id="NAME_1">^1</xliff:g> በዚህ መሣሪያ ላይ ብቻ እንዲሰራ ቅርጸት የተሰራለት ነው። በሌሎች ላይ አይሰራም።"</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"የእርስዎን <xliff:g id="NAME">^1</xliff:g> ያዘጋጁ"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"እንደ ተንቀሳቃሽ ማከማቻ ይጠቀሙ"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"ፎቶዎችን እና ሌላ ማህደረመረጃ በመሣሪያዎች መካከል ለመውሰድ።"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"እንደ ውስጣዊ ማከማቻ ይጠቀሙ"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"ማንኛውም ነገር በዚህ መሣሪያ ላይ ብቻ ለማከማቻት፣ መተግበሪያዎችን እና ፎትዎችንም ጨምሮ። በሌሎች መሣሪያዎች ላይ እንዳይሰራ የሚያግድ ቅርጸት ያስፈልገዋል።"</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"እንደ ውስጣዊ ማከማቻ አድርገው ቅርጸት ይስሩ"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"ደህንነቱ የተጠበቀ እንዲሆን ይሄ <xliff:g id="NAME_0">^1</xliff:g> ቅርጸት እንዲሰራለት ይፈልጋል። \n\nቅርጸት ከተሰራ በኋላ ይሄ <xliff:g id="NAME_1">^1</xliff:g> በዚህ መሣሪያ ላይ ብቻ ነው የሚሰራው። \n\n"<b>"ቅርጸት መስራት አሁን በ<xliff:g id="NAME_2">^1</xliff:g> ላይ የተከማቸውን ውሂብ ሁሉ ይደመስሳል።"</b>" ውሂብ እንዳይጠፋ ለመከላከል የእሱን ምትኬ መስራ ያስቡበት።"</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"ደምስስ እና ቅርጸት ስራ"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"የ<xliff:g id="NAME">^1</xliff:g>ን ቅርጸት በመስራት ላይ…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"<xliff:g id="NAME">^1</xliff:g> ቅርጸት እየተሰራለት ሳለ አያስወግዱት።"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ውሂብን ወደ አዲስ ማከማቻ ውሰድ"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"የእርስዎን ፎቶዎች፣ ፋይሎች እና የመተግበሪያ ውሂብ ወደዚህ አዲስ <xliff:g id="NAME">^1</xliff:g> መውሰድ ይችላሉ። \n\nመውሰዱ <xliff:g id="TIME">^2</xliff:g> ገደማ የሚወስድ ሲሆን በውስጣዊ ማከማቻው ላይ <xliff:g id="SIZE">^3</xliff:g> ያስለቅቃል። ይሄ በመከናወን ላይ ሳለ አንዳንድ መተግበሪያዎች አይሰሩም።"</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"አሁን ይውሰዱ"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"በኋላ ይውሰዱ"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"ውሂብ አሁን ይውሰዱ"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"መውሰዱ <xliff:g id="TIME">^1</xliff:g> ገደማ ይወስዳል። በውስጣዊ ማከማቻው ውስጥ <xliff:g id="SIZE">^2</xliff:g> ያስለቅቃል።"</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"ውሰድ"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"ውሂብን በመውሰድ ላይ…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"በሚወሰድበት ጊዜ፦ \n• <xliff:g id="NAME">^1</xliff:g>ን አያስወግዱ። \n• አንዳንድ መተግበሪያዎች በአግባቡ አይሰሩም። \n• የመሣሪያው ባትሪ ኃይል እንደተሞላ ያቆዩት።"</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> ዝግጁ ነው"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"የእርስዎ <xliff:g id="NAME">^1</xliff:g> ከፎቶዎች እና ሌሎች ማህደረመረጃ ጋር አብሮ ለመጠቀም ዝግጁ ነው።"</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"የእርስዎ አዲስ <xliff:g id="NAME">^1</xliff:g> እየሰራ ነው። \n\nፎቶዎችን፣ ፋይሎችን እና የመተግበሪያ ውሂብን ወደዚህ መሣሪያ ለመውሰድ ወደ ቅንብሮች &gt; ማከማቻ ይሂዱ።"</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g>ን ይውሰዱ"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<xliff:g id="APP">^1</xliff:g>ን እና ውሂቡን ወደ <xliff:g id="NAME_0">^2</xliff:g> መውሰድ ጥቂት ጊዜ ብቻ ነው የሚወስደው። መውሰዱ እስኪጠናቀቅ ድረስ መተግበሪያውን መጠቀም አይችሉም። \n\nበሚወሰድበት ጊዜ <xliff:g id="NAME_1">^2</xliff:g>ን አያስወግዱት።"</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g>ን በመውሰድ ላይ…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"በሚወሰድበት ጊዜ <xliff:g id="NAME">^1</xliff:g>ን አያስወግዱት። \n\nመውሰዱ እስኪጠናቀቅ ድረስ በዚህ መሣሪያ ላይ ያለው የ<xliff:g id="APP">^2</xliff:g> የሚገኝ አይሆንም።"</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"መውሰድን ሰርዝ"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"የባትሪሁኔታ"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"የባትሪደረጃ፡"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1005,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"ወደ ነባሪ ዳግም አስጀምር"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"የዳግም አስጀምር ነባሪ APN ቅንብሮች ተጠናቀዋል"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"የአውታረ መረብ ቅንብሮች ዳግም ማቀናበር"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"ይህ፦\n\n"<li>"Wifi"</li>\n<li>"የሞባይል ውሂብ"</li>\n<li>"Bluetooth"</li>"ን ጨምሮ ከአውታረ መረብ ዝርጋታ ጋር ግንኙነት ያላቸውን ሁሉንም ቅንብሮች ወደ ፋብሪካ ነባሪዎች ዳግም ያቀናብራቸዋል"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"የሚከተሉትን ጨምሮ ይህ ሁሉንም የአውታረ መረብ ቅንብሮች ዳግም ያስጀምራል፦\n\n"<li>"Wi‑Fi"</li>\n<li>"የተንቀስቃሽ ስልክ ውሂብ"</li>\n<li>"ብሉቱዝ"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"ቅንብሮችን ዳግም ያቀናብሩ"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"ሁሉም አውታረ መረብ ቅንብሮች ዳግም ይቀናበሩ? ይህን እርምጃ መቀልበስ አይችሉም!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"ሁሉም አውታረ መረብ ቅንብሮች ዳግም ይጀምሩ? ይህን እርምጃ መቀልበስ አይችሉም!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"ቅንብሮችን ዳግም ያቀናብሩ"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"የአውታረ መረብ ቅንብሮች ዳግም ማቀናበርን ለማረጋገጥ የመክፈቻ ስርዓተ ጥለትን መሳል ያስፈልግዎታል።"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"ዳግም ይቀናበር?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"የአውታረ መረብ ቅንብሮች ዳግም ማቀናበር"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"የአውታረ መረብ ቅንብሮች ዳግም ጀምረዋል።"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"መሣሪያ ዳግም አስጀመር"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"የፋብሪካ ውሂብ ዳግም አስጀምር"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ይህ ከእርስዎ ጡባዊ "<b>"ውስጣዊ ማከማቻ"</b>" የሚከተሉትን ጨምሮ:\n\n"<li>"የእርስዎ  Google መለያ"</li>\n<li>"ሥርዓት እና መተግበሪያ ውሂብ እና ቅንብሮች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li>" ላይ ያሉ ሁሉንም ውሂብ ይሰርዛል።"</string>
@@ -1027,9 +1065,8 @@
     <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="1062841478823409667">"ሁሉም የእርስዎ የግል መረጃ እና የወረዱ መተግበሪያዎች ይሰረዙ? ይህን እርምጃ መቀልበስ አይችሉም!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ሁሉንም አጥፋ"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"የፋብሪካ ዳግም ማስጀመር ለዚህ ተጠቃሚ አይገኝም"</string>
@@ -1046,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"የድምፅመልዕክት፣ የጥሪ ማስተላለፊያ፣መስመር ላይ ቆይ፣ የደዋይ ID አዋቅር"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB መሰካት"</string>
@@ -1079,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"እገዛ"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"የተንቀሳቃሽ ስልክ አውታረ መረቦች"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"የሞባይል እቅድ"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"ነባሪ የኤስ ኤም ኤስ መተግበሪያ"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"የኤስኤምኤስ መተግበሪያ"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"የኤስ ኤም ኤስ መተግበሪያ ይለወጥ?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"ከ<xliff:g id="CURRENT_APP">%2$s</xliff:g> ይልቅ <xliff:g id="NEW_APP">%1$s</xliff:g> እንደ እርስዎ ኤስኤምኤስ መተግበሪያ ይጠቀሙበት?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g>ን እንደ እርስዎ ኤስ ኤም ኤስ መተግበሪያ ይጠቀሙበት?"</string>
@@ -1110,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"አካባቢን ለማወቅ ጂ ፒ ኤስ ተጠቀም"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"በመቃኘት ላይ"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"በመቃኘት ላይ"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi ቅኝት"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"ምንም እንኳን Wi‑Fi የጠፋ ቢሆንም የWi‑Fi አውታረመረቦችን እንዲቃኙ የስርዓት አገልግሎቶችን በመፍቀድ የመገኛ አካባቢን ያሻሽሉ"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"የBluetooth ቅኝት"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"ምንም እንኳን Bluetooth መሣሪያዎች የጠፉ ቢሆንም የBluetooth መሣሪያዎችን እንዲቃኙ የስርዓት አገልግሎቶችን በመፍቀድ የመገኛ አካባቢን ያሻሽሉ"</string>
     <string name="location_network_based" msgid="6010456018401296590">"የWi‑Fi እና የተንቀሳቃሽ ስልክ አውታረ መረብ አካባቢ"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"መተግበሪያዎች አካባቢዎትን በበለጠ ፍጥነት እንዲገምቱ የGoogle የአካባቢ አገልግሎትን ይጠቀሙ። ስም አልባ የአካባቢ ውሂብ ተሰብስቦ ወደ Google ይላካል።"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"አካባቢ በWi-Fi ይታወቃል"</string>
@@ -1155,11 +1194,15 @@
     <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="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"ለመቀጠል የእርስዎን መሣሪያ ስርዓተ ጥለት ይጠቀሙ።"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"ለመቀጠል የእርስዎን መሣሪያ ፒን ያስገቡ።"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"ለመቀጠል የእርስዎ መሣሪያ የይለፍ ቃል ያስገቡ።"</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"የተሳሳተ ፒን"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"የተሳሳተ ይለፍ ቃል"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"የተሳሳተ ስርዓተ ጥለት"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"የመሣሪያ ደህንነት"</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>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"ለእገዛ ምናሌ ተጫን"</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"ሲከናወን ጣትዎን ያንሱት"</string>
@@ -1181,8 +1224,7 @@
     <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" msgid="6909161623701848863">"ከልክ በላይ ብዙ የተሳሳቱ ሙከራዎች። በ<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>
@@ -1233,7 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"በመጠን ለይ"</string>
     <string name="show_running_services" msgid="5736278767975544570">"አሂድ አገልግሎቶችን አሳይ"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"የተሸጎጡ ሂደቶችን አሳይ"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"ነባሪ የአስቸኳይ አደጋ መተግበሪያ"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"የአስቸኳይ አደጋ መተግበሪያ"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"የመተግበሪያዎች ምርጫዎችን ዳግም አስጀምር"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"የመተግበሪያዎች ምርጫዎች ዳግም ይጀመሩ?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"ይሄ ሁሉንም የእነኚህ ምርጫዎችን ዳግም ያስጀምራቸዋል፦\n\n "<li>"የተሰናከሉ መተግበሪያዎች"</li>\n" "<li>"የተሰናከሉ መተግበሪያ ማሳወቂያዎች"</li>\n" "<li>"ለሁሉም እርምጃዎች ነባሪ መተግበሪያዎች"</li>\n" "<li>"የመተግበሪያዎች የጀርባ ውሂብ ገደቦች"</li>\n" "<li>"ማንኛቸውም የፍቃድ ገደቦች"</li>\n\n" ምንም የመተግበሪያ ውሂብ አይጠፋብዎትም።"</string>
@@ -1437,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"በአንድ ፋይል ውስጥ ያሉትን የብሉቱዝ HCI እሽጎች ይቅረጹ"</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="select_logd_size_title" msgid="7433137108348553508">"የምዝግብ ማስታወሻ ያዥ መጠኖች"</string>
@@ -1739,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 ሰዓቶች"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 ቀን"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"ስርዓት አሳይ"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"የመደበቂያ ስርዓት"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"ዩ ኤስ ኤስ ይጠቀሙ"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"የስታቲስቲክስ አይነት"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"በስተጀርባ"</string>
@@ -1835,7 +1876,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_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>
@@ -2210,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"ተጠቃሚ"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"የተገደበ መገለጫ"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"አዲስ ተጠቃሚ ይታከል?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"ተጨማሪ ተጠቃሚዎችን በመፍጠር ይህን መሣሪያ ከሌሎች ሰዎች ጋር መጋራት ይችላሉ። እያንዳንዱ ተጠቃሚ በራሱ መተግበሪያዎች፣ ልጣፍ  እና በመሳሰሉ ነገሮች ሊያበጀው የሚችል የእራሱ ቦታ አለው። ተጠቃሚዎችም እንዲሁ እንደ Wi‑Fi ያሉ በሁሉም ሰው ላይ ተጽዕኖ ሊኖራቸው የሚችሉ የመሣሪያ ቅንብሮችን ማስተካከል ይችላሉ። \n\nእርስዎ አንድ አዲስ ተጠቃሚ ሲያክሉ ያ ሰው የራሱ ቦታ ማዘጋጀት አለበት።\n\nማንኛውም ተጠቃሚ መተግበሪያዎችን ለሌሎች ተጠቃሚዎች ሁሉ ሊያዘምን ይችላል።"</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"ተጨማሪ ተጠቃሚዎችን በማከል ይህን መሣሪያ ከሌሎች ሰዎች ጋር ማጋራት ይችላሉ። እያንዳንዱ ተጠቃሚ መተግበሪያዎችን፣ የግድግዳ ወረቀትን እና ወዘተ ብጁ ማድረግ የሚችልበት የራሱ ባዶ ቦታ አለው። ተጠቃሚዎች በተጨማሪ በሁሉም ሰው ላይ ተጽዕኖ ሊኖራቸው የሚችሉ እንደ Wi‑Fi ያሉ ቅንብሮችን ማስተካከል ይችላሉ።\n\nአዲስ ተጠቃሚ ሲያክሉ፣ ያ ግለሰብ የራሱን ባዶ ቦታ ማዋቀር ይኖርበታል።\n\nማናቸውም ተጠቃሚ ለሌሎች ሁሉም ተጠቃሚዎች መተግበሪያዎችን ማዘመን ይችላል።"</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"እርስዎ አንድ አዲስ ተጠቃሚ ሲያክሉ ያ ሰው የራሱ ቦታ ማዘጋጀት አለበት።\n\nማንኛውም ተጠቃሚ መተግበሪያዎችን ለሌሎች ተጠቃሚዎች ሁሉ ሊያዘምን ይችላል።"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"ተጠቃሚ አሁን ይዋቀር?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"ግለሰቡ መሣሪያውን ወስደው ቦታቸውን ለማዋቀር እንደሚገኙ ያረጋግጡ"</string>
@@ -2393,6 +2433,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"የአስቸኳይ በረዶ መተግበሪያ ነባሪ"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"መተግበሪያዎች ውርድ መተግበሪያዎች ስርዓት"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"የመተግበሪያዎች ፈቃዶች ደህንነት"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"መተግበሪያዎች ነባሪ"</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>
@@ -2407,14 +2448,12 @@
     <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="6948120138640252732">"መቆራረጦችን አግድ"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ቅድሚያ ተሰጪ ብቻ ይፈቅዳል"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ራስ-ሰር ደንቦች"</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_alarms" msgid="7380265858042606857">"ማንቂያዎችን ብቻ ፍቀድ"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"አታቋርጥ"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"ቅድሚያ የሚሰጠው ብቻ"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"ማንቂያዎች ብቻ"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"ምንም ማቋረጦች የሉም"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>፦ <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"የስልክ ጥሪ ድምፅ"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"ነባሪ የማሳወቂያ ጥሪ ቅላጼ"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"እንዲሁም ለጥሪዎችም ንዘር"</string>
@@ -2447,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"ምንም የማሳወቂያ አዳማጮች አልተጫኑም።"</string>
     <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">"ምንም መተግበሪያዎች ሁኔታዎችን አያቀርቡም"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="one">%d መተግበሪያዎች ሁኔታዎችን ያቀርባሉ</item>
-      <item quantity="other">%d መተግበሪያዎች ሁኔታዎችን ያቀርባሉ</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="loading_notification_apps" msgid="5031818677010335895">"መተግበሪያዎችን በመጫን ላይ..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"ሁሉንም አግድ"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ከዚህ መተግበሪያዎች ማሳወቂያዎችን በፍጹም አታሳይ"</string>
@@ -2469,17 +2499,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"የደንብ ስም"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"ደንብ ያክሉ"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"ደንብን ሰርዝ"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"«<xliff:g id="RULE">%1$s</xliff:g>» ደንብ ይሰረዝ?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"ሰርዝ"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"የደንብ ዓይነት"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"አይታወቅም"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"ደንብን አዋቅር"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"ደንብ የጊዜ ዕቅድ አስይዝ"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"ደንብ አልተገኘም።"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"ቀኖች"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"ምንም"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"በየቀኑ"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">"፣ "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"በጭራሽ"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> እስከ <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"ጥሪዎች"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"መልዕክቶች"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"ጥሪዎች/መልዕክቶች ከ"</string>
@@ -2489,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"ማንቂያዎች"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"አስታወሾች"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ክስተቶች"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"የተመረጡ ደዋዮች"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ደዋዮችን ድገም"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"ተመሳሳይ ሰው ራሱ በ<xliff:g id="MINUTES">%d</xliff:g> ደቂቃ ክፍለ ጊዜ ውስጥ ለሁለተኛ ጊዜ ከደወለ፣ ፍቀድ"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> next day"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"መቼ እንዲቋረጡ ይፈልጋሉ?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"ለምን ያህል ጊዜ?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"ያለገደብ"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ደቂቃዎች</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ደቂቃዎች</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ሰዓቶች</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ሰዓቶች</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"ወደ ቅድሚያ ተሰጪ ማሳወቂያዎች ብቻ ያለገደብ ለውጥ"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">ወደ ቅድሚያ ተሰጪ ማሳወቂያዎች ለ<xliff:g id="DURATION">%1$d</xliff:g> ደቂቃዎች (እስከ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) ድረስ ለውጥ</item>
+      <item quantity="other">ወደ ቅድሚያ ተሰጪ ማሳወቂያዎች ለ<xliff:g id="DURATION">%1$d</xliff:g> ደቂቃዎች (እስከ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) ድረስ ለውጥ</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">ወደ ቅድሚያ ተሰጪ ማሳወቂያዎች ለ<xliff:g id="DURATION">%1$d</xliff:g> ሰዓቶች (እስከ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) ድረስ ለውጥ</item>
+      <item quantity="other">ወደ ቅድሚያ ተሰጪ ማሳወቂያዎች ለ<xliff:g id="DURATION">%1$d</xliff:g> ሰዓቶች (እስከ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) ድረስ ለውጥ</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"ወደ ማንቂያዎች ብቻ ያለገደብ ለውጥ"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">ወደ ማንቂያዎች ለ<xliff:g id="DURATION">%1$d</xliff:g> ደቂቃዎች ብቻ ለውጥ (እስከ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">ወደ ማንቂያዎች ለ<xliff:g id="DURATION">%1$d</xliff:g> ደቂቃዎች ብቻ ለውጥ (እስከ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="one">ወደ ማንቂያዎች ለ<xliff:g id="DURATION">%1$d</xliff:g> ሰዓቶች ብቻ እስከ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ድረስ ለውጥ</item>
+      <item quantity="other">ወደ ማንቂያዎች ለ<xliff:g id="DURATION">%1$d</xliff:g> ሰዓቶች ብቻ እስከ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ድረስ ለውጥ</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"ወደ ያለገደብ አታቋርጥ ለውጥ"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">ለ<xliff:g id="DURATION">%1$d</xliff:g> ደቂቃዎች ድረስ አታቋርጥ (እስከ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) ወደሚል ለውጥ</item>
+      <item quantity="other">ለ<xliff:g id="DURATION">%1$d</xliff:g> ደቂቃዎች ድረስ አታቋርጥ (እስከ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) ወደሚል ለውጥ</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">ለ<xliff:g id="DURATION">%1$d</xliff:g> ሰዓቶች ያህል እስከ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ድረስ አታቋርጥ ወደሚል ለውጥ</item>
+      <item quantity="other">ለ<xliff:g id="DURATION">%1$d</xliff:g> ሰዓቶች ያህል እስከ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ድረስ አታቋርጥ ወደሚል ለውጥ</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"ወደ ሁልጊዜ አቋርጥ ለውጥ"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ለዘለዓለም"</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>
@@ -2562,7 +2659,10 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ፈቃዶች ተሰጥተዋል</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ፈቃዶች ተሰጥተዋል</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> ከ<xliff:g id="COUNT_3">%d</xliff:g> ፈቃዶች ተሰጥቷል</item>
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> ከ<xliff:g id="COUNT_3">%d</xliff:g> ፈቃዶች ተሰጥተዋል</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"አንዳንድ ነባሪዎ ተዘጋጅተዋል"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"ምንም ነባሪዎች አልተዘጋጁም"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"ሁሉም መተግበሪያዎች"</string>
@@ -2573,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ቅድሚያ የሚሰጣቸው"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"ልዩ ጥንቃቄ የሚፈልጉ"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ከጎራ ዩአርኤሎች ጋር"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"የሁሉም መተግበሪያዎች ምርጫዎችን ወደ ነባሪዎች ዳግም አስጀምር"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> መተግበሪያዎች ተጭነዋል፣ የስርዓት እና የወረዱ መተግበሪያዎችንም ጨምሮ"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"በአስተዳዳሪ የተሰናከለ"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"የላቀ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"ያልታወቀ መተግበሪያ"</string>
     <string name="choose_profile" msgid="8229363046053568878">"መገለጫ ይምረጡ"</string>
@@ -2589,4 +2688,11 @@
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> መተግበሪያዎች የጎራ ዩአርኤሎቻቸውን መክፈት ይችላሉ</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> መተግበሪያዎች የጎራ ዩአርኤሎቻቸውን መክፈት ይችላሉ</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"አልታወቀም"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"ነባሪ መተግበሪያዎች"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"የአሳሽ መተግበሪያ"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"ምንም ነባሪ አሳሽ የለም"</string>
+    <string name="default_app" msgid="6864503001385843060">"(ነባሪ)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 0f985ca..85e4161 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"طبقة النقل الآمنة"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'‎"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"زر الدفع"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"منخفضة"</item>
     <item msgid="4212263919458209842">"حرجة"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"إيقاف"</item>
-    <item msgid="5656544177755411222">"انقطاعات محدودة"</item>
-    <item msgid="8735337502532332056">"بدون انقطاعات"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"عادية"</item>
     <item msgid="866544120205026771">"متوسطة"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 82ac3a2..d08953b 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -272,12 +272,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"‏بطاقة SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"إعدادات الخادم الوكيل"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"نعم"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"لا"</string>
-    <string name="forget" msgid="7267115980248732932">"حذف"</string>
+    <string name="forget" msgid="1400428660472591263">"نسيان"</string>
+    <string name="save" msgid="879993180139353333">"حفظ"</string>
+    <string name="done" msgid="6942539184162713160">"تم"</string>
     <string name="settings_label" msgid="1626402585530130914">"الإعدادات"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"الإعدادات"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"اختصار الإعدادات"</string>
@@ -382,7 +380,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"صل الشاحن وأعد المحاولة."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"‏ليس هناك رقم تعريف شخصي (PIN) أو كلمة مرور لتأمين الشاشة"</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_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>
@@ -553,7 +550,7 @@
     <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="ble_scan_notify_text" msgid="9019985398053764737">"‏لتحسين دقة الموقع، فإن خدمات Google ستبحث عن أجهزة بلوتوث، حتى في حالة إيقاف البلوتوث. ويمكنك تغيير هذا في LINK_BEGINإعدادات البحثLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"لتحسين دقة الموقع، ستبحث التطبيقات والخدمات عن أجهزة بلوتوث، حتى في حالة إيقاف البلوتوث، ويمكنك تغيير هذا في <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>إعدادات البحث.<xliff:g id="LINK_END_1">LINK_END</xliff:g>"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"الاتصال بـ…"</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>
@@ -619,7 +616,7 @@
     <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" msgid="8382526568324164356">"‏لتحسين دقة الموقع، فإن خدمات Google ستبحث عن شبكات Wi‑Fi، حتى في حالة إيقاف Wi‑Fi. ويمكنك تغيير هذا في LINK_BEGINإعدادات البحثLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"‏لتحسين دقة الموقع، ستبحث التطبيقات والخدمات عن شبكات Wi‑Fi، حتى في حالة إيقاف Wi‑Fi، ويمكنك تغيير هذا في <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>إعدادات البحث<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"عدم الإظهار مرة أخرى"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"‏احتفاظ بـ Wi-Fi في وضع السكون"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"‏تشغيل Wi‑Fi أثناء وضع السكون"</string>
@@ -636,8 +633,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"‏اتصال Wi-Fi مباشر"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"فحص"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"متقدم"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"عرض التطبيقات"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"‏عرض قوة إشارة WiFi"</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>
@@ -695,6 +690,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"اتصال"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"ليس لهذه الشبكة حق الدخول إلى الإنترنت. هل تريد استخدامها على أية حال؟"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"عدم السؤال مرة أخرى لهذه الشبكة"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"اتصال"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"أخفق التوصيل بالشبكة"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"حذف"</string>
@@ -766,12 +763,10 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"‏شبكة Wi-Fi مُفضّلة"</item>
     <item msgid="5267397515594230396">"شبكة الجوّال مُفضّلة"</item>
-    <item msgid="3132912693346866895">"‏Wi-Fi فقط"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"٢"</item>
     <item msgid="1171822231056612021">"١"</item>
-    <item msgid="3194458950573886239">"٠"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"‏عند تشغيل الاتصال عبر Wi-Fi، يمكن للهاتف توجيه المكالمات عبر شبكات Wi-Fi أو عبر شبكة مشغّل شبكة الجوّال، حسب تفضيلك وحسب الإشارة الأقوى. وقبل تشغيل هذه الميزة، راجع رسوم مشغل شبكة الجوّال والتفاصيل الأخرى حول شبكة الجوّال."</string>
     <string name="home_settings" msgid="212375129455718176">"الشاشة الرئيسية"</string>
@@ -949,12 +944,12 @@
     <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="5128673488173839077">"التطبيقات وبيانات التطبيقات"</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_media_misc_usage" msgid="235452944021647124">"متنوع"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"ملفات أخرى"</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>
@@ -987,6 +982,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"إلغاء التحميل قيد التقدم"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"مساحة التخزين منخفضة"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"قد لا تعمل بعض ميزات النظام، مثل المزامنة بشكل صحيح. حاول تفريغ مساحة من خلال حذف عناصر أو إلغاء تثبيتها، مثل التطبيقات أو محتوى الوسائط."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"إعادة تسمية"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"تحميل"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"إخراج"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"محو البيانات والتنسيق"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"محو بيانات وتنسيق كوحدة داخلية"</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>
@@ -997,6 +997,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"‏للسماح للتطبيقات التي تمكّن MIDI بالعمل عبر USB باستخدام برامج MIDI على الكمبيوتر."</string>
     <string name="storage_other_users" msgid="808708845102611856">"مستخدمون آخرون"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"السعة التخزينية للجهاز"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"وحدة التخزين القابلة للنقل"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> خالية (إجمالي السعة التخزينية <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"تم تحميل <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"تعذر تحميل <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"تم إخراج <xliff:g id="NAME">%1$s</xliff:g> بشكل آمن"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"تعذر إخراج <xliff:g id="NAME">%1$s</xliff:g> بشكل آمن"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"تم تنسيق <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"تعذر تنسيق <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"إعادة تسمية وحدة التخزين"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"‏بعد إجراء التنسيق، يمكنك استخدام <xliff:g id="NAME_0">^1</xliff:g> هذه على أجهزة أخرى. \n\nوسيتم محو جميع البيانات الموجودة على <xliff:g id="NAME_1">^1</xliff:g> هذه. يمكنك إجراء النسخ الاحتياطي أولاً. \n\n"<b>"النسخ الاحتياطي للصور والوسائط الأخرى"</b>" \nيمكنك نقل ملفات الوسائط إلى وحدة تخزين بديلة على هذا الجهاز أو نقلها إلى جهاز كمبيوتر باستخدام كابل USB. \n\n"<b>"النسخ الاحتياطي للتطبيقات"</b>" \nستتم إزالة جميع التطبيقات المخزنة على <xliff:g id="NAME_6">^1</xliff:g> هذه وكذلك سيتم محو بياناتها. وللاحتفاظ بهذه التطبيقات، يمكنك نقلها إلى وحدة تخزين بديلة على هذا الجهاز."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"عند إخراج <xliff:g id="NAME_0">^1</xliff:g>هذه، فإن التطبيقات المخزنة عليها ستتوقف عن العمل ولن تكون ملفات الوسائط المخزنة عليها متاحة حتى يتم إعادة إدخالها."</b>" \n\nلقد تم تنسيق <xliff:g id="NAME_1">^1</xliff:g> للعمل على هذا الجهاز فقط. ولن تعمل على أية أجهزة أخرى."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"إعداد <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"الاستخدام كوحدة تخزين محمولة"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"لنقل الصور والوسائط الأخرى بين الأجهزة."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"الاستخدام كوحدة تخزين داخلية"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"لتخزين أي شيء على هذا الجهاز فقط، بما في ذلك التطبيقات والصور. يتطلب التنسيق الذي يمنعها من العمل مع الأجهزة الأخرى."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"التنسيق كوحدة تخزين داخلية"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"يتطلب هذا أن يتم تنسيق <xliff:g id="NAME_0">^1</xliff:g> لجعلها آمنة. \n\nبعد التنسيق، لن تعمل <xliff:g id="NAME_1">^1</xliff:g> هذه إلا على هذا الجهاز. \n\n"<b>"يؤدي التنسيق إلى محو جميع البيانات المخزنة حاليًا على <xliff:g id="NAME_2">^1</xliff:g>."</b>" ولتجنب فقد البيانات، يمكنك نسخها احتياطيًا."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"محو البيانات والتنسيق"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"جارٍ تنسيق <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"لا تزِل <xliff:g id="NAME">^1</xliff:g> أثناء تنسيقها."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"نقل البيانات إلى وحدة التخزين الجديدة"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"يمكنك نقل الصور والملفات وبيانات التطبيقات إلى <xliff:g id="NAME">^1</xliff:g> الجديدة هذه. \n\nتستغرق عملية النقل حوالي <xliff:g id="TIME">^2</xliff:g> وسيتم تفريغ <xliff:g id="SIZE">^3</xliff:g> على وحدة التخزين الداخلية. وقد لا تعمل بعض التطبيقات أثناء إجراء عملية النقل."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"النقل الآن"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"النقل لاحقًا"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"نقل البيانات الآن"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"تستغرق عملية النقل حوالي <xliff:g id="TIME">^1</xliff:g>. وستؤدي إلى تفريغ <xliff:g id="SIZE">^2</xliff:g> على وحدة التخزين الداخلية."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"نقل"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"جارٍ نقل البيانات…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"أثناء عملية النقل: \n• لا تزِل <xliff:g id="NAME">^1</xliff:g>. \n• قد لا تعمل بعض التطبيقات بشكل صحيح. \n• احرص على شحن الجهاز."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> جاهزة"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"تم الانتهاء من إعداد <xliff:g id="NAME">^1</xliff:g> للاستخدام مع الصور والوسائط الأخرى."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"‏تعمل <xliff:g id="NAME">^1</xliff:g> الجديدة. \n\nلنقل الصور والملفات وبيانات التطبيقات إلى هذا الجهاز، انتقل إلى الإعدادات &gt; التخزين."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"نقل <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"لن يستغرق نقل <xliff:g id="APP">^1</xliff:g> والبيانات التابعة له إلى <xliff:g id="NAME_0">^2</xliff:g> سوى بضع دقائق. ولن تتمكن من استخدام التطبيق حتى الانتهاء من عملية النقل. \n\nلا تزِل <xliff:g id="NAME_1">^2</xliff:g> أثناء عملية النقل."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"جارٍ نقل <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"لا تزِل <xliff:g id="NAME">^1</xliff:g> أثناء عملية النقل. \n\nولن يكون التطبيق <xliff:g id="APP">^2</xliff:g> على هذا الجهاز متاحًا حتى الانتهاء من عملية النقل."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"إلغاء عملية النقل"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"حالة البطارية"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"مستوى البطارية"</string>
     <string name="apn_settings" msgid="3743170484827528406">"‏أسماء نقاط الوصول (APN)"</string>
@@ -1041,13 +1080,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"إعادة تعيين إلى الإعداد الافتراضي"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"‏اكتملت إعادة تعيين إعدادات APN الافتراضية."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"تمت إعادة تعيين إعدادات الشبكة"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"‏سيؤدي هذا إلى إعادة تعيين جميع الإعدادات ذات الصلة بالشبكات على الإعدادات الافتراضية للمصنع:\n\n"<li>"Wifi"</li>\n<li>"بيانات الجوّال"</li>\n<li>"بلوتوث"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"‏سيؤدي هذا إلى إعادة تعيين كل إعدادات الشبكة، بما في ذلك:\n\n"<li>"Wi‑Fi"</li>\n<li>"بيانات الجوّال"</li>\n<li>"البلوتوث"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"إعادة تعيين الإعدادات"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"هل تريد إعادة تعيين جميع إعدادات الشبكة؟ لن تستطيع التراجع عن هذا الإجراء."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"هل تريد إعادة تعيين كل إعدادات الشبكة؟ لا يمكنك التراجع عن هذا الإجراء!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"إعادة تعيين الإعدادات"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"يلزمك رسم نقش إلغاء التأمين لتأكيد إعادة تعيين إعدادات الشبكة."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"هل تريد إعادة التعيين؟"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"تمت إعادة تعيين إعدادات الشبكة"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"تمت إعادة تعيين إعدادات الشبكة"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"إعادة تعيين الجهاز"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"إعادة الضبط بحسب بيانات المصنع"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"‏يؤدي ذلك إلى مسح جميع البيانات من "<b>"وحدة التخزين الداخلية"</b>" لجهازك اللوحي، بما في ذلك:\n\n"<li>"حسابك في Google"</li>\n<li>"النظام وبيانات التطبيقات والإعدادات"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
@@ -1063,9 +1101,8 @@
     <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="1062841478823409667">"هل تريد محو كل معلوماتك الشخصية وتطبيقاتك التي تم تنزيلها؟ لا يمكنك التراجع عن هذا الإجراء!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"مسح كل شيء"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"لا تتوفر إمكانية إعادة تعيين إعدادات المصنع لهذا المستخدم"</string>
@@ -1082,8 +1119,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"إعداد البريد الصوتي، اعادة توجيه المكالمة، انتظار المكالمة، معرف المتصل"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"‏ربط USB"</string>
@@ -1115,7 +1150,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"مساعدة"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"شبكات الجوّال"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"خطة الجوّال"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"‏تطبيق الرسائل القصيرة SMS الافتراضي"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"‏تطبيق SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"‏هل تريد تغيير تطبيق الرسائل القصيرة SMS؟"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"‏هل تريد استخدام <xliff:g id="NEW_APP">%1$s</xliff:g> بدلاً من <xliff:g id="CURRENT_APP">%2$s</xliff:g> كتطبيق للرسائل القصيرة SMS؟"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"‏هل تريد استخدام <xliff:g id="NEW_APP">%s</xliff:g> كتطبيق للرسائل القصيرة SMS؟"</string>
@@ -1146,6 +1181,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"‏استخدام نظام تحديد المواقع العالمي (GPS) في تحديد الموقع"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"البحث عن الموقع"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"البحث عن شبكة لاسلكية"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"‏البحث عن Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"‏يمكنك تحسين الموقع من خلال السماح للتطبيقات والخدمات بالبحث عن شبكات Wi‑Fi حتى في حالة إيقاف Wi‑Fi."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"البحث عن بلوتوث"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"يمكنك تحسين دقة الموقع بالسماح لخدمات النظام بالبحث عن أجهزة بلوتوث، حتى في حالة إيقاف البلوتوث."</string>
     <string name="location_network_based" msgid="6010456018401296590">"‏موقع شبكة Wi‑Fi وشبكة الجوّال"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"‏دع التطبيقات تستخدم خدمة الموقع من Google لتقييم موقعك بشكل أسرع. سيتم جمع بيانات الموقع غير محددة الهوية وإرسالها إلى Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"‏الموقع الذي تم تحديده بواسطة Wi-Fi"</string>
@@ -1191,11 +1230,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"تم تعيين كلمة المرور"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"‏تم تعيين رمز PIN"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"تم تعيين النقش"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"استخدم النقش الذي حددته على جهازك للمتابعة."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"أدخل رقم التعريف الشخصي للجهاز للمتابعة."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"أدخل كلمة مرور الجهاز للمتابعة."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"رقم تعريف شخصي خاطئ"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"كلمة مرور خاطئة"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"نقش خاطئ"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"أمان الجهاز"</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_wrong" msgid="4694973540770105678">"أعد المحاولة:"</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>
@@ -1217,8 +1260,7 @@
     <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" msgid="6909161623701848863">"تم إجراء عدد كبير جدًا من المحاولات غير الصحيحة. أعد المحاولة خلال <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>
@@ -1269,7 +1311,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"تصنيف بحسب الحجم"</string>
     <string name="show_running_services" msgid="5736278767975544570">"عرض الخدمات المشغلة"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"عرض العمليات المخزنة مؤقتًا"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"تطبيق الطوارئ الافتراضي"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"تطبيق الطوارئ"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"إعادة تعيين تفضيلات التطبيقات"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"هل تريد إعادة تعيين تفضيلات التطبيقات؟"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"سيؤدي هذا إلى إعادة تعيين كل التفضيلات لما يلي:\n\n "<li>"التطبيقات المعطلة"</li>\n" "<li>"إشعارات التطبيقات المعطلة"</li>\n" "<li>"التطبيقات الافتراضية للإجراءات"</li>\n" "<li>"قيود البيانات الخلفية للتطبيقات"</li>\n" "<li>"أي قيود أذونات"</li>\n\n" لن تفقد أي بيانات للتطبيقات."</string>
@@ -1473,8 +1515,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"التقاط حزم واجهة وحدة تحكم المضيف في ملف عبر بلوتوث"</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="select_logd_size_title" msgid="7433137108348553508">"أحجام ذاكرة التخزين المؤقت للتسجيل"</string>
@@ -1775,6 +1815,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 ساعة"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"يوم واحد"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"إظهار النظام"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"إخفاء النظام"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"‏استخدام Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"نوع الإحصائيات"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"خلفية"</string>
@@ -1871,7 +1912,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_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>
@@ -2246,7 +2286,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"المستخدم"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"ملف شخصي محظور"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"هل تريد إضافة مستخدم جديد؟"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"‏يمكنك مشاركة هذا الجهاز مع الآخرين من خلال إنشاء حسابات لمستخدمين إضافيين. سيحصل كل مستخدم على مساحته الخاصة التي يمكنه تخصيصها بتطبيقاته والصور الخلفية التي يريدها وغيرها. كما يمكن للمستخدمين ضبط إعدادات الجهاز مثل Wi-Fi والإعدادات التي لها تأثير على جميع المستخدمين.\n\nوعند إضافة مستخدم جديد، فإنه يلزمه إعداد مساحته.\n\nويمكن لأي مستخدم تحديث التطبيقات لجميع المستخدمين الآخرين."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"‏يمكنك مشاركة هذا الجهاز مع الآخرين من خلال إنشاء حسابات لمستخدمين إضافيين. وسيحصل كل مستخدم على مساحته الخاصة التي يمكنه تخصيصها بتطبيقاته وخلفياته التي يريدها وغيرها. كما يمكن للمستخدمين أيضًا ضبط إعدادات الجهاز مثل Wi-Fi والتي تؤثر في جميع المستخدمين.\n\nعند إضافة مستخدم جديد، يجب عليه إعداد مساحته.\n\nيمكن لأي مستخدم تحديث التطبيقات لجميع المستخدمين الآخرين."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"عند إضافة مستخدم جديد، فإنه يلزمه إعداد مساحته.\n\nويمكن لأي مستخدم تحديث التطبيقات لجميع المستخدمين الآخرين."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"هل تريد إعداد المستخدم الآن؟"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"تأكد أن الشخص متاح لأخذ جهازه وإعداد مساحته."</string>
@@ -2429,6 +2469,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"‏طوارئ ice تطبيق افتراضي \"emergency app default\""</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"apps download applications system"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"أمان أذونات التطبيقات"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"التطبيقات الافتراضية"</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>
@@ -2443,14 +2484,12 @@
     <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="6948120138640252732">"حظر المقاطعات"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"السماح بذات الأولوية فقط"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"القواعد التلقائية"</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_alarms" msgid="7380265858042606857">"السماح بالتنبيهات فقط"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"عدم المقاطعة"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"الأولوية فقط"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"التنبيهات فقط"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"عدم الإزعاج"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"نغمة رنين الهاتف"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"نغمة رنين الإشعارات الافتراضية"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"الاهتزاز أيضًا مع المكالمات"</string>
@@ -2487,19 +2526,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"لم يتم تثبيت برامج لتلقّي الإشعارات الصوتية."</string>
     <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">"ليست هناك تطبيقات توفر الحالات"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="zero">‏لا يوجد أي تطبيق (%d) يوفر الشروط</item>
-      <item quantity="two">‏يوفر تطبيقان (%d) الشروط</item>
-      <item quantity="few">‏توفر %d تطبيقات الشروط</item>
-      <item quantity="many">‏يوفر %d تطبيقًا الشروط</item>
-      <item quantity="other">‏توفر %d من التطبيقات الشروط</item>
-      <item quantity="one">‏يوفر تطبيق واحد (%d) الشروط</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="loading_notification_apps" msgid="5031818677010335895">"جارٍ تحميل التطبيقات..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"حظر الكل"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"عدم عرض إشعارات من هذا التطبيق"</string>
@@ -2513,17 +2539,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"اسم القاعدة"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"إضافة قاعدة"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"حذف قاعدة"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"هل تريد حذف <xliff:g id="RULE">%1$s</xliff:g>؟"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"حذف"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"نوع القاعدة"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"غير معروف"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"تهيئة القاعدة"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"جدولة القاعدة زمنيًا"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"لم يتم العثور على القاعدة."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"أيام"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"بدون"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"كل يوم"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">"، "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"مطلقًا"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> إلى <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"المكالمات"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"الرسائل"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"مكالمات/رسائل من"</string>
@@ -2533,15 +2565,108 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"التنبيهات"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"التذكيرات"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"الأحداث"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"المتصلون المحددون"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"المتصلون المتكررون"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"في حال اتصال الشخص نفسه للمرة الثانية في غضون <xliff:g id="MINUTES">%d</xliff:g> من الدقائق، اسمح له."</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> في اليوم التالي"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"متى تريد أن تتم مقاطعتك؟"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"إلى متى؟"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"إلى أجل غير مسمى"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="zero"><xliff:g id="COUNT_1">%d</xliff:g> من الدقائق</item>
+      <item quantity="two">دقيقتان (<xliff:g id="COUNT_1">%d</xliff:g>)</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> دقائق</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> دقيقة</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> من الدقائق</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> دقيقة</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="zero"><xliff:g id="COUNT_1">%d</xliff:g> من الساعات</item>
+      <item quantity="two">ساعتان (<xliff:g id="COUNT_1">%d</xliff:g>)</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> ساعات</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> ساعة</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> من الساعات</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ساعة</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"تغيير إلى الإشعارات ذات الأولوية فقط إلى أجل غير مسمى"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="zero">تغيير إلى الإشعارات ذات الأولوية فقط لمدة <xliff:g id="DURATION">%1$d</xliff:g> من الدقائق حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="two">تغيير إلى الإشعارات ذات الأولوية فقط لمدة دقيقتين (<xliff:g id="DURATION">%1$d</xliff:g>) حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">تغيير إلى الإشعارات ذات الأولوية فقط لمدة <xliff:g id="DURATION">%1$d</xliff:g> دقائق حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">تغيير إلى الإشعارات ذات الأولوية فقط لمدة <xliff:g id="DURATION">%1$d</xliff:g> دقيقة حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">تغيير إلى الإشعارات ذات الأولوية فقط لمدة <xliff:g id="DURATION">%1$d</xliff:g> من الدقائق حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">تغيير إلى الإشعارات ذات الأولوية فقط لمدة دقيقة واحدة حتى <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="zero">تغيير إلى الإشعارات ذات الأولوية فقط لمدة <xliff:g id="DURATION">%1$d</xliff:g> من الساعات (حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="two">تغيير إلى الإشعارات ذات الأولوية فقط لمدة ساعتين (<xliff:g id="DURATION">%1$d</xliff:g>) (حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">تغيير إلى الإشعارات ذات الأولوية فقط لمدة <xliff:g id="DURATION">%1$d</xliff:g> ساعات (حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="many">تغيير إلى الإشعارات ذات الأولوية فقط لمدة <xliff:g id="DURATION">%1$d</xliff:g> ساعة (حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">تغيير إلى الإشعارات ذات الأولوية فقط لمدة <xliff:g id="DURATION">%1$d</xliff:g> من الساعات (حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">تغيير إلى الإشعارات ذات الأولوية فقط لمدة ساعة واحدة حتى <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"تغيير إلى تنبيهات فقط إلى أجل غير مسمى"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="zero">تغيير إلى تنبيهات فقط لمدة <xliff:g id="DURATION">%1$d</xliff:g> من الدقائق (حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="two">تغيير إلى تنبيهات فقط لمدة دقيقتين (<xliff:g id="DURATION">%1$d</xliff:g>) (حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">تغيير إلى تنبيهات فقط لمدة <xliff:g id="DURATION">%1$d</xliff:g> دقائق (حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="many">تغيير إلى تنبيهات فقط لمدة <xliff:g id="DURATION">%1$d</xliff:g> دقيقة (حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">تغيير إلى تنبيهات فقط لمدة <xliff:g id="DURATION">%1$d</xliff:g> من الدقائق (حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">تغيير إلى تنبيهات فقط لمدة دقيقة واحدة حتى <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="zero">تغيير إلى تنبيهات فقط لمدة <xliff:g id="DURATION">%1$d</xliff:g> من الساعات حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="two">تغيير إلى تنبيهات فقط لمدة ساعتين (<xliff:g id="DURATION">%1$d</xliff:g>) حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">تغيير إلى تنبيهات فقط لمدة <xliff:g id="DURATION">%1$d</xliff:g> ساعات حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">تغيير إلى تنبيهات فقط لمدة <xliff:g id="DURATION">%1$d</xliff:g> ساعة حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">تغيير إلى تنبيهات فقط لمدة <xliff:g id="DURATION">%1$d</xliff:g> من الساعات حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">تغيير إلى تنبيهات فقط لمدة ساعة واحدة حتى <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"تغيير إلى عدم الإزعاج إلى أجل غير مسمى"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="zero">تغيير إلى وضع عدم الإزعاج لمدة <xliff:g id="DURATION">%1$d</xliff:g> من الدقائق (حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="two">تغيير إلى وضع عدم الإزعاج لمدة دقيقتين (<xliff:g id="DURATION">%1$d</xliff:g>) (حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">تغيير إلى وضع عدم الإزعاج لمدة <xliff:g id="DURATION">%1$d</xliff:g> دقائق (حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="many">تغيير إلى وضع عدم الإزعاج لمدة <xliff:g id="DURATION">%1$d</xliff:g> دقيقة (حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">تغيير إلى وضع عدم الإزعاج لمدة <xliff:g id="DURATION">%1$d</xliff:g> من الدقائق (حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">تغيير إلى وضع عدم الإزعاج لمدة دقيقة واحدة حتى <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="zero">تغيير إلى وضع عدم الإزعاج لمدة <xliff:g id="DURATION">%1$d</xliff:g> من الساعات حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="two">تغيير إلى وضع عدم الإزعاج لمدة ساعتين (<xliff:g id="DURATION">%1$d</xliff:g>) حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">تغيير إلى وضع عدم الإزعاج لمدة <xliff:g id="DURATION">%1$d</xliff:g> ساعات حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">تغيير إلى وضع عدم الإزعاج لمدة <xliff:g id="DURATION">%1$d</xliff:g> ساعة حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">تغيير إلى وضع عدم الإزعاج لمدة <xliff:g id="DURATION">%1$d</xliff:g> من الساعات حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">تغيير إلى وضع عدم الإزعاج لمدة ساعة واحدة حتى <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"تغيير إلى المقاطعة دائمًا"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"للأبد"</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>
@@ -2610,7 +2735,14 @@
       <item quantity="other">تم منح <xliff:g id="COUNT_1">%d</xliff:g> من الأذونات</item>
       <item quantity="one">تم منح <xliff:g id="COUNT_0">%d</xliff:g> إذن</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="zero">تم منح <xliff:g id="COUNT_2">%d</xliff:g> من <xliff:g id="COUNT_3">%d</xliff:g> من الأذونات</item>
+      <item quantity="two">تم منح <xliff:g id="COUNT_2">%d</xliff:g> من <xliff:g id="COUNT_3">%d</xliff:g> من الأذونات</item>
+      <item quantity="few">تم منح <xliff:g id="COUNT_2">%d</xliff:g> من <xliff:g id="COUNT_3">%d</xliff:g> من الأذونات</item>
+      <item quantity="many">تم منح <xliff:g id="COUNT_2">%d</xliff:g> من <xliff:g id="COUNT_3">%d</xliff:g> من الأذونات</item>
+      <item quantity="other">تم منح <xliff:g id="COUNT_2">%d</xliff:g> من <xliff:g id="COUNT_3">%d</xliff:g> من الأذونات</item>
+      <item quantity="one">تم منح <xliff:g id="COUNT_0">%d</xliff:g> من <xliff:g id="COUNT_1">%d</xliff:g> إذن</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"تم تعيين بعض الإعدادات الافتراضية"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"لم يتم تعيين إعدادات افتراضية"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"جميع التطبيقات"</string>
@@ -2621,8 +2753,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"الأولوية"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"الحساسية"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"‏مع عناوين URL للنطاقات"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"إعادة تعيين التفضيلات عبر جميع التطبيقات إلى الإعدادات الافتراضية"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"تم تثبيت <xliff:g id="COUNT">%d</xliff:g> من التطبيقات، بما في ذلك تطبيقات النظام والتطبيقات التي تم تنزيلها"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"معطّل بواسطة المشرف"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"متقدمة"</string>
     <string name="unknown_app" msgid="5275921288718717656">"تطبيق غير معروف"</string>
     <string name="choose_profile" msgid="8229363046053568878">"اختيار ملف شخصي"</string>
@@ -2641,4 +2772,11 @@
       <item quantity="other">‏هناك <xliff:g id="COUNT">%d</xliff:g> من التطبيقات يمكنها فتح عناوين URL الخاصة بنطاقاتها</item>
       <item quantity="one">‏هناك تطبيق واحد يمكنه فتح عناوين URL الخاصة بنطاقه</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"لم يتم التعرف عليها"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"التطبيقات الافتراضية"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"تطبيق المتصفح"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"ليس هناك متصفح افتراضي"</string>
+    <string name="default_app" msgid="6864503001385843060">"(افتراضي)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 0c9e52f..0863de3 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"ПАРОЛА"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Бутон"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"лошо"</item>
     <item msgid="4212263919458209842">"критично"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Изключено"</item>
-    <item msgid="5656544177755411222">"Ограничени прекъсвания"</item>
-    <item msgid="8735337502532332056">"Нула прекъсвания"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Нормално"</item>
     <item msgid="866544120205026771">"Средно"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 133d9b9..d05436e 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD карта"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Настройки за прокси сървър"</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">"ОK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ДА"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"НЕ"</string>
-    <string name="forget" msgid="7267115980248732932">"ЗАБРАВЯНЕ"</string>
+    <string name="forget" msgid="1400428660472591263">"Забравяне"</string>
+    <string name="save" msgid="879993180139353333">"Запазване"</string>
+    <string name="done" msgid="6942539184162713160">"Готово"</string>
     <string name="settings_label" msgid="1626402585530130914">"Настройки"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Настройки"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Пряк път за настройките"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Включете зарядното си устройство и опитайте отново."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Няма PIN код или парола за заключване на екрана"</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_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>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Разширени"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Разширени настр. за Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Когато вкл. Bluetooth, устройството ви може да се свързва с други у-ва с Bluetooth в района."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"За подобряване на точността на местоположението услугите на Google ще сканират за устройства с Bluetooth дори когато Bluetooth е изключен. Можете да промените това от LINK_BEGINнастройките за сканиранеLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"За подобряване на точността на местоположението приложенията и услугите ще сканират за устройства с Bluetooth дори когато Bluetooth е изключен. Можете да промените това от <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>настройките за сканиране<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Свързване с/ъс..."</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>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"За подобряване на точността на местоположението услугите на Google ще сканират за Wi‑Fi мрежи дори когато Wi‑Fi е изключен. Можете да промените това от LINK_BEGINнастройките за сканиранеLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"За подобряване на точността на местоположението приложенията и услугите ще сканират за Wi‑Fi мрежи дори когато Wi‑Fi е изключен. Можете да промените това от <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>настройките за сканиране<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Да не се показва отново"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"С включен Wi‑Fi при спящ режим"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Включен Wi‑Fi при спящ режим"</string>
@@ -604,8 +601,6 @@
     <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_apps" msgid="6003687912727859577">"Приложения"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Сила на Wi-Fi сигнал"</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>
@@ -663,6 +658,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"СВЪРЗВАНЕ"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Тази мрежа няма достъп до интернет. Да се използва ли въпреки това?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Без повторно запитване за тази мрежа"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Свързване"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Свързването с мрежата не бе успешно"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Забравяне"</string>
@@ -729,21 +726,17 @@
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Преносима точка за достъп до 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">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Обаждания през Wi-Fi"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Предпочитание за обаждания"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Режим на обаждания през Wi-Fi"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Предпочита се Wi-Fi"</item>
     <item msgid="5267397515594230396">"Предпочита се клетъчна мрежа"</item>
-    <item msgid="3132912693346866895">"Само Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Когато функцията за обаждания през Wi-Fi е включена, телефонът ви може да маршрутизира обажданията през Wi-Fi мрежи или мрежата на оператора ви в зависимост от предпочитанието ви и от това, кой сигнал е по-силен. Преди да включите тази функция, потърсете от оператора си информация относно таксите и други подробности."</string>
     <string name="home_settings" msgid="212375129455718176">"Начало"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
@@ -915,12 +908,12 @@
     <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="5128673488173839077">"Приложения и данните им"</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_media_misc_usage" msgid="235452944021647124">"Разни"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Други файлове"</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>
@@ -953,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Извършва се активиране"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Място в хранил. – на изчерпване"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Възможно е някои функции на системата, като синхронизирането, да не работят правилно. Опитайте да освободите място, като изтриете или освободите елементи, например приложения или медийно съдържание."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Преименуване"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Свързване"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Изваждане"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Изтриване и форматиране"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Изтр. и форм. като вътр. хран."</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>
@@ -963,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Разрешава на активираните за MIDI приложения да работят през USB със софтуера за MIDI на компютъра ви."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Други потребители"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Хранилище на устройството"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Сменяемо хранилище"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"Свободно място: <xliff:g id="FREE">%1$s</xliff:g> от общо <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g>: Свързването бе успешно"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g>: Не можа да се свърже"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g>: Безопасното изваждане бе успешно"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g>: Не можа да се извади безопасно"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g>: Форматирането бе успешно"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g>: Не можа да се форматира"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Преименуване на хранилището"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"След форматирането можете да използвате хранилището (<xliff:g id="NAME_0">^1</xliff:g>) на други устройства. \n\nВсички данни в това хранилище (<xliff:g id="NAME_1">^1</xliff:g>) ще бъдат изтрити. Добре е първо да създадете резервно копие. \n\n"<b>"Създаване на резервно копие на снимки и друга мултимедия"</b>" \nПреместете мултимедийните си файлове в друго хранилище на това устройство или ги прехвърлете на компютър посредством USB кабел. \n\n"<b>"Създаване на резервно копие на приложения"</b>" \nВсички съхранявани в това хранилище (<xliff:g id="NAME_6">^1</xliff:g>) приложения ще бъдат деинсталирани, а данните им – изтрити. За да запазите тези приложения, ги преместете в друго хранилище на устройството."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Когато извадите това хранилище (<xliff:g id="NAME_0">^1</xliff:g>), съхраняваните там приложения ще спрат да работят, а съответните мултимедийни файлове няма да са налице, докато не го поставите отново."</b>" \n\nХранилището (<xliff:g id="NAME_1">^1</xliff:g>) е форматирано да работи само на това устройство и няма да функционира другаде."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Настройте хранилището (<xliff:g id="NAME">^1</xliff:g>)"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Използване като преносимо хранилище"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"За преместване на снимки и друга мултимедия между устройствата."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Използване като вътрешно хранилище"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"За съхраняване на каквото и да е само на това устройство, включително приложения и снимки. Хранилището трябва да се форматира, за да не може да работи на други устройства."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Форматиране като вътр. хранилище"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Необходимо е да форматирате хранилището (<xliff:g id="NAME_0">^1</xliff:g>), за да го защитите. \n\nСлед като форматирате хранилището (<xliff:g id="NAME_1">^1</xliff:g>), то ще работи само на това устройство. \n\n"<b>"При форматирането се изтриват всички данни, които понастоящем се съхраняват в това хранилище (<xliff:g id="NAME_2">^1</xliff:g>)."</b>" За да не ги загубите, е добре да създадете резервно копие."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Изтриване и форматиране"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g>: Форматира се…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Не премахвайте хранилището (<xliff:g id="NAME">^1</xliff:g>), докато се форматира."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Премест. данните в новото хран."</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Можете да преместите своите снимки, файлове и данни на приложения в новото хранилище (<xliff:g id="NAME">^1</xliff:g>). \n\nПроцесът отнема около <xliff:g id="TIME">^2</xliff:g> и ще освободи <xliff:g id="SIZE">^3</xliff:g> във вътрешното хранилище. През това време някои приложения няма да работят."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Преместване сега"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Преместване по-късно"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Преместете данните сега"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Преместването отнема около <xliff:g id="TIME">^1</xliff:g> и ще освободи <xliff:g id="SIZE">^2</xliff:g> във вътрешното хранилище."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Преместване"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Данните се преместват…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"По време на преместването: \n• Не премахвайте хранилището (<xliff:g id="NAME">^1</xliff:g>). \n• Някои приложения няма да работят правилно. \n• Устройството трябва да е заредено."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g>: В готовност"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Хранилището (<xliff:g id="NAME">^1</xliff:g>) е готово за използване за снимки и друга мултимедия."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Новото хранилище (<xliff:g id="NAME">^1</xliff:g>) работи. \n\nЗа да преместите снимки, файлове и данни на приложения към това устройство, отворете „Настройки“ &gt; „Хранилище“."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Преместете <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Преместването на приложението <xliff:g id="APP">^1</xliff:g> и данните му към хранилището (<xliff:g id="NAME_0">^2</xliff:g>) няма да отнеме дълго време. Няма да можете да използвате приложението, докато процесът не завърши. \n\nНе премахвайте хранилището (<xliff:g id="NAME_1">^2</xliff:g>) по време на преместването."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> се премества…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Не премахвайте хранилището (<xliff:g id="NAME">^1</xliff:g>) по време на преместването. \n\nПриложението <xliff:g id="APP">^2</xliff:g> няма да е налице на това устройство, докато процесът не завърши."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Анулиране на преместването"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Състояние на батерията"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Ниво на батерията"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Имена на точките за достъп (APN)"</string>
@@ -1007,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Възстановяване на стандартни"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Възстановяването на стандартните настройките за името на точката за достъп (APN) завърши."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Нулиране на настройките на мрежата"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Така всички свързани с мрежата настройки ще се нулират към стандартните им фабрични стойности, включително:\n\n"<li>"Wi-Fi;"</li>\n<li>"мобилни данни;"</li>\n<li>"Bluetooth."</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Така ще се нулират всички мрежови настройки, включително тези за:\n\n"<li>"Wi‑Fi;"</li>\n<li>"клетъчни данни;"</li>\n<li>"Bluetooth."</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Нулиране на настройките"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Да се нулират ли всички настройки на мрежата? Не можете да отмените това действие!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Да се нулират ли всички мрежови настройки? Не можете да отмените това действие!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Нулиране на настройките"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Трябва да начертаете фигурата си за отключване, за да потвърдите нулирането на настройките на мрежата."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Да се извърши ли нулиране?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Настройките на мрежата са нулирани"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Мрежовите настройки са нулирани"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Нулиране на устройството"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Възстановяване на фабричните настройки"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на таблета ви, включително:\n\n"<li>"профила ви в Google;"</li>\n<li>"данни и настройки от системата и приложенията;"</li>\n<li>"изтеглени приложения."</li></string>
@@ -1029,9 +1065,8 @@
     <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="1062841478823409667">"Да се изтрият ли цялата ви лична информация и всички изтеглени приложения? Не можете да отмените това действие!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Изтриване на всичко"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"За този потребител не е налице възстановяване на фабричните настройки"</string>
@@ -1048,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Настройка на гласова поща, пренасочване, изчакване и идентификация на обаждането"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Тетъринг през USB"</string>
@@ -1081,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Помощ"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Клетъчни мрежи"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Мобилен план"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Стандартно приложение за SMS"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Приложение за SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Да се промени ли приложението за SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Да се използва ли <xliff:g id="NEW_APP">%1$s</xliff:g> вместо <xliff:g id="CURRENT_APP">%2$s</xliff:g> като приложение за SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Да се използва ли <xliff:g id="NEW_APP">%s</xliff:g> като приложение за SMS?"</string>
@@ -1112,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Използване на GPS за определяне на местоположението"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Сканиране"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Сканиране"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Сканиране за Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Подобряване на местоположението чрез разрешаване на приложенията и услугите да сканират за Wi‑Fi мрежи дори когато Wi‑Fi е изключен"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Сканиране за устройства с Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Подобряване на местоположението чрез разрешаване на системните услуги да сканират за устройства с Bluetooth дори когато Bluetooth е изключен"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Mестоп. от Wi‑Fi и клет. мрежа"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Прилож. да ползват услугата ни за местоп., за да прогнозират по-бързо вашето. Анонимни данни за местоп. ще се събират и изпращат на Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Местоположението се определя чрез Wi‑Fi"</string>
@@ -1157,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Паролата е зададена"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN кодът е зададен"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Фигурата е зададена"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Използвайте фигурата за устройството си, за да продължите."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Въведете ПИН кода за устройството си, за да продължите."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Въведете паролата за устройството си, за да продължите."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Грешен ПИН код"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Грешна парола"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Грешна фигура"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Сигурност на устройството"</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_wrong" msgid="4694973540770105678">"Опитайте отново:"</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>
@@ -1183,8 +1224,7 @@
     <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" msgid="6909161623701848863">"Твърде много неправилни опити. Опитайте отново след <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>
@@ -1235,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Сортиране по размер"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Изпълнявани услуги"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Кеширани процеси"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Приложение за спешни случаи"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Нулиране"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Да се нулират предпоч.?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Това ще нулира всички предпочитания за:\n\n "<li>"деактивираните приложения;"</li>\n" "<li>"известията за деактивирани приложения;"</li>\n" "<li>"стандартните приложения за действия;"</li>\n" "<li>"ограниченията за данни на заден план за приложенията;"</li>\n" "<li>"ограниченията за всички разрешения."</li>\n\n" Няма да загубите данни от приложенията."</string>
@@ -1440,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Заснемане на всички пакети за Bluetooth с протокола HCI във файла"</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="select_logd_size_title" msgid="7433137108348553508">"Размери на регистрационните буфери"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 часа"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 ден"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Показване на системните процеси"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Скриване на системните"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Използване на USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Тип статистически данни"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Заден план"</string>
@@ -1838,7 +1876,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_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>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Потребител"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Ограничен потр. профил"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Да се добави ли нов потреб.?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Можете да споделите това устройство с други хора, като създадете допълнителни потребители. Всеки от тях има свое работно пространство, което може да персонализира със собствени приложения, тапет и др. Потребителите могат също да коригират настройки на устройството, които засягат всички – например Wi‑Fi.\n\nКогато добавите нов потребител, той трябва да настрои работното си пространство.\n\nВсеки потребител може да актуализира приложенията за всички останали потребители."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Можете да споделите това устройство с други хора, като създадете допълнителни потребители. Всеки от тях има собствено работно пространство, което може да персонализира с приложения, тапет и др. Потребителите могат също да коригират настройки на устройството, които засягат всички – например Wi‑Fi.\n\nКогато добавите нов потребител, той трябва да настрои работното си пространство.\n\nВсеки потребител може да актуализира приложенията за всички останали потребители."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Когато добавите нов потребител, той трябва да настрои работното си пространство.\n\nВсеки потребител може да актуализира приложенията за всички останали потребители."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Настройване на потребителя?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Уверете се, че човекът е налице да вземе устройството и да настрои работното си пространство"</string>
@@ -2393,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"ограничение, ограничаване, ограничено"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"коригиране на текст коригиране звук вибриране автоматично език жест предлагане предложение тема обидна дума тип емотикони международно"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"нулиране, предпочитания, стандартни стойности"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"спешен случай, спешност, приложение, стандартно"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"приложения, изтегляне, приложения, системни"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"сигурност на разрешенията за приложения"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"приложения, по подразбиране"</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>
@@ -2411,14 +2448,12 @@
     <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="6948120138640252732">"Блокиране на прекъсванията"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Само приоритетни прекъсвания"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Автоматични правила"</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_alarms" msgid="7380265858042606857">"Разрешаване само на будилниците"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Без прекъсване"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Само с приоритет"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Само будилници"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Без прекъсвания"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Мелодия на телефон"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Стандартна мелодия за известията"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Вибриране и при обаждания"</string>
@@ -2451,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Няма инсталирани слушатели на известия."</string>
     <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">"Няма приложения, които предоставят условия"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d приложения предоставят условия</item>
-      <item quantity="one">%d приложение предоставя условия</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="loading_notification_apps" msgid="5031818677010335895">"Приложенията се зареждат..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блокиране на всички"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Известията от това приложение никога не се показват"</string>
@@ -2473,17 +2499,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"Име на правилото"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Добавяне на правило"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Изтриване на правило"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Да се изтрие ли правилото „<xliff:g id="RULE">%1$s</xliff:g>“?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Изтриване"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Тип на правилото"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Неизвестно"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Конфигуриране на правило"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Правило за график"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Правилото не е намерено."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Дни"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Няма"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Всеки ден"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Никога"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"от <xliff:g id="START">%1$s</xliff:g> до <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"от <xliff:g id="START">%1$s</xliff:g> до <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Обаждания"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Съобщения"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Обаждания/съобщения от"</string>
@@ -2493,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Будилници"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Напомняния"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Събития"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Избрани обаждащи се"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Повтаряне на обаждащите се"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Ако един и същ човек се обади втори път в рамките на период от <xliff:g id="MINUTES">%d</xliff:g> мин, това да се разреши"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> на следващия ден"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Кога искате да бъдете прекъсвани?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"За колко време?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"За неопределено време"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> минути</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> минута</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> часа</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> час</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Активиране на режима „Само с приоритет“ за неопределено време"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Активиране на режима „Само с приоритет“ за <xliff:g id="DURATION">%1$d</xliff:g> минути до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Активиране на режима „Само с приоритет“ за една минута до <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Активиране на режима „Само с приоритет“ за <xliff:g id="DURATION">%1$d</xliff:g> часа (до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Активиране на режима „Само с приоритет“ за един час до <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Активиране на режима „Само будилници“ за неопределено време"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Активиране на режима „Само будилници“ за <xliff:g id="DURATION">%1$d</xliff:g> минути (до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Активиране на режима „Само будилници“ за една минута до <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Активиране на режима „Само будилници“ за <xliff:g id="DURATION">%1$d</xliff:g> часа до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Активиране на режима „Само будилници“ за един час до <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Активиране на режима „Без прекъсвания“ за неопределено време"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Активиране на режима „Без прекъсвания“ за <xliff:g id="DURATION">%1$d</xliff:g> минути (до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Активиране на режима „Без прекъсвания“ за една минута до <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Активиране на режима „Без прекъсвания“ за <xliff:g id="DURATION">%1$d</xliff:g> часа до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Активиране на режима „Без прекъсвания“ за един час до <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Активиране на режима „Прекъсване винаги“"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"завинаги"</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>
@@ -2566,7 +2659,10 @@
       <item quantity="other">Предоставени са <xliff:g id="COUNT_1">%d</xliff:g> разрешения</item>
       <item quantity="one">Предоставено е <xliff:g id="COUNT_0">%d</xliff:g> разрешение</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other">Предоставени са <xliff:g id="COUNT_2">%d</xliff:g> от <xliff:g id="COUNT_3">%d</xliff:g> разрешения</item>
+      <item quantity="one">Предоставено е <xliff:g id="COUNT_0">%d</xliff:g> от <xliff:g id="COUNT_1">%d</xliff:g> разрешение</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Зададени са някои стандартни настройки"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Няма зададени стандартни настройки"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Всички приложения"</string>
@@ -2577,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"С приоритет"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"С важна информация"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"С URL адреси в домейните"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Нулиране на предпочитанията на всички приложения към стандартните им стойности"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"Инсталирани са <xliff:g id="COUNT">%d</xliff:g> приложения, включително системните и изтеглените"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Деактивирано от администратора"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Разширени"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Неизвестно приложение"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Избиране на потр. профил"</string>
@@ -2593,4 +2688,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> приложения могат да отварят URL адреси в домейните</item>
       <item quantity="one">Едно приложение може да отваря URL адреси в домейните</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Не е разпознато"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Приложения по подразбиране"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Браузър"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Няма браузър по подразбиране"</string>
+    <string name="default_app" msgid="6864503001385843060">"(По подразбиране)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-bn-rBD/arrays.xml b/res/values-bn-rBD/arrays.xml
index 0ea5709..cc8f346 100644
--- a/res/values-bn-rBD/arrays.xml
+++ b/res/values-bn-rBD/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"পুশ বোতাম"</item>
@@ -285,7 +288,7 @@
     <item msgid="9130014005474445273">"VPN সক্রিয় করুন"</item>
     <item msgid="1165192162975045562">"লেখার ওয়ালপেপার"</item>
     <item msgid="7129487923652967258">"গঠন সহায়তা"</item>
-    <item msgid="1069023208100114540">"স্ক্রিনশট সহায়তা"</item>
+    <item msgid="1069023208100114540">"স্ক্রীনশট সহায়তা"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"অবস্থান"</item>
@@ -337,7 +340,7 @@
     <item msgid="2486614710846178542">"VPN সক্রিয় করুন"</item>
     <item msgid="5586547561693629602">"লেখার ওয়ালপেপার"</item>
     <item msgid="32794179825485062">"গঠন সহায়তা"</item>
-    <item msgid="7872852746938272552">"স্ক্রিনশট সহায়তা"</item>
+    <item msgid="7872852746938272552">"স্ক্রীনশট সহায়তা"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"স্বল্প"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"নিম্ন"</item>
     <item msgid="4212263919458209842">"জটিল"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"বন্ধ করুন"</item>
-    <item msgid="5656544177755411222">"কল ও ম্যাসেজ কখন কখন আটকান"</item>
-    <item msgid="8735337502532332056">"কল ও ম্যাসেজ কখনই আটকাবেন না"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"স্বাভাবিক"</item>
     <item msgid="866544120205026771">"মাঝারি"</item>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 3bab444..f0657c8 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD কার্ড"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"প্রক্সি সেটিংস"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"হ্যাঁ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"না"</string>
-    <string name="forget" msgid="7267115980248732932">"ভুলে যান"</string>
+    <string name="forget" msgid="1400428660472591263">"ভুলে যান"</string>
+    <string name="save" msgid="879993180139353333">"সংরক্ষণ করুন"</string>
+    <string name="done" msgid="6942539184162713160">"সম্পন্ন"</string>
     <string name="settings_label" msgid="1626402585530130914">"সেটিংস"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"সেটিংস"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"সেটিংস শর্টকাট"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"আপনার চার্জার প্লাগ ইন করুন এবং আবার চেষ্টা করুন।"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"কোনো লক স্ক্রীন PIN বা পাসওয়ার্ড নেই"</string>
     <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>
@@ -419,7 +416,7 @@
     <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_setup_wizard_fingerprint_details" msgid="7579210814842056547">"আপনি কোনো স্ক্রীন লকের সেট আপ করার পরে, আপনি আবার সেটিংস &gt; নিরাপত্তার মধ্যে আপনার আঙুলের ছাপ সেট আপ করতে পারেন।"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"আপনি কোনো স্ক্রীন লকের সেট আপ করার পরে, সেটিংস &gt; নিরাপত্তার মধ্যে আপনার আঙুলের ছাপও সেট আপ করতে পারবেন।"</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>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"উন্নত"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"উন্নত Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"যখন Bluetooth চালু করা হয়, তখন আপনার অন্যান্য কাছাকাছির Bluetooth ডিভাইসগুলির সাথে যোগাযোগ করতে পারে৷"</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"অবস্থানের যথার্থতা উন্নত করতে, Google পরিষেবাগুলি Bluetooth বন্ধ থাকার সময়েও Bluetooth ডিভাইসগুলিকে স্ক্যান করবে। আপনি এটিকে LINK_BEGINস্ক্যানিং সেটিংসLINK_END এর মধ্যে পরিবর্তন করতে পারেন।"</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"অবস্থানের যথার্থতা উন্নত করতে, অ্যাপ্লিকেশান এবং পরিষেবাগুলি Bluetooth বন্ধ থাকার সময়েও Bluetooth ডিভাইসগুলিকে স্ক্যান করবে। আপনি এটিকে <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>স্ক্যানিং সেটিংস<xliff:g id="LINK_END_1">LINK_END</xliff:g> এর মধ্যে পরিবর্তন করতে পারেন।"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"এতে সংযুক্ত করুন..."</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>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"অবস্থানের যথার্থতা উন্নত করতে, Google পরিষেবাগুলি Wi‑Fi বন্ধ থাকার সময়েও Wi‑Fi নেটওয়ার্কগুলিকে স্ক্যান করবে। আপনি এটিকে LINK_BEGINস্ক্যানিং সেটিংসLINK_END এর মধ্যে পরিবর্তন করতে পারেন।"</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"অবস্থানের যথার্থতা উন্নত করতে, অ্যাপ্লিকেশান এবং পরিষেবাগুলি Wi‑Fi বন্ধ থাকার সময়েও Wi‑Fi নেটওয়ার্কগুলিকে স্ক্যান করবে৷ আপনি এটিকে <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>স্ক্যানিং সেটিংস<xliff:g id="LINK_END_1">LINK_END</xliff:g> এর মধ্যে পরিবর্তন করতে পারেন।"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"আগ দেখাবেন না"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"নিদ্রা মোডের সময়  Wi‑Fi চালু রাখুন"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"স্ক্রীন বন্ধ থাকলেও Wi‑Fi চালু"</string>
@@ -604,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi ডাইরেক্ট"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"স্ক্যান করুন"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"উন্নত"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"অ্যাপ্লিকেশানগুলি দেখান"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"WiFi এর শক্তি দেখান"</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>
@@ -663,6 +658,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"সংযুক্ত করুন"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"এই নেটওয়ার্কে কোন ইন্টারনেট অ্যাক্সেস নেই৷ যাইহোক এই নেটওয়ার্কটি ব্যবহার করতে চান?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"এই নেটওয়ার্কের জন্য আবার জিজ্ঞাসা করবেন না"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"সংযুক্ত করুন"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"নেটওয়ার্কের সাথে সংযোগ করতে ব্যর্থ হয়েছে"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"ভুলে যান"</string>
@@ -734,12 +731,10 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi ব্যবহার করুন"</item>
     <item msgid="5267397515594230396">"পছন্দের মোবাইল নেটওয়ার্ক"</item>
-    <item msgid="3132912693346866895">"শুধুমাত্র Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"২"</item>
     <item msgid="1171822231056612021">"১"</item>
-    <item msgid="3194458950573886239">"০"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wi-Fi কলিং চালু থাকার সময়ে, আপনার পছন্দ এবং কোন সিগন্যাল বেশী শক্তিশালী তার উপর নির্ভর করে আপনার ফোন Wi-Fi নেটওয়ার্ক বা আপনার পরিষেবা প্রদানকারীর নেটওয়ার্কের মাধ্যমে আপনার কলের রুট তৈরি করে। এই বৈশিষ্ট্যটি চালু করার আগে, আপনার পরিষেবা প্রদানকারীর কাছে ফি-গুলি এবং অন্যান্য বিশদ বিবরণ সম্বন্ধে পরীক্ষা করুন।"</string>
     <string name="home_settings" msgid="212375129455718176">"হোম"</string>
@@ -913,12 +908,12 @@
     <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="5128673488173839077">"অ্যাপ্লিকেশানগুলি এবং অ্যাপ্লিকেশান ডেটা"</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_media_misc_usage" msgid="235452944021647124">"বিবিধ"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"অন্যান্য ফাইলগুলি"</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>
@@ -951,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"আনমাউন্ট করার কাজ চলছে"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"সঞ্চয়স্থান পূর্ণ হতে চলেছে"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"সিঙ্কের মতো কিছু সিস্টেম ফাংশনগুলি সঠিকভাবে কাজ নাও করতে পারে। অ্যাপ্লিকেশান ও মিডিয়া সামগ্রীর মতো আন পিন করা আইটেমগুলি মুছে ফেলার মাধ্যেমে স্থান মুক্ত করার চেষ্টা করুন।"</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"পুনরায় নামকরণ করুন"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"মাউন্ট করা"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"বের করে নিন"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"মুছুন এবং ফর্ম্যাট করুন"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"মুছে ফেলুন এবং অভ্যন্তরীণ সঞ্চয়স্থান হিসাবে ফর্ম্যাট করুন"</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>
@@ -961,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"MIDI সক্ষমিত অ্যাপ্লিকেশানগুলিকে আপনার কম্পিউটারে MIDI সফ্টওয়্যারের সঙ্গে USB এর সাথে কাজ করতে দেয়৷"</string>
     <string name="storage_other_users" msgid="808708845102611856">"অন্য ব্যবহারকারীরা"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"ডিভাইসের সঞ্চয়স্থান"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"মোছা যায় এমন সঞ্চয়স্থান"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> বিনামূল্যে (মোট <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> মাউন্ট করা হয়েছে"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g> মাউন্ট করা যায়নি"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> নিরাপদে সরিয়ে দেওয়া হয়েছে"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g> নিরাপদে সরানো যায়নি"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> ফর্ম্যাট করা হয়েছে"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> ফর্ম্যাট করা যায়নি"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"সঞ্চয়স্থানের পুনঃনামকরণ করুন"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"ফর্ম্যাট করার পর, আপনি অন্যান্য ডিভাইসগুলিতে এই <xliff:g id="NAME_0">^1</xliff:g> ব্যবহার করতে পারেন৷ \n\nএই <xliff:g id="NAME_1">^1</xliff:g> এর সমস্ত ডেটা মুছে ফেলা হবে৷ প্রথমে ব্যাক আপ নেওয়ার কথা বিবেচনা করুন৷ \n\n"<b>"ফটোগুলি এবং অন্য মিডিয়ার ব্যাক আপ নিন"</b>" \nআপনার মিডিয়া ফাইলগুলি এই ডিভাইসের বিকল্প সঞ্চয়স্থানে সরান অথবা একটি USB তার ব্যবহার করে তাদের একটি কম্পিউটারে স্থানান্তর করুন৷ \n\n"<b>"অ্যাপ্লিকেশানগুলির ব্যাক আপ নিন"</b>" \nএই <xliff:g id="NAME_6">^1</xliff:g> এ সঞ্চিত সমস্ত অ্যাপ্লিকেশানগুলি আনইনস্টল করা হবে এবং তাদের ডেটা মুছে ফেলা হবে৷ এই অ্যাপ্লিকেশানগুলি রাথার জন্য তাদের এই ডিভাইসের বিকল্প সঞ্চয়স্থানে সরিয়ে দিন৷"</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"যখন আপনি এই <xliff:g id="NAME_0">^1</xliff:g> সরিয়ে দেবেন, তখন এতে সঞ্চিত অ্যাপ্লিকেশানগুলি কাজ করা বন্ধ করে দেবে, এবং এতে সঞ্চিত মিডিয়া ফাইলগুলি এটি পুনরায় না ঢোকানো পর্যন্ত উপলব্ধ হবে না৷"</b>" \n\nএই <xliff:g id="NAME_1">^1</xliff:g> শুধুমাত্র এই ডিভাইসে কাজ করার জন্য ফর্ম্যাট করা হয়েছে৷ অন্যান্য কোন জায়গায় এটি কাজ করবে না৷"</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"আপনার <xliff:g id="NAME">^1</xliff:g> সেট আপ করুন"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"পোর্টেবল সঞ্চয়স্থান হিসাবে ব্যবহার করুন"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"ডিভাইসগুলির মধ্যে ফটোগুলি ও অন্যান্য মিডিয়া সরানোর জন্য৷"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"অভ্যন্তরীণ সঞ্চয়স্থান হিসাবে ব্যবহার করুন"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"শুধুমাত্র এই ডিভাইসটিতে অ্যাপ্লিকেশান এবং ফটোগুলি সহ কোনো কিছু সঞ্চয় করার জন্য৷ সেইগুলি ফর্ম্যাট করা প্রয়োজন যা এটিকে অন্য ডিভাইসগুলির সাথে কাজ করতে বাধা দেয়৷"</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"অভ্যন্তরীণ সঞ্চয়স্থান হিসাবে ফর্ম্যাট করুন"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"<xliff:g id="NAME_0">^1</xliff:g> নিরাপদ করার জন্য এটি ফর্ম্যাট করা প্রযোজন হবে৷ \n\nফর্ম্যাট করার পরে এই <xliff:g id="NAME_1">^1</xliff:g> শুধুমাত্র এই ডিভাইসটির মধ্যে কাজ করবে৷ \n\n"<b>"ফর্ম্যাট করা হলে <xliff:g id="NAME_2">^1</xliff:g> এ বর্তমানে সঞ্চিত সমস্ত ডেটা মুছে যাবে৷"</b>" ডেটাটি যাতে হারিয়ে না যায় তার জন্য এটির ব্যাক আপ নেওয়ার কথা বিবেচনা করুন৷"</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"মুছুন এবং ফর্ম্যাট করুন"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> ফর্ম্যাট করা হচ্ছে…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"ফর্ম্যাট করার সময় <xliff:g id="NAME">^1</xliff:g> সরাবেন না৷"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ডেটা নতুন সঞ্চয়স্থানে সরান"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"আপনি এই নতুন <xliff:g id="NAME">^1</xliff:g> এ আপনার ফটোগুলি, ফাইলগুলি, এবং অ্যাপ্লিকেশান ডেটা সরাতে পারেন৷ \n\nএটি সরাতে <xliff:g id="TIME">^2</xliff:g> এর মতো সময় লাগবে এবং অভ্যন্তরীণ সঞ্চয়স্থানের <xliff:g id="SIZE">^3</xliff:g> বিনামূল্যের হবে৷ এটি চলাকালীন কিছু অ্যাপ্লিকেশান কাজ নাও করতে পারে৷"</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"এখন সরান"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"পরে সরান"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"এখন ডেটা সরান"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"এটি সরাতে প্রায় <xliff:g id="TIME">^1</xliff:g> সময় লাগবে৷ অভ্যন্তরীণ সঞ্চয়স্থানের <xliff:g id="SIZE">^2</xliff:g> বিনামূল্যের হবে৷"</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"সরান"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"ডেটা সরানো হচ্ছে..."</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"সরানোর সময়: \n• <xliff:g id="NAME">^1</xliff:g> সরাবেন না৷ \n• কিছু অ্যাপ্লিকেশান সঠিকভাবে কাজ নাও করতে পারে৷ \n• ডিভাইসটি চার্জ করতে থাকুন৷"</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> প্রস্তুত"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"আপনার <xliff:g id="NAME">^1</xliff:g> সম্পূর্ণভাবে ফটোগুলি এবং অন্য মিডিয়ার সাথে ব্যবহার করার জন্য সেট করা হয়েছে৷"</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"আপনার নতুন <xliff:g id="NAME">^1</xliff:g> কাজ করছে৷ \n\nফটো, ফাইল, এবং অ্যাপ্লিকেশান ডেটা এই ডিভাইসে সরাতে, সেটিংস এবং সঞ্চয়স্থানে যান৷"</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> সরান"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<xliff:g id="APP">^1</xliff:g> এবং এর ডেটা <xliff:g id="NAME_0">^2</xliff:g> এ সরাতে মাত্র কয়েক মিনিট সময় লাগবে৷ সরানো সম্পূর্ণ না হওয়া পর্যন্ত আপনি অ্যাপ্লিকেশানটি ব্যবহার করতে পারবেন না৷ \n\nসরানোর সময় <xliff:g id="NAME_1">^2</xliff:g> অপসারণ করবেন না৷"</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> সরানো হচ্ছে..."</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"সরানোর সময় <xliff:g id="NAME">^1</xliff:g>টি অপসারণ করবেন না৷ \n\nএই ডিভাইসের <xliff:g id="APP">^2</xliff:g> অ্যাপ্লিকেশানটি সরানো সম্পূর্ণ না হওয়া পর্যন্ত উপলব্ধ নাও হতে পারে৷"</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"সরানো বাতিল করুন"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"ব্যাটারি স্থিতি"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ব্যাটারি স্তর"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNগুলি"</string>
@@ -1005,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"ডিফল্টে পুনরায় সেট করুন"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ডিফল্ট APN সেটিংস পুনরায় সেট করা সম্পন্ন হয়েছে।"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"নেটওয়ার্ক সেটিংস পুনরায় সেট করা"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"এটি নেটওয়াকিং এর সাথে সম্পর্কিত সমস্ত সেটিংস কে ফ্যাক্টরী ডিফল্টে পুনরায় সেট করবে, এগুলি সমেত:\n\n"<li>"Wifi"</li>\n<li>"মোবাইল ডেটা"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"এটি \n\n"<li>"Wi‑Fi"</li>\n<li>"সেলুলার ডেটা"</li>\n<li>"Bluetooth"</li>" সহ সমস্ত নেটওয়ার্ক সেটিংস পুনরায় সেট করবে"</string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"সেটিংস পুনরায় সেট করুন"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"সমস্ত নেটওয়ার্ক সেটিংস পুনরায় সেট করবেন? আপনি পদক্ষেপটি আর বাতিল করতে পারবেন না!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"সমস্ত নেটওয়ার্ক সেটিংস পুনরায় সেট করবেন? আপনি এই প্রক্রিয়াটি পূর্বাবস্থায় ফেরাতে পারবেন না!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"সেটিংস পুনরায় সেট করুন"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"একটি নেটওয়ার্ক সেটিংস পুনরায় সেট করা নিশ্চিত করতে আপনাকে আপনার আনলক প্যাটার্ন অঙ্কন করতে হবে৷"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"পুনরায় সেট করবেন?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"নেটওয়ার্ক সেটিংস পুনরায় সেট করা"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"নেটওয়ার্ক সেটিংস পুনরায় সেট করা হয়েছে"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"ডিভাইসটি পুনরায় সেট করুন"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"ফ্যাক্টরি ডেটা পুনরায় সেট করুন"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"এটি আপনার ট্যাবলেটের "<b>"অভ্যন্তরীণ সঞ্চয়স্থান"</b>", থেকে সমস্ত ডেটা মুছে দেবে, এগুলি সহ:\n\n"<li>"আপনার Google অ্যাকাউন্ট"</li>\n<li>"সিস্টেম এবং অ্যাপ্লিকেশান ডেটা এবং সেটিংস"</li>\n<li>"ডাউনলোড করা অ্যাপ্লিকেশানগুলি"</li></string>
@@ -1027,9 +1065,8 @@
     <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="1062841478823409667">"আপনার সমস্ত ব্যক্তিগত তথ্য এবং ডাউনলোড করা অ্যাপ্লিকেশানগুলি মুছে দিতে চান? আপনি এই প্রক্রিয়াটি পূর্বাবস্থায় ফেরাতে পারবেন না!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"সবকিছু মুছে দিন"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"এই ব্যবহারকারীর জন্য ফ্যাক্টরি রিসেট উপলব্ধ নেই"</string>
@@ -1046,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"ভয়েসমেল, কল ফরওয়ার্ডিং, কল ওয়েটিং, কলার আইডি সেট আপ করুন"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB টেদারিং"</string>
@@ -1079,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"সহায়তা"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"সেলুলার নেটওয়ার্কগুলি"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"মোবাইল প্ল্যান"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"ডিফল্ট SMS অ্যাপ্লিকেশান"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS অ্যাপ্লিকেশান"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS অ্যাপ্লিকেশান পরিবর্তন করবেন?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"<xliff:g id="CURRENT_APP">%2$s</xliff:g> এর পরিবর্তে <xliff:g id="NEW_APP">%1$s</xliff:g> কে SMS অ্যাপ্লিকেশান হিসেবে ব্যবহার করবেন?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g> কে আপনার SMS অ্যাপ্লিকেশান হিসেবে ব্যবহার করবেন?"</string>
@@ -1110,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"অবস্থান নির্ণয় করতে GPS ব্যবহার করুন"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"স্ক্যান করা হচ্ছে"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"স্ক্যান করা হচ্ছে"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi স্ক্যানিং"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"অ্যাপ্লিকেশান এবং পরিষেবাগুলিকে এমনকি Wi‑Fi বন্ধ থাকার অবস্থায়ও, নেটওয়ার্ক স্ক্যান করার অনুমতি দেওয়ার মাধ্যমে অবস্থান উন্নত করুন"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth স্ক্যানিং"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"সিস্টেমের পরিষেবাগুলিকে Bluetooth বন্ধ থাকার সময়েও Bluetooth ডিভাইসগুলিকে স্ক্যান করার অনুমতি দেওয়ার মাধ্যমে অবস্থান উন্নত করুন"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi ও সেলুলার নেটওয়ার্ক অবস্থান"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"দ্রুত আপনার অবস্থান নির্ধারণ করতে অ্যাপ্লিকেশানগুলিকে Google অবস্থান পরিষেবা ব্যবহার করতে দিন। বেনামী অবস্থান ডেটা সংগ্রহ করা হবে এবং Google এ পাঠানো হবে।"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi দ্বারা অবস্থান নির্ণয় করা হয়েছে"</string>
@@ -1155,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"পাসওয়ার্ড সেট করা হয়েছে"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN সেট করা হয়েছে"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"প্যাটার্ন সেট করা হয়েছে"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"অবিরত করতে আপনার ডিভাইসের প্যাটার্ন ব্যবহার করুন৷"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"অবিরত করতে আপনার ডিভাইসের PIN লিখুন৷"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"অবিরত করতে আপনার ডিভাইসের পাসওয়ার্ড লিখুন৷"</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"ভুল PIN"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"ভুল পাসওয়ার্ড"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"ভুল প্যাটার্ন"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"ডিভাইস নিরাপত্তা"</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_wrong" msgid="4694973540770105678">"আবার চেষ্টা করুন:"</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>
@@ -1181,8 +1224,7 @@
     <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" msgid="6909161623701848863">"অনেকবার ভুল প্রচেষ্টা করা হয়েছে৷ <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>
@@ -1233,7 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"আকার অনুসারে সাজান"</string>
     <string name="show_running_services" msgid="5736278767975544570">"চলমান পরিষেবাগুলি দেখান"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"ক্যাশে করা প্রক্রিয়াগুলি দেখান"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"ডিফল্ট জরুরি অ্যাপ্লিকেশান"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"জরুরি অ্যাপ্লিকেশান"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"অ্যাপ্লিকেশানগুলির পছন্দ পুনরায় সেট করুন"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"অ্যাপ্লিকেশানগুলির পছন্দ পুনরায় সেট করবেন?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"এটি এইগুলির জন্য সমস্ত পছন্দ পরিবর্তন করবে:\n\n "<li>"অক্ষম করা অ্যাপ্লিকেশানগুলি"</li>\n" "<li>"অক্ষম করা অ্যাপ্লিকেশন বিজ্ঞপ্তিগুলি"</li>\n" "<li>"কার্যের জন্য ডিফল্ট অ্যাপ্লিকেশানগুলি"</li>\n" "<li>"অ্যাপ্লিকেশানগুলির জন্য পশ্চাদপট ডেটা সীমাবদ্ধগুলি"</li>\n" "<li>"যে কোনো অনুমতি সীমাবদ্ধগুলি"</li>\n\n" আপনি কোনো অ্যাপ্লিকেশন ডেটা হারাবেন না।"</string>
@@ -1437,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"একটি ফাইলে সব bluetooth HCI প্যাকেট ক্যাপচার করুন"</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="select_logd_size_title" msgid="7433137108348553508">"লগার বাফারের আকারগুলি"</string>
@@ -1739,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"২৪ ঘন্টা"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"১ দিন"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"সিস্টেম দেখান"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"সিস্টেম লুকান"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss ব্যবহার করুন"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"পরিসংখ্যানের  প্রকার"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"পশ্চাদপট"</string>
@@ -1835,7 +1876,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_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>
@@ -2210,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"ব্যবহারকারী"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"সীমাবদ্ধ প্রোফাইল"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"নতুন ব্যবহারকারী জুড়বেন?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"আপনি একাধিক ব্যবহারকারী তৈরি করে অন্যদের সাথে এই ডিভাইস শেয়ার করতে পারেন। প্রতিটি ব্যবহারকারী তাদের নিজস্ব স্থান রয়েছে যা তারা অ্যাপ্লিকেশান, ওয়ালপেপার, এবং আরো অনেক কিছু দিয়ে কাস্টমাইজ করতে পারেন। ব্যবহারকারীরা Wi‑Fi এর মত ট্যাবলেট সেটিংস সামঞ্জস্য করতে পারবেন যার প্রভাব পড়বে সকলের উপর।\n\nনতুন ব্যবহারকারী তৈরি হওয়ার পরে,সেট আপ প্রক্রিয়া সম্পূর্ণ করতে হবে।\n\nঅন্যান্য ব্যবহারকারীদের হয়ে যে কোনো ব্যবহারকারী আপডেট করা অ্যাপ্লিকেশান অনুমতিগুলি গ্রহণ করতে পারবেন।"</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"আপনি একাধিক ব্যবহারকারী তৈরি করে অন্যদের সাথে এই ডিভাইস ভাগ করতে পারেন। প্রতিটি ব্যবহারকারীদের কাছে তাদের নিজস্ব স্থান রয়েছে যা তারা অ্যাপ্লিকেশান, ওয়ালপেপার, এবং আরো অনেক কিছু দিয়ে কাস্টমাইজ করতে পারেন। ব্যবহারকারীরা Wi‑Fi এর মত ডিভাইস সেটিংস সামঞ্জস্য করতে পারবেন যার প্রভাব পড়বে সকলের উপর।\n\nনতুন ব্যবহারকারী তৈরি হওয়ার পরে, সেই ব্যক্তিকে তাদের স্থান সেট আপ করতে হবে।\n\nঅন্যান্য ব্যবহারকারীদের হয়ে যে কোনো ব্যবহারকারী অ্যাপ্লিকেশানগুলি আপডেট করতে পারবেন।"</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"আপনি একজন নতুন ব্যবহারকারী জুড়লে তাকে তার জায়গা সেট আপ করে নিতে হবে।\n\nযেকোনো ব্যবহারকারী অন্য সব ব্যবহারকারীর জন্য অ্যাপ্লিকেশান আপডেট করতে পারবেন।"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"এখন ব্যবহারকারী সেট আপ করবেন?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"নিশ্চিত করুন যে ব্যক্তিটি ডিভাইসটি নেওয়ার জন্য এবং তার স্থান সেট আপ করার জন্য উপলব্ধ আছেন"</string>
@@ -2393,6 +2433,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"জরুরি আইস অ্যাপ্লিকেশন ডিফল্ট"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"অ্যাপ্লিকেশানগুলি ডাউনলোড করার অ্যাপ্লিকেশান সিস্টেম"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"অ্যাপ্লিকেশান অনুমতিগুলির নিরাপত্তা"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"অ্যাপ্লিকেশান ডিফল্ট"</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>
@@ -2407,14 +2448,12 @@
     <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="6948120138640252732">"বাঁধাদানগুলিকে অবরুদ্ধ করুন"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"শুধুমাত্র অগ্রাধিকারকে অনুমতি দেয়"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"স্বয়ংক্রিয় নিয়মগুলি"</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_alarms" msgid="7380265858042606857">"শুধুমাত্র অ্যালার্মগুলিকে অনুমতি দিন"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"বাধা দেবেন না"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"শুধুমাত্র অগ্রাধিকার"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"শুধুমাত্র অ্যালার্মগুলি"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"কোনো বাধা নেই"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ফোন রিংটোন"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"বিজ্ঞপ্তির ডিফল্ট রিংটোন"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"এছাড়াও কল এলে স্পন্দিত করুন"</string>
@@ -2447,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"কোন বিজ্ঞপ্তি শ্রোতা ইনস্টল করা নেই।"</string>
     <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">"কোনো অ্যাপ্লিকেশান শর্ত প্রদান করছে না"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="one">%dটি অ্যাপ্লিকেশান শর্তগুলি প্রদান করে</item>
-      <item quantity="other">%dটি অ্যাপ্লিকেশান শর্তগুলি প্রদান করে</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="loading_notification_apps" msgid="5031818677010335895">"অ্যাপ্লিকেশানগুলি লোড করা হচ্ছে..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"সমস্ত অবরুদ্ধ করুন"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"এই অ্যাপ্লিকেশান থেকে কখনোই বিজ্ঞপ্তিগুলি দেখাবেন না"</string>
@@ -2469,17 +2499,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"নিয়মের নাম"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"নিয়ম যোগ করুন"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"নিয়ম মুছুন"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<xliff:g id="RULE">%1$s</xliff:g>\" নিয়ম মুছে ফেলবেন?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"মুছুন"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"নিয়মের প্রকার"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"অজানা"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"নিয়ম কনফিগার করুন"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"সময়সূচীর নিয়ম"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"নিয়ম খুঁজে পাওয়া যায়নি৷"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"দিন"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"কোনো কিছুই নয়"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"প্রতিদিন"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"কখনও নয়"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> থেকে <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"কল"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"বার্তাগুলি"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"এর থেকে কলগুলি/বার্তাগুলি"</string>
@@ -2489,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"অ্যালার্মগুলি"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"অনুস্মারকগুলি"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ইভেন্টগুলি"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"নির্বাচিত কলারগুলি"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"কলারগুলির পুনরাবৃত্তি করুন"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"যদি একই ব্যক্তি <xliff:g id="MINUTES">%d</xliff:g> মিনিটের মধ্যে দ্বিতীয়বার কলগুলি করেন, তবে এটি অনুমোদন করুন"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> পরের দিন"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"আপনি কখন বাধা দিতে চান?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"কতক্ষণ ধরে?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"অনির্দিষ্টভাবে"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> মিনিট</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> মিনিট</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ঘণ্টা‌</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ঘণ্টা‌</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"শুধুমাত্র অনির্দিষ্টকালের জন্য অগ্রাধিকার বিজ্ঞপ্তিগুলি পরিবর্তন করুন"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">শুধুমাত্র <xliff:g id="DURATION">%1$d</xliff:g> মিনিটের জন্য <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> পর্যন্ত অগ্রাধিকার বিজ্ঞপ্তিগুলি পরিবর্তন করুন</item>
+      <item quantity="other">শুধুমাত্র <xliff:g id="DURATION">%1$d</xliff:g> মিনিটের জন্য <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> পর্যন্ত অগ্রাধিকার বিজ্ঞপ্তিগুলি পরিবর্তন করুন</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">শুধুমাত্র <xliff:g id="DURATION">%1$d</xliff:g> ঘণ্টার জন্য (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> পর্যন্ত) পর্যন্ত অগ্রাধিকার বিজ্ঞপ্তিগুলি পরিবর্তন করুন</item>
+      <item quantity="other">শুধুমাত্র <xliff:g id="DURATION">%1$d</xliff:g> ঘণ্টার জন্য (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> পর্যন্ত) পর্যন্ত অগ্রাধিকার বিজ্ঞপ্তিগুলি পরিবর্তন করুন</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"শুধুমাত্র অনির্দিষ্টকালের জন্য অ্যালার্মগুলি পরিবর্তন করুন"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">শুধুমাত্র <xliff:g id="DURATION">%1$d</xliff:g> মিনিটের জন্য (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> পর্যন্ত) অ্যালার্মগুলি পরিবর্তন করুন</item>
+      <item quantity="other">শুধুমাত্র <xliff:g id="DURATION">%1$d</xliff:g> মিনিটের জন্য (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> পর্যন্ত) অ্যালার্মগুলি পরিবর্তন করুন</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="one">শুধুমাত্র <xliff:g id="DURATION">%1$d</xliff:g> ঘণ্টা‌র জন্য <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> পর্যন্ত অ্যালার্মগুলি পরিবর্তন করুন</item>
+      <item quantity="other">শুধুমাত্র <xliff:g id="DURATION">%1$d</xliff:g> ঘণ্টা‌র জন্য <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> পর্যন্ত অ্যালার্মগুলি পরিবর্তন করুন</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"অনির্দিষ্টকালের বাধা না দেওয়াতে পরিবর্তন করুন"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one"><xliff:g id="DURATION">%1$d</xliff:g> মিনিটের জন্য বাধা দেবেন না-তে পরিবর্তন করুন (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> পর্যন্ত)</item>
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> মিনিটের জন্য বাধা দেবেন না-তে পরিবর্তন করুন (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> পর্যন্ত)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> পর্যন্ত <xliff:g id="DURATION">%1$d</xliff:g>ঘণ্টার জন্য বাধা দেবেন না-তে পরিবর্তন করুন</item>
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> পর্যন্ত <xliff:g id="DURATION">%1$d</xliff:g>ঘণ্টার জন্য বাধা দেবেন না-তে পরিবর্তন করুন</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"সর্বদা বাধা দেওয়াতে পরিবর্তন করুন"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"সব সময়"</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>
@@ -2562,7 +2659,10 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>টি অনুমতি মঞ্জুর করা হয়েছে</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>টি অনুমতি মঞ্জুর করা হয়েছে</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_3">%d</xliff:g>টির মধ্যে <xliff:g id="COUNT_2">%d</xliff:g>টির অনুমতি মঞ্জুরিপ্রাপ্ত</item>
+      <item quantity="other"><xliff:g id="COUNT_3">%d</xliff:g>টির মধ্যে <xliff:g id="COUNT_2">%d</xliff:g>টির অনুমতি মঞ্জুরিপ্রাপ্ত</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"কিছু ডিফল্ট সেট করা রয়েছে"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"কোনো ডিফল্ট সেট করা নেই"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"সমস্ত অ্যাপ্লিকেশান"</string>
@@ -2573,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"অগ্রাধিকার"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"সংবেদনশীল"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ডোমেনের URLগুলি সহ"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"সমস্ত অ্যাপ্লিকেশান জুড়ে পছন্দগুলিকে ডিফল্ট অনুযায়ী পুনরায় সেট করুন"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g>টি অ্যাপ্লিকেশান ইনস্টল করা হয়েছে, সিস্টেমের এবং ডাউনলোড করা অ্যাপ্লিকেশানগুলি অন্তর্ভুক্ত রয়েছে"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"প্রশাসক দ্বারা অক্ষমিত"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"উন্নত"</string>
     <string name="unknown_app" msgid="5275921288718717656">"অজানা অ্যাপ্লিকেশান"</string>
     <string name="choose_profile" msgid="8229363046053568878">"প্রোফাইল বেছে নিন"</string>
@@ -2589,4 +2688,11 @@
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g>টি অ্যাপ্লিকেশান তার ডোমেনের URLগুলি খুলতে পারে</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g>টি অ্যাপ্লিকেশান তার ডোমেনের URLগুলি খুলতে পারে</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"স্বীকৃত নয়"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"ডিফল্ট অ্যাপ্লিকেশানগুলি"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"ব্রাউজার অ্যাপ্লিকেশান"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"কোনো ডিফল্ট ব্রাউজার নেই"</string>
+    <string name="default_app" msgid="6864503001385843060">"(ডিফল্ট)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 04a66c1..05b6569 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Botó per prémer"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"Multimèdia"</item>
     <item msgid="7924928667052300589">"Dispositiu"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"ubicació aproximada"</item>
+    <item msgid="5789673140227507995">"ubicació precisa"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibració"</item>
+    <item msgid="3434165993711230924">"lectura de contactes"</item>
+    <item msgid="616161687718081936">"modifica els contactes"</item>
+    <item msgid="7638002295329050091">"llegeix el registre de trucades"</item>
+    <item msgid="6546959730920410907">"modifica el registre de trucades"</item>
+    <item msgid="446877710771379667">"lectura del calendari"</item>
+    <item msgid="7674458294386319722">"modifica el calendari"</item>
+    <item msgid="8281201165558093009">"exploració de Wi-Fi"</item>
+    <item msgid="8694611243479480497">"notificació"</item>
+    <item msgid="7776439107987345446">"exploració de cel·la"</item>
+    <item msgid="514615766544675057">"trucada de telèfon"</item>
+    <item msgid="8181415497109310680">"llegeix SMS"</item>
+    <item msgid="6816551144382117307">"escriu SMS"</item>
+    <item msgid="4600463921908905030">"rep SMS"</item>
+    <item msgid="5958926493289432745">"rep SMS d\'emergència"</item>
+    <item msgid="4945269495221089540">"rep MMS"</item>
+    <item msgid="5570472453573929087">"rep insercions WAP"</item>
+    <item msgid="7125408150230860501">"envia SMS"</item>
+    <item msgid="7080337936612188061">"llegeix SMS ICC"</item>
+    <item msgid="587124103118495063">"escriu SMS ICC"</item>
+    <item msgid="2320577158869025503">"modifica la configuració"</item>
+    <item msgid="1545733463471924009">"dibuixa a sobre"</item>
+    <item msgid="3609046903962454582">"accedeix a les notificacions"</item>
+    <item msgid="4671646036128214513">"càmera"</item>
+    <item msgid="1097324338692486211">"enregistra l\'àudio"</item>
+    <item msgid="5031552983987798163">"reprodueix l\'àudio"</item>
+    <item msgid="8374996688066472414">"llegeix el porta-retalls"</item>
+    <item msgid="3045529469061083747">"modifica el porta-retalls"</item>
+    <item msgid="5124443975763747838">"botons multimèdia"</item>
+    <item msgid="4547883971364273343">"enfocament de l\'àudio"</item>
+    <item msgid="2603878814882344450">"volum general"</item>
+    <item msgid="7136963238377062018">"volum de la veu"</item>
+    <item msgid="4270236897655923007">"volum del to"</item>
+    <item msgid="6325739889222559394">"volum multimèdia"</item>
+    <item msgid="5762123934816216821">"volum de l\'alarma"</item>
+    <item msgid="785049718065337473">"volum de notificació"</item>
+    <item msgid="6700305533746877052">"volum del Bluetooth"</item>
+    <item msgid="2029227495214047094">"actiu"</item>
+    <item msgid="26109888160231211">"supervisa la ubicació"</item>
+    <item msgid="5753382310468855812">"fes un seguiment de la precisió de la ubicació"</item>
+    <item msgid="3356591542543137332">"obtenir estadístiques d\'ús"</item>
+    <item msgid="3073734345226842233">"silenciar el micròfon o activar-ne el so"</item>
+    <item msgid="1148142988678569310">"projectar fitxers multimèdia"</item>
+    <item msgid="9130014005474445273">"activa la VPN"</item>
+    <item msgid="1165192162975045562">"fons de pantalla d\'escriptura"</item>
+    <item msgid="7129487923652967258">"estructura d\'assistència"</item>
+    <item msgid="1069023208100114540">"captura de pantalla d\'assistència"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Ubicació"</item>
+    <item msgid="8677040780775113033">"Ubicació"</item>
+    <item msgid="1660743989948992916">"Ubicació"</item>
+    <item msgid="8791172739860195290">"Vibració"</item>
+    <item msgid="383413555642128046">"Lectura de contactes"</item>
+    <item msgid="3654594895269697313">"Modifica els contactes"</item>
+    <item msgid="7928393476362362538">"Llegeix el registre de trucades"</item>
+    <item msgid="6248591205254641116">"Modifica el registre de trucades"</item>
+    <item msgid="6093344633066170692">"Lectura del calendari"</item>
+    <item msgid="1334886368750347692">"Modifica el calendari"</item>
+    <item msgid="1638204101698708656">"Ubicació"</item>
+    <item msgid="2154671955760380322">"Notificació de la publicació"</item>
+    <item msgid="4282477730595931828">"Ubicació"</item>
+    <item msgid="4891423912898525905">"Trucada de telèfon"</item>
+    <item msgid="2623604824935968113">"Llegeix l\'SMS/MMS"</item>
+    <item msgid="4420177125221176306">"Escriu un SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Rep SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Rep SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Rep SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Rep SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Envia SMS/MMS"</item>
+    <item msgid="3527273606643794973">"Llegeix l\'SMS/MMS"</item>
+    <item msgid="4370895547001583812">"Escriu un SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Modifica la configuració"</item>
+    <item msgid="736541391767350377">"Dibuixa a sobre"</item>
+    <item msgid="5530815681721654194">"Accedeix a les notificacions"</item>
+    <item msgid="781213371706962767">"Càmera"</item>
+    <item msgid="1720492593061838172">"Enregistra l\'àudio"</item>
+    <item msgid="3493046322001257041">"Reprodueix l\'àudio"</item>
+    <item msgid="136815868796597058">"Llegeix el porta-retalls"</item>
+    <item msgid="5238692940326972503">"Modifica el porta-retalls"</item>
+    <item msgid="5753789168376302997">"Botons de multimèdia"</item>
+    <item msgid="3265262911688671938">"Enfocament de l\'àudio"</item>
+    <item msgid="2098976479485046797">"Volum general"</item>
+    <item msgid="5660213838861789350">"Volum de la veu"</item>
+    <item msgid="7983336752371254444">"Volum del to"</item>
+    <item msgid="7878027809189330917">"Volum de multimèdia"</item>
+    <item msgid="7260546305036218513">"Volum de l\'alarma"</item>
+    <item msgid="9103719301075748925">"Volum de notificació"</item>
+    <item msgid="7025966722295861512">"Volum de Bluetooth"</item>
+    <item msgid="4665183401128289653">"Actiu"</item>
+    <item msgid="8584357129746649222">"Ubicació"</item>
+    <item msgid="7669257279311110599">"Ubicació"</item>
+    <item msgid="3459320345690097795">"Obtenir estadístiques d\'ús"</item>
+    <item msgid="1312534577834048535">"Silenciar el micròfon o activar-ne el so"</item>
+    <item msgid="5906017727368097853">"Projectar fitxers multimèdia"</item>
+    <item msgid="2486614710846178542">"Activa la VPN"</item>
+    <item msgid="5586547561693629602">"Fons de pantalla d\'escriptura"</item>
+    <item msgid="32794179825485062">"Estructura d\'assistència"</item>
+    <item msgid="7872852746938272552">"Captura de pantalla d\'assistència"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curt"</item>
     <item msgid="2560532955514699713">"Mitjà"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"baixa"</item>
     <item msgid="4212263919458209842">"molt baixa"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Desactivat"</item>
-    <item msgid="5656544177755411222">"Interrupcions limitades"</item>
-    <item msgid="8735337502532332056">"Cap interrupció"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Moderada"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index c28d281..9e80996 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Targeta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Configuració del servidor intermediari"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancel·la"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"CANCEL·LA"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUA"</string>
     <string name="okay" msgid="1997666393121016642">"D\'acord"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"SÍ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NO"</string>
-    <string name="forget" msgid="7267115980248732932">"ESBORRA"</string>
+    <string name="forget" msgid="1400428660472591263">"Esborra"</string>
+    <string name="save" msgid="879993180139353333">"Desa"</string>
+    <string name="done" msgid="6942539184162713160">"Fet"</string>
     <string name="settings_label" msgid="1626402585530130914">"Configuració"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Configuració"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Drecera de configuració"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Endolla el carregador i torna-ho a provar."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"No hi ha cap PIN ni cap contrasenya de bloqueig de la pantalla"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Has de definir un PIN o una contrasenya de bloqueig de la pàgina per començar l\'encriptació."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Has de dibuixar el patró de desbloqueig per confirmar l\'encriptació del dispositiu."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Vols encriptar?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"L\'operació d\'encriptació és irreversible i, si l\'interromps, perdràs dades. L\'encriptació necessita una hora com a mínim, durant la qual la tauleta es reiniciarà diverses vegades."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"L\'operació d\'encriptació és irreversible i, si l\'interromps, perdràs dades. L\'encriptació necessita una hora com a mínim, durant la qual el telèfon es reiniciarà diverses vegades."</string>
@@ -419,8 +416,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Patró"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Contrasenya"</string>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Quan hagis configurat un bloqueig de pantalla, també pots configurar la teva empremta digital a Configuració &gt; Seguretat."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desactiva el bloqueig de pantalla"</string>
     <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>
@@ -522,8 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avançades"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth avançat"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Amb el Bluetooth activat, el dispositiu pot connectar amb més dispositius Bluetooth a prop."</string>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Per millorar la precisió de la ubicació, les aplicacions i els serveis cercaran dispositius Bluetooth fins i tot quan el Bluetooth estigui desactivat. Pots canviar aquest paràmetre a la <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configuració de cerca<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Connecta\'t a..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> es desconnectarà de l\'àudio del mitjà."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> es desconnectarà de l\'àudio de mans lliures."</string>
@@ -589,8 +584,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Per millorar la precisió de la ubicació, les aplicacions i els serveis cercaran xarxes Wi-Fi fins i tot quan la Wi-Fi estigui desactivada. Pots canviar aquest paràmetre a la <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configuració de cerca<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"No m\'ho tornis a mostrar"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Utilitza la Wi-Fi en repòs"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi activa en repòs"</string>
@@ -607,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Cerca"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avançat"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Mostra aplicacions"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Mostra senyal Wi-Fi"</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>
@@ -666,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Vols iniciar la sessió per connectar-te?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> necessita que iniciïs la sessió al web per connectar-te a la xarxa."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONNECTA"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Aquesta xarxa no té accés a Internet. Vols utilitzar-la de totes maneres?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"No ho tornis a preguntar en aquesta xarxa"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connecta"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"No s\'ha pogut connectar a la xarxa"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esborra"</string>
@@ -732,21 +726,17 @@
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Zona Wi-Fi <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> portàtil"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Trucades per Wi-Fi"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Preferències de trucada"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Mode de trucades per Wi-Fi"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Preferència per la Wi-Fi"</item>
     <item msgid="5267397515594230396">"Preferència per les dades mòbils"</item>
-    <item msgid="3132912693346866895">"Només Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Quan les trucades per Wi-Fi estan activades, el telèfon pot dirigir trucades per les xarxes Wi-Fi o per la xarxa de l\'operador de telefonia mòbil segons la teva preferència i la intensitat del senyal. Abans d\'activar aquesta funció, comprova amb l\'operador si hi ha cap càrrec i altres detalls."</string>
     <string name="home_settings" msgid="212375129455718176">"Pàgina d\'inici"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"So"</string>
@@ -918,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Disponible (només de lectura)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espai total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"S\'està calculant..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplicacions (dades aplicacions i contingut multimèdia)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Aplicacions i dades de les aplicacions"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Multimèdia"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Baixades"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Imatges, vídeos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Àudio (música, tons, podcasts, etc.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Diversos"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Altres fitxers"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Dades emmagatzemades a la memòria cau"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desactiva emmagatzematge"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desactiva la targeta SD"</string>
@@ -956,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desactivació en procés"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"S\'està acabant l\'espai d\'emmag."</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"És possible que algunes funcions del sistema, com ara la sincronització, no funcionin bé. Prova d\'alliberar espai: suprimeix o desfixa elements, com ara aplicacions o contingut multimèdia."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Canvia el nom"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Activa"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Expulsa"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Esborra i formata"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Esborra i formata (emmagatz. intern)"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Connexió USB a l\'ordinador"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Connexió USB a l\'ordinador"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Connexió com a"</string>
@@ -966,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Permet que les aplicacions compatibles amb MIDI utilitzin programari de MIDI al teu ordinador per USB."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Altres usuaris"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Emmagatzematge del dispositiu"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Emmagatzematge extraïble"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"Lliure: <xliff:g id="FREE">%1$s</xliff:g> (total: <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"S\'ha activat <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"No s\'ha pogut activar <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"S\'ha expulsat <xliff:g id="NAME">%1$s</xliff:g> de manera segura"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"No s\'ha pogut expulsar <xliff:g id="NAME">%1$s</xliff:g> de manera segura"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"S\'ha formatat <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"No s\'ha pogut formatar <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Canvia nom emmagatzematge"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Un cop l\'hagis formatat, podràs fer servir <xliff:g id="NAME_0">^1</xliff:g> en altres dispositius. \n\nTotes les dades que hi hagi a <xliff:g id="NAME_1">^1</xliff:g> s\'esborraran. Et recomanem que en facis una còpia de seguretat primer.\n\n"<b>"Fer una còpia de seguretat de les fotos i d\'altres fitxers multimèdia"</b>\n"Desplaça els fitxers multimèdia a un emmagatzematge alternatiu del dispositiu o transfereix-los a un ordinador mitjançant un cable USB. \n\n"<b>"Fer una còpia de seguretat de les aplicacions"</b>" \nTotes les aplicacions que hi hagi a <xliff:g id="NAME_6">^1</xliff:g> es desinstal·laran i se n\'esborraran les dades. Per conservar aquestes aplicacions, desplaça-les a un emmagatzematge alternatiu del dispositiu."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Si expulses <xliff:g id="NAME_0">^1</xliff:g>, les aplicacions que hi hagi instal·lades deixaran de funcionar i els fitxers multimèdia que contingui deixaran d\'estar disponibles fins que no es torni a inserir."</b>" \n\n<xliff:g id="NAME_1">^1</xliff:g> es formata per funcionar només en aquest dispositiu. No funcionarà en altres dispositius."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurar <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utilitza com a emmagatzematge portàtil"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Per desplaçar fotos i altres fitxers multimèdia entre dispositius."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Utilitza com a emmagatzematge intern"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Per emmagatzemar dades només en aquest dispositiu, com ara aplicacions i fotos. Cal formatar-lo perquè no es pugui fer servir en altres dispositius."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatar com emmagatzem. intern"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"S\'ha de formatar <xliff:g id="NAME_0">^1</xliff:g> perquè funcioni de manera segura. \n\nUn cop s\'hagi formatat, <xliff:g id="NAME_1">^1</xliff:g> només funcionarà en aquest dispositiu. \n\n"<b>"En formatar <xliff:g id="NAME_2">^1</xliff:g>, se n\'esborraran totes dels dades."</b>" Per no perdre les dades, et recomanem que en facis una còpia de seguretat."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Esborra i formata"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"S\'està formatant <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"No extreguis <xliff:g id="NAME">^1</xliff:g> mentre s\'està formatant."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Desplaçar dades al nou emmagatz."</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Pots desplaçar fotos, fitxers i dades d\'aplicacions a <xliff:g id="NAME">^1</xliff:g>. \n\nEl desplaçament tardarà <xliff:g id="TIME">^2</xliff:g> aproximadament i alliberarà <xliff:g id="SIZE">^3</xliff:g> de l\'emmagatzematge intern. És possible que algunes aplicacions no funcionin durant el procés."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Desplaça ara"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Desplaça més tard"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Desplaçar les dades ara"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"El desplaçament tardarà <xliff:g id="TIME">^1</xliff:g> aproximadament i alliberarà <xliff:g id="SIZE">^2</xliff:g> de l\'emmagatzematge intern."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Desplaça"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"S\'estan desplaçant les dades…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Durant el desplaçament: \n• No extreguis <xliff:g id="NAME">^1</xliff:g>. \n• Algunes aplicacions no funcionaran correctament. \n• Mantén el dispositiu carregat."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> ja es pot utilitzar"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"S\'ha configurat <xliff:g id="NAME">^1</xliff:g> per poder treballar-hi amb fotos i altres fitxers multimèdia."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> ja funciona. \n\nSi vols desplaçar fotos, fitxers o dades d\'aplicacions a aquest dispositiu, ves a Configuració &gt; Emmagatzematge."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Desplaçar <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Només caldran uns quants minuts per desplaçar <xliff:g id="APP">^1</xliff:g> i les dades relacionades a <xliff:g id="NAME_0">^2</xliff:g>. No podràs fer servir l\'aplicació fins que el desplaçament no hagi finalitzat. \n\nNo extreguis <xliff:g id="NAME_1">^2</xliff:g> durant el desplaçament."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"S\'està desplaçant <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"No extreguis <xliff:g id="NAME">^1</xliff:g> durant el desplaçament. \n\nL\'aplicació <xliff:g id="APP">^2</xliff:g> no estarà disponible en aquest dispositiu fins que el desplaçament no hagi finalitzat."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancel·la el desplaçament"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Estat de la bateria"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivell de la bateria"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1010,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Restableix al valor predeterminat"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"S\'ha restablert la configuració predeterminada d\'APN."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"S\'ha restablert la configuració de la xarxa"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Es restabliran els valors de fàbrica de tota la configuració relacionada amb les xarxes, com ara el següent:\n\n"<li>"Wi-Fi"</li>\n<li>"Dades mòbils"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Es restablirà tota la configuració de la xarxa, com ara:\n\n"<li>"Wi‑Fi"</li>\n<li>"Dades mòbils"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Restableix la configuració"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Vols restablir tota la configuració de la xarxa? No podràs desfer aquesta acció."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Vols restablir tota la configuració de la xarxa? Aquesta acció no es pot desfer."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Restableix la configuració"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Has de dibuixar el teu patró de desbloqueig per confirmar el restabliment de la configuració de la xarxa."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Vols restablir-la?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"S\'ha restablert la configuració de la xarxa"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"S\'ha restablert la configuració de la xarxa"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Restableix el dispositiu"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Restableix dades de fàbrica"</string>
     <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>
@@ -1032,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Esborra totes les dades de la targeta SD, com ara música o fotos"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restableix la tauleta"</string>
     <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_desc" msgid="1062841478823409667">"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_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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"El restabliment de fàbrica no està disponible per a aquest usuari."</string>
@@ -1051,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configura la bústia, la desviació de trucades, les trucades en espera i l\'identificador"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Ancoratge d\'USB"</string>
@@ -1084,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajuda"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Xarxes mòbils"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Pla mòbil"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Aplicació per a SMS predeterminada"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplicació de SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vols canviar l\'aplicació per a SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Vols fer servir <xliff:g id="NEW_APP">%1$s</xliff:g> en lloc de <xliff:g id="CURRENT_APP">%2$s</xliff:g> com a aplicació per als SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Vols fer servir <xliff:g id="NEW_APP">%s</xliff:g> com a aplicació per als SMS?"</string>
@@ -1115,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utilitza el GPS per determinar la ubicació"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Anàlisi"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Anàlisi"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Cerca de Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Per millorar la ubicació, permet als serveis del sistema cercar xarxes Wi-Fi fins i tot quan la Wi-Fi estigui desactivada"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Cerca de Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Per millorar la ubicació, permet als serveis del sistema cercar dispositius Bluetooth fins i tot quan el Bluetooth estigui desactivat"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Ubicació xarxa Wi‑Fi i mòbil"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permet que les aplicacions utilitzin el servei d\'ubicació de Google per calcular la teva ubicació més ràpidament. Es recopilaran dades d\'ubicació anònimes i s\'enviaran a Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Ubicació determinada per Wi-Fi"</string>
@@ -1160,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"La contrasenya s\'ha definit"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"S\'ha definit el PIN"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"El patró s\'ha definit"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Introdueix el patró del dispositiu per continuar."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Introdueix el PIN del dispositiu per continuar."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Introdueix la contrasenya del dispositiu per continuar."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN incorrecte"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Contrasenya incorrecta"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Patró incorrecte"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Seguretat del dispositiu"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Canvia el patró de desbloqueig"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Canvia el PIN de desbloqueig"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirma el patró desat"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Torna-ho a provar:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Crea un patró de desbloqueig"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Premeu Menú per obtenir ajuda."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Deixa anar el dit en acabar"</string>
@@ -1186,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Defineix el patró de desbloqueig"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Canvia el patró de desbloqueig"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Com dibuixar un patró de desbloqueig"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Massa intents incorrectes"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Torneu-ho a provar d\'aquí a <xliff:g id="NUMBER">%d</xliff:g> segons."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Massa intents incorrectes. Torna-ho a provar d\'aquí a <xliff:g id="NUMBER">%d</xliff:g> segons."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"L\'aplicació no està instal·lada al telèfon."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gestiona les aplicacions"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestiona i elimina les aplicacions instal·lades"</string>
@@ -1238,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Ordena per mida"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Mostra els serveis que s\'estan executant"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Mostra processos cau"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Aplicació en casos d\'emergència"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Restableix preferències"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Vols rest. pref. aplic.?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Amb aquesta acció, es restabliran les preferències dels elements següents:\n\n "<li>"Aplicacions desactivades"</li>\n" "<li>"Notificacions d\'aplicacions desactivades"</li>\n" "<li>"Aplicacions predeterminades per a les accions"</li>\n" "<li>"Restriccions de dades en segon pla per a les aplicacions"</li>\n" "<li>"Restriccions de permisos"</li>\n\n" No perdràs les dades de les aplicacions."</string>
@@ -1443,8 +1479,6 @@
     <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="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="select_logd_size_title" msgid="7433137108348553508">"Mides de la memòria cau del registrador"</string>
@@ -1745,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 hores"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dia"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Mostra el sistema"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Amaga els processos del sistema"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Fes servir Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipus d\'estadístiques"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Fons"</string>
@@ -1841,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Contrasenya actual:"</string>
@@ -2216,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Usuari"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil restringit"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Vols afegir un usuari nou?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Pots crear usuaris addicionals i compartir aquest dispositiu amb altres persones. Cada usuari té el seu espai i el pot personalitzar amb aplicacions, fons de pantalla i moltes més coses. Els usuaris també poden ajustar la configuració del dispositiu que afecta tothom, com ara la de la xarxa Wi‑Fi.\n\nQuan s\'afegeix un usuari nou, aquest usuari ha de configurar el seu espai.\n\nQualsevol usuari pot actualitzar les aplicacions dels altres usuaris. ."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Pots compartir aquest dispositiu amb altres usuaris creant usuaris addicionals. Cada usuari té el seu propi espai, que pot personalitzar amb aplicacions i fons de pantalla, entre d\'altres. Els usuaris també poden ajustar opcions de configuració del dispositiu, com ara la Wi-Fi, que afecten els altres usuaris.\n\nQuan afegeixis un usuari nou, haurà de configurar el seu espai.\n\nTots els usuaris poden actualitzar les aplicacions de la resta."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Quan s\'afegeix un usuari nou, aquest usuari ha de configurar el seu espai.\n\nQualsevol usuari pot actualitzar les aplicacions dels altres usuaris."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Vols configurar l\'usuari ara?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Comprova que l\'usuari tingui accés al dispositiu i que pugui configurar el seu espai."</string>
@@ -2396,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"restricció restringir restringit"</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_reset_apps" msgid="6420313678620788457">"restablir preferències predeterminades"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"emergència ice aplicació predeterminada"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"aplicacions baixada aplicacions sistema"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"seguretat per als permisos d\'aplicacions"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"aplicacions predeterminades"</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>
@@ -2414,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volum de l\'alarma"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volum del to"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volum de notificació"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Bloqueja les interrupcions"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Només interrupcions priorit."</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Regles automàtiques"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"En rebre trucades i 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_alarms" msgid="7380265858042606857">"Permet només les alarmes"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"No interrompis"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Només amb prioritat"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Només alarmes"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Cap interrupció"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"To de trucada"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"So de notificació predeterminat"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibra també per a les trucades"</string>
@@ -2454,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"No hi ha cap detector de notificacions instal·lat."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Vols activar <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> podrà llegir totes les notificacions que publiqui el sistema o qualsevol aplicació instal·lada, que poden contenir informació personal com ara noms de contactes i el text dels missatges que rebeu. També podrà ometre-les o tocar els botons d\'acció que continguin."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Proveïdors de condicions"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"No hi ha cap aplicació que proporcioni condicions."</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d aplicacions proporcionen condicions</item>
-      <item quantity="one">%d aplicació proporciona condicions</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"No hi ha cap proveïdor de condicions instal·lat."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Vols activar <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> podrà afegir condicions de sortida al mode No molesteu."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"S\'estan carregant les aplicacions..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloqueja-ho tot"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"No mostris mai les notificacions d\'aquesta aplicació"</string>
@@ -2476,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritat"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Delicat"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Nom de la regla"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Afegeix una regla"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Suprimeix la regla"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Vols suprimir la regla \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Suprimeix"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Tipus de regla"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Desconegut"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configura una regla"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Planifica una regla"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"No s\'ha trobat la regla."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dies"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Cap"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Cada dia"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Mai"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> a <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2496,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Recordatoris"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Esdeveniments"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Autors de la trucada seleccionats"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Repeteix els autors de la trucada"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Si la mateixa persona truca una segona vegada dins d\'un període de <xliff:g id="MINUTES">%d</xliff:g> minuts, es permet"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activa automàticam."</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Mai"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Cada nit"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"A les <xliff:g id="FORMATTED_TIME">%s</xliff:g> del dia següent"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Quan vols que t\'interrompin?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Durant quanta estona?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Indefinidament"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minuts</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minut</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> hores</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hora</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Canvia al mode Només notificacions prioritàries indefinidament"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Canvia al mode Només notificacions prioritàries durant <xliff:g id="DURATION">%1$d</xliff:g> minuts fins a les <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Canvia al mode Només notificacions prioritàries durant un minut fins a les <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Canvia al mode Només notificacions prioritàries durant <xliff:g id="DURATION">%1$d</xliff:g> hores (fins a les <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Canvia al mode Només notificacions prioritàries durant una hora fins a les <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Canvia al mode Només alarmes indefinidament"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Canvia al mode Només alarmes durant <xliff:g id="DURATION">%1$d</xliff:g> minuts (fins a les <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Canvia al mode Només alarmes durant un minut fins a les <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Canvia al mode Només alarmes durant <xliff:g id="DURATION">%1$d</xliff:g> hores fins a les <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Canvia al mode Només alarmes durant una hora fins a les <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Canvia al mode No interrompis indefinidament"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Canvia al mode No interrompis durant <xliff:g id="DURATION">%1$d</xliff:g> minuts (fins a les <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Canvia al mode No interrompis durant un minut fins a les <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Canvia al mode No interrompis durant <xliff:g id="DURATION">%1$d</xliff:g> hores fins a les <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Canvia al mode No interrompis durant una hora fins a les <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Canvia al mode Interromp sempre"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"sempre"</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>
@@ -2569,7 +2659,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> permisos concedits</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> permís concedit</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> permisos de <xliff:g id="COUNT_3">%d</xliff:g> concedits</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> permís de <xliff:g id="COUNT_1">%d</xliff:g> concedit</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"S\'han definit valors predeterminats"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"No s\'ha definit cap valor predeterminat"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Totes les aplicacions"</string>
@@ -2580,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritàries"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Confidencials"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Amb URL del domini"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Restableix els valors predeterminats de les preferències en totes les aplicacions"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"S\'han instal·lat <xliff:g id="COUNT">%d</xliff:g> aplicacions, incloses les aplicacions del sistema i les baixades"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Desactivat per l\'administrador"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avançada"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicació desconeguda"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Triar un perfil"</string>
@@ -2596,4 +2688,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicacions poden obrir els URL dels seus dominis</item>
       <item quantity="one">Una aplicació pot obrir els URL del seu domini</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"No s\'ha reconegut"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Aplicacions predeterminades"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Aplicació de navegador"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Navegador no predeterminat"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Predeterminat)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index f2af2a9..7f5c35d 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Stisknutí tlačítka"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"nízká"</item>
     <item msgid="4212263919458209842">"kritická"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Vypnuto"</item>
-    <item msgid="5656544177755411222">"Omezený počet vyrušování"</item>
-    <item msgid="8735337502532332056">"Žádná vyrušování"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normální"</item>
     <item msgid="866544120205026771">"Střední"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 3bdb962..d63a502 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -270,12 +270,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Karta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Nastavení proxy serveru"</string>
     <string name="cancel" msgid="6859253417269739139">"Zrušit"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ZRUŠIT"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"POKRAČOVAT"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ANO"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NE"</string>
-    <string name="forget" msgid="7267115980248732932">"ODSTRANIT"</string>
+    <string name="forget" msgid="1400428660472591263">"Zapomenout"</string>
+    <string name="save" msgid="879993180139353333">"Uložit"</string>
+    <string name="done" msgid="6942539184162713160">"Hotovo"</string>
     <string name="settings_label" msgid="1626402585530130914">"Nastavení"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Nastavení"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Zástupce nastavení"</string>
@@ -378,7 +376,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Připojte nabíječku a zkuste to znovu."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Chybí heslo nebo kód PIN zámku obrazovky"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Před začátkem šifrování musíte nastavit kód PIN nebo heslo zámku obrazovky."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Šifrování zařízení je třeba potvrdit provedením bezpečnostního gesta."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Zašifrovat?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Zašifrování je nevratné, a pokud ho přerušíte, budou vaše data ztracena. Šifrování trvá hodinu a více. Během této doby bude tablet několikrát restartován."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Zašifrování je nevratné, a pokud ho přerušíte, budou vaše data ztracena. Šifrování trvá hodinu a více. Během této doby bude telefon několikrát restartován."</string>
@@ -537,7 +534,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Rozšířené nastavení"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Rozšířené nastavení Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Když je zapnutá funkce Bluetooth, zařízení může komunikovat s ostatními zařízeními Bluetooth v okolí."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"Za účelem zlepšení přesnosti polohy budou služby Google vyhledávat zařízení Bluetooth, i když bude rozhraní Bluetooth vypnuté. Toto chování můžete změnit v LINK_BEGINnastavení vyhledáváníLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Za účelem zlepšení přesnosti polohy budou aplikace a služby vyhledávat zařízení Bluetooth, i když bude rozhraní Bluetooth vypnuté. Toto chování můžete změnit v <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nastavení vyhledávání<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Připojit k síti…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojeno od zvuku médií."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojeno od zvuku sady handsfree."</string>
@@ -603,7 +600,7 @@
     <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" msgid="8382526568324164356">"Za účelem zlepšení přesnosti polohy budou služby Google vyhledávat sítě Wi-Fi, i když bude rozhraní připojení k sítím Wi-Fi vypnuté.Toto chování můžete změnit v LINK_BEGINnastavení vyhledáváníLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Za účelem zlepšení přesnosti polohy budou aplikace a služby vyhledávat sítě Wi-Fi, i když bude připojení Wi-Fi vypnuté. Toto chování můžete změnit v <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nastavení vyhledávání<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Tuto zprávu příště nezobrazovat"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi aktivní i v režimu spánku"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi aktivní i v režimu spánku"</string>
@@ -620,8 +617,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <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_apps" msgid="6003687912727859577">"Zobrazit aplikace"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Zobrazit sílu Wi-Fi"</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>
@@ -679,6 +674,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Chcete se přihlásit, abyste se mohli připojit?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> vyžaduje, abyste se před připojením k síti přihlásili na webu."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"PŘIPOJIT"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Tato síť nemá přístup k internetu. Chcete ji přesto použít?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"U této sítě se již nedotazovat"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Připojit"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Připojení k síti se nezdařilo."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Odstranit"</string>
@@ -745,21 +742,17 @@
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Přenosný 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">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Volání přes Wi-Fi"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Předvolby volání"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Režim volání přes Wi-Fi"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Preferována síť W-Fi"</item>
     <item msgid="5267397515594230396">"Preferována mobilní síť"</item>
-    <item msgid="3132912693346866895">"Pouze Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Je-li zapnuto volání přes Wi-Fi, telefon může hovory v závislosti na zadaných nastaveních a na tom, který signál je silnější, směrovat přes sítě Wi-Fi nebo přes sítě operátora. Než tuto funkci zapnete, zeptejte se operátora na možné poplatky a další podrobnosti."</string>
     <string name="home_settings" msgid="212375129455718176">"Plocha"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Zobrazení"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
@@ -933,12 +926,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"K dispozici (pouze pro čtení)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Celková paměť"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Výpočet…"</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplikace (data apl. a multimediální obsah)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Aplikace a data aplikací"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Média"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Stahování"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Fotografie, videa"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Zvuk (hudba, vyzvánění, podcasty atd.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Různé"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Jiné soubory"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Data uložená v mezipaměti"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Odpojit sdílené úložiště"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Odpojit kartu SD"</string>
@@ -971,6 +964,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Probíhá odpojování"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"V úložišti je málo místa"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Některé systémové funkce, jako například synchronizace, nemusejí fungovat správně. Zkuste uvolnit místo smazáním nebo uvolněním položek, jako jsou aplikace nebo multimediální obsah."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Přejmenovat"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Připojit"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Odpojit"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Vymazat a naformátovat"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Vymazat a naformátovat interní úložiště"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Připojení USB k počítači"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Připojení USB k počítači"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Připojit jako"</string>
@@ -981,6 +979,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Umožňuje aplikacím s podporou formátu MIDI spolupracovat se softwarem ke zpracování souborů MIDI prostřednictvím USB."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Další uživatelé"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Úložiště zařízení"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Vyměnitelné úložiště"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"Volné místo: <xliff:g id="FREE">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Úložiště <xliff:g id="NAME">%1$s</xliff:g> je připojeno"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Připojení úložiště <xliff:g id="NAME">%1$s</xliff:g> se nezdařilo"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"Úložiště <xliff:g id="NAME">%1$s</xliff:g> bylo bezpečně odpojeno"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Úložiště <xliff:g id="NAME">%1$s</xliff:g> nebylo možné bezpečně odpojit"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"Úložiště <xliff:g id="NAME">%1$s</xliff:g> je naformátováno"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Formátování úložiště <xliff:g id="NAME">%1$s</xliff:g> se nezdařilo"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Přejmenovat úložiště"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Po naformátování budete moci toto úložiště <xliff:g id="NAME_0">^1</xliff:g> používat s jinými zařízeními. \n\nVeškerá data v tomto úložišti <xliff:g id="NAME_1">^1</xliff:g> budou vymazána. Doporučujeme je nejprve zálohovat. \n\n"<b>"Zálohování fotek a jiných medií"</b>" \nMediální soubory přesuňte do jiného úložiště v zařízení nebo je pomocí kabelu USB přeneste do počítače. \n\n"<b>"Zálohování aplikací"</b>" \nVšechny aplikace uložené v tomto úložišti <xliff:g id="NAME_6">^1</xliff:g> budou odinstalovány a jejich data budou vymazána. Chcete-li tyto aplikace zachovat, přesuňte je do jiného úložiště v zařízení."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Když toto úložiště <xliff:g id="NAME_0">^1</xliff:g> odpojíte, aplikace, kterou jsou v něm uloženy, přestanou fungovat a mediální soubory nebudou dostupné, dokud jej opět nevložíte."</b>" \n\nToto úložiště <xliff:g id="NAME_1">^1</xliff:g> je naformátováno tak, aby fungovalo pouze v tomto zařízení. V jiných zařízeních fungovat nebude."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Nastavte úložiště <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Použít jako přenosné úložiště"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"K přenášení fotek a dalších médií mezi zařízeními."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Použít jako interní úložiště"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"K ukládání libovolných dat, včetně aplikací a fotek, pouze do tohoto zařízení. Vyžaduje naformátování, které způsobí, že nebude fungovat v jiných zařízeních."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formátovat jako interní úložiště"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Proto je nutné úložiště <xliff:g id="NAME_0">^1</xliff:g> zabezpečit pomocí formátování. \n\nPo naformátování bude úložiště <xliff:g id="NAME_1">^1</xliff:g> fungovat pouze v tomto zařízení. \n\n"<b>"Formátováním vymažete veškerá data, která jsou v tomto úložišti <xliff:g id="NAME_2">^1</xliff:g> uložena."</b>" Chcete-li ztrátě dat předejít, doporučujeme je zálohovat."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Vymazat a naformátovat"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formátování úložiště <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Během formátování úložiště <xliff:g id="NAME">^1</xliff:g> neodpojujte."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Přesuňte data do nového úložiště"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Do tohoto nového úložiště <xliff:g id="NAME">^1</xliff:g> můžete přesunout fotky, soubory a data aplikací. \n\nPřesun bude trvat <xliff:g id="TIME">^2</xliff:g> a v interním úložišti uvolní <xliff:g id="SIZE">^3</xliff:g>. Během přesunu nebudou některé aplikace fungovat."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Přesunout"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Přesunout později"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Přesuňte data"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Přesun bude trvat asi <xliff:g id="TIME">^1</xliff:g>. V interním úložišti uvolní <xliff:g id="SIZE">^2</xliff:g>."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Přesunout"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Probíhá přesun dat…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Během přesunu: \n• Neodpojujte úložiště <xliff:g id="NAME">^1</xliff:g>. \n• Některé aplikace nebudou fungovat správně. \n• Udržujte zařízení nabité."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"Úložiště <xliff:g id="NAME">^1</xliff:g> je připraveno"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Nyní do úložiště <xliff:g id="NAME">^1</xliff:g> můžete ukládat fotky a další média."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Nové úložiště <xliff:g id="NAME">^1</xliff:g> již funguje. \n\nChcete-li do tohoto zařízení přesunout fotky, soubory a data aplikací, přejděte do Nastavení &gt; Úložiště."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Přesuňte aplikaci <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Přesunutí aplikace <xliff:g id="APP">^1</xliff:g> a jejích dat do úložiště <xliff:g id="NAME_0">^2</xliff:g> bude trvat jen chvíli. Aplikaci bude možné používat až po dokončení přesunu. \n\nÚložiště <xliff:g id="NAME_1">^2</xliff:g> během přesunu neodpojujte."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Probíhá přesun aplikace <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Úložiště <xliff:g id="NAME">^1</xliff:g> během přesunu nevysouvejte. \n\nAplikace <xliff:g id="APP">^2</xliff:g> bude v tomto zařízení k dispozici až po dokončení přesunu."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Zrušit přesun"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Stav baterie"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Stav baterie"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Přístupové body"</string>
@@ -1025,13 +1062,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Obnovit výchozí"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Obnovení výchozích nastavení názvu přístupového bodu (APN) bylo dokončeno."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Resetování nastavení sítě"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Touto akcí resetujete do výchozího továrního nastavení všechna nastavení související se sítěmi, včetně těchto:\n\n"<li>"Wi-Fi"</li>\n<li>"Mobilní datové připojení"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Tímto resetujete nastavení všech sítí, včetně následujících:\n\n"<li>"Wi‑Fi,"</li>\n<li>"mobilní datové připojení,"</li>\n<li>"Bluetooth."</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Resetovat nastavení"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Chcete resetovat všechna nastavení sítě? Tuto akci nelze vrátit zpět."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Chcete resetovat všechna nastavení sítí? Tuto akci nelze vrátit zpět."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Resetovat nastavení"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Chcete-li potvrdit resetování nastavení sítě, musíte nakreslit bezpečnostní gesto."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Resetovat?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Resetování nastavení sítě"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Nastavení sítí bylo resetováno"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Resetovat zařízení"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Obnovení továrních dat"</string>
     <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>
@@ -1047,9 +1083,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Smazat všechna data na kartě SD, například hudbu a fotografie."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Resetovat tablet"</string>
     <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_desc" msgid="1062841478823409667">"Chcete vymazat všechny osobní údaje 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_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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Pro tohoto uživatele není obnovení továrního nastavení dostupné"</string>
@@ -1066,8 +1101,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Nastavení hlasové schránky, přesměrování a čekání hovorů a ID volajícího"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering pomocí USB"</string>
@@ -1099,7 +1132,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Nápověda"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobilní sítě"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilní tarif"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Výchozí aplikace SMS"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplikace pro SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Chcete změnit aplikaci SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Chcete pro zprávy SMS používat aplikaci <xliff:g id="NEW_APP">%1$s</xliff:g> místo aplikace <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Chcete pro zprávy SMS používat aplikaci <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
@@ -1130,6 +1163,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"K určení polohy použít GPS"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Skenování"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skenování"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Vyhledávání Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Zlepšit přesnost polohy tím, že aplikace a služby budou vyhledávat sítě Wi-Fi, i když bude připojení Wi-Fi vypnuté"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Vyhledávání Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Zlepšit přesnost polohy tím, že systémové služby budou moci vyhledávat zařízení Bluetooth, i když bude rozhraní Bluetooth vypnuté"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Poloha z Wi-Fi a mobilních sítí"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Povolit aplikacím používat službu určování polohy Google a rychleji odhadovat vaši polohu. Anonymní data budou sbírána a odesílána Googlu."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Poloha určená sítí Wi-Fi"</string>
@@ -1175,11 +1212,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Heslo bylo nastaveno"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Kód PIN byl nastaven"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Gesto bylo nastaveno"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Chcete-li pokračovat, zadejte gesto zařízení."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Chcete-li pokračovat, zadejte PIN zařízení."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Chcete-li pokračovat, zadejte heslo zařízení."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Nesprávný kód PIN"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Nesprávné heslo"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Nesprávné gesto"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Zabezpečení zařízení"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Změna bezpečnostního gesta"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Změna bezpečnostního kódu PIN"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potvrďte uložené gesto"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Zkuste to znovu:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Proveďte gesto odemknutí"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Nápovědu zobrazíte stisknutím klávesy Menu."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Na závěr zdvihněte prst z obrazovky"</string>
@@ -1201,8 +1242,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Nastavení bezpečnostního gesta"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Změna bezpečnostního gesta"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Gesto odemknutí obrazovky proveďte tímto způsobem"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Příliš mnoho neplatných pokusů."</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Sekundy zbývající do dalšího pokusu: <xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Příliš mnoho neplatných pokusů. Zkuste to znovu za <xliff:g id="NUMBER">%d</xliff:g> s."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Aplikace není v telefonu nainstalována."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Spravovat aplikace"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Umožňuje spravovat a odebírat instalované aplikace"</string>
@@ -1253,8 +1293,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Řadit podle velikosti"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Zobrazit spuštěné služby"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Zobrazit mezipaměť"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Aplikace k příjmu výstražných zpráv"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Obnovit nastavení apl."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Obnovit nastavení apl.?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Tímto resetujete všechna nastavení následujících položek:\n\n "<li>"zakázané aplikace,"</li>\n" "<li>"zakázaná oznámení aplikací,"</li>\n" "<li>"výchozí aplikace pro různé akce,"</li>\n" "<li>"omezení datových přenosů na pozadí pro aplikace,"</li>\n" "<li>"veškerá omezení oprávnění."</li>\n\n" Nepřijdete o žádná data aplikací."</string>
@@ -1458,8 +1497,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Zachytit všechny pakety Bluetooth HCI do souboru"</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="select_logd_size_title" msgid="7433137108348553508">"Velikosti vyrovn. pamětí protokol. nástroje"</string>
@@ -1760,6 +1797,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 hodin"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 den"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Zobrazit systém"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Skrytí systémových procesů"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Použít USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Typ statistik"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Pozadí"</string>
@@ -1856,7 +1894,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Aktuální heslo:"</string>
@@ -2231,7 +2268,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Uživatel"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Omezený profil"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Přidat nového uživatele?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Vytvořením dalších uživatelů můžete toto zařízení sdílet s jinými lidmi. Každý uživatel má svůj prostor, který může personalizovat, nainstalovat své aplikace, tapetu atd. Uživatelé také mohou upravit nastavení zařízení (např. Wi-Fi), která ovlivní všechny ostatní uživatele.\n\nKdyž přidáte nového uživatele, musí si nastavit vlastní prostor.\n\nJakýkoli uživatel může aktualizovat aplikace všech ostatních uživatelů."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Vytvořením dalších uživatelů můžete toto zařízení sdílet s jinými lidmi. Každý uživatel má svůj prostor, který si může přizpůsobit instalací aplikací, přidáním tapety apod. Uživatelé také mohou upravit nastavení zařízení (např. Wi-Fi), která ovlivní všechny uživatele.\n\nKaždý nově přidaný uživatel si musí nastavit vlastní prostor.\n\nKaždý uživatel může aktualizovat aplikace všech ostatních uživatelů."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Když přidáte nového uživatele, musí si nastavit vlastní prostor.\n\nJakýkoli uživatel může aktualizovat aplikace všech ostatních uživatelů."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Nastavit uživatele?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Ujistěte se, že je uživatel k dispozici a může si v zařízení nastavit svůj prostor"</string>
@@ -2411,10 +2448,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"omezení omezit omezeno"</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_reset_apps" msgid="6420313678620788457">"resetovat předvolby výchozí"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"výstražné nouzové aplikace výchozí"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"aplikace stahování systém"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"aplikace oprávnění zabezpečení"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"aplikace výchozí"</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>
@@ -2429,14 +2466,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Hlasitost budíku"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Hlasitost vyzvánění"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Hlasitost oznámení"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Blokovat vyrušení"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Povolit pouze prioritní"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatická pravidla"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Při příchozím hovoru nebo 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_alarms" msgid="7380265858042606857">"Povolit pouze budíky"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Nerušit"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Pouze prioritní"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Pouze budíky"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Žádná vyrušení"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Vyzváněcí tón telefonu"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Výchozí tón oznámení"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrovat také u volání"</string>
@@ -2471,17 +2506,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Nejsou nainstalovány žádné aplikace poslouchající oznámení."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Chcete zapnout <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> bude moci číst všechna oznámení zveřejněná systémem nebo jakoukoli nainstalovanou aplikací. Oznámení mohou obsahovat osobní údaje jako kontaktní jména nebo texty zpráv, které jsou vám odesílány. Aplikace bude také moci tato oznámení zavřít nebo klepnout na tlačítka akcí v oznámeních."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Poskytovatelé podmínek"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Žádné aplikace neposkytují podmínky"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="few">Aplikace poskytující podmínky: %d</item>
-      <item quantity="many">Aplikace poskytující podmínky: %d</item>
-      <item quantity="other">Aplikace poskytující podmínky: %d</item>
-      <item quantity="one">Aplikace poskytující podmínky: %d</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nejsou nainstalováni žádní poskytovatelé podmínek."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Chcete zapnout službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"Poskytovatel podmínek <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> bude do režimu Nerušit moci přidat podmínky ukončení."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Načítání aplikací..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokovat vše"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nikdy nezobrazovat oznámení z této aplikace"</string>
@@ -2495,17 +2519,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritní"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Důvěrné"</string>
     <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_downtime_category" msgid="2654477732333340290">"Pozastavení"</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="zen_mode_rule_name" msgid="5149068059383837549">"Název pravidla"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Přidat pravidlo"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Smazat pravidlo"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Smazat pravidlo <xliff:g id="RULE">%1$s</xliff:g>?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Smazat"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Typ pravidla"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Neznámé"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Nakonfigurovat pravidlo"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Naplánované pravidlo"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Pravidlo nebylo nalezeno."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dny"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Žádná"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Každý den"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nikdy"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> až <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2515,15 +2545,92 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Budíky"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Připomenutí"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Události"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Vybraní volající"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Volající, kteří volají opakovaně"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Pokud stejná osoba zavolá podruhé za <xliff:g id="MINUTES">%d</xliff:g> min, bude povolena"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automaticky zapnout"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nikdy"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Každou noc"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"Zítra v <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Kdy vás můžeme rušit?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Na jak dlouho?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Na dobu neurčitou"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> minuty</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> minuty</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minut</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuta</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> hodiny</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> hodiny</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> hodin</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hodina</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Na dobu neurčitou přepnout do režimu Pouze prioritní oznámení"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="few">Na <xliff:g id="DURATION">%1$d</xliff:g> minuty (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Pouze prioritní oznámení</item>
+      <item quantity="many">Na <xliff:g id="DURATION">%1$d</xliff:g> minuty (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Pouze prioritní oznámení</item>
+      <item quantity="other">Na <xliff:g id="DURATION">%1$d</xliff:g> minut (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Pouze prioritní oznámení</item>
+      <item quantity="one">Na minutu (tedy do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>) přepnout do režimu Pouze prioritní oznámení</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="few">Na <xliff:g id="DURATION">%1$d</xliff:g> hodiny (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Pouze prioritní oznámení</item>
+      <item quantity="many">Na <xliff:g id="DURATION">%1$d</xliff:g> hodiny (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Pouze prioritní oznámení</item>
+      <item quantity="other">Na <xliff:g id="DURATION">%1$d</xliff:g> hodin (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Pouze prioritní oznámení</item>
+      <item quantity="one">Na hodinu (tedy do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>) přepnout do režimu Pouze prioritní oznámení</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Na dobu neurčitou přepnout do režimu Pouze budíky"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="few">Na <xliff:g id="DURATION">%1$d</xliff:g> minuty (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Pouze budíky</item>
+      <item quantity="many">Na <xliff:g id="DURATION">%1$d</xliff:g> minuty (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Pouze budíky</item>
+      <item quantity="other">Na <xliff:g id="DURATION">%1$d</xliff:g> minut (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Pouze budíky</item>
+      <item quantity="one">Na minutu (tedy do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>) přepnout do režimu Pouze budíky</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="few">Na <xliff:g id="DURATION">%1$d</xliff:g> hodiny (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Pouze budíky</item>
+      <item quantity="many">Na <xliff:g id="DURATION">%1$d</xliff:g> hodiny (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Pouze budíky</item>
+      <item quantity="other">Na <xliff:g id="DURATION">%1$d</xliff:g> hodin (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Pouze budíky</item>
+      <item quantity="one">Na hodinu (tedy do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>) přepnout do režimu Pouze budíky</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Na dobu neurčitou přepnout do režimu Nerušit"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="few">Na <xliff:g id="DURATION">%1$d</xliff:g> minuty (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Nerušit</item>
+      <item quantity="many">Na <xliff:g id="DURATION">%1$d</xliff:g> minuty (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Nerušit</item>
+      <item quantity="other">Na <xliff:g id="DURATION">%1$d</xliff:g> minut (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Nerušit</item>
+      <item quantity="one">Na minutu (tedy do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>) přepnout do režimu Nerušit</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="few">Na <xliff:g id="DURATION">%1$d</xliff:g> hodiny (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Nerušit</item>
+      <item quantity="many">Na <xliff:g id="DURATION">%1$d</xliff:g> hodiny (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Nerušit</item>
+      <item quantity="other">Na <xliff:g id="DURATION">%1$d</xliff:g> hodin (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Nerušit</item>
+      <item quantity="one">Na hodinu (tedy do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>) přepnout do režimu Nerušit</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Přejít do režimu Vždy vyrušit"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"navždy"</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>
@@ -2590,7 +2697,12 @@
       <item quantity="other">Uděleno <xliff:g id="COUNT_1">%d</xliff:g> oprávnění</item>
       <item quantity="one">Uděleno <xliff:g id="COUNT_0">%d</xliff:g> oprávnění</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="few">Bylo uděleno <xliff:g id="COUNT_2">%d</xliff:g> z <xliff:g id="COUNT_3">%d</xliff:g> oprávnění</item>
+      <item quantity="many">Bylo uděleno <xliff:g id="COUNT_2">%d</xliff:g> z <xliff:g id="COUNT_3">%d</xliff:g> oprávnění</item>
+      <item quantity="other">Bylo uděleno <xliff:g id="COUNT_2">%d</xliff:g> z <xliff:g id="COUNT_3">%d</xliff:g> oprávnění</item>
+      <item quantity="one">Bylo uděleno <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g> oprávnění</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Je nastaveno několik výchozích hodnot"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Nejsou nastaveny žádné výchozí hodnoty"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Všechny aplikace"</string>
@@ -2600,9 +2712,8 @@
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Zablokováno"</string>
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritní"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Důvěrné"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"S adresami URL domény"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Resetovat předvolby ve všech aplikacích do výchozího nastavení"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"Počet nainstalovaných aplikací včetně systémových a stažených aplikací: <xliff:g id="COUNT">%d</xliff:g>"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"S adresami URL domény"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Zakázáno administrátorem"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Rozšířená nastavení"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Neznámá aplikace"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Vyberte profil"</string>
@@ -2612,11 +2723,18 @@
     <string name="domain_urls_title" msgid="8735310976048599572">"Adresy URL domény"</string>
     <string name="domain_urls_summary_none" msgid="3517494281628717719">"Neotevírat adresy URL domény"</string>
     <string name="domain_urls_summary_one" msgid="3804994599497120956">"Otevřít adresu <xliff:g id="DOMAIN">%s</xliff:g>"</string>
-    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Otevřít adresu <xliff:g id="DOMAIN">%s</xliff:g> a související adresy URL"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Otevřít adresu <xliff:g id="DOMAIN">%s</xliff:g> a související adresy URL"</string>
     <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
       <item quantity="few">Adresy URL domény mohou otevřít <xliff:g id="COUNT">%d</xliff:g> aplikace</item>
       <item quantity="many">Adresy URL domény může otevřít <xliff:g id="COUNT">%d</xliff:g> aplikace</item>
       <item quantity="other">Adresy URL domény může otevřít <xliff:g id="COUNT">%d</xliff:g> aplikací</item>
       <item quantity="one">Adresy URL domény může otevřít jedna aplikace</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Nerozpoznáno"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Výchozí aplikace"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Prohlížeč"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Žádný výchozí prohlížeč"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Výchozí)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 2aa8f22..5e4d542 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Trykknap"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"Medier"</item>
     <item msgid="7924928667052300589">"Enhed"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"omtrentlig placering"</item>
+    <item msgid="5789673140227507995">"nøjagtig placering"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibrer"</item>
+    <item msgid="3434165993711230924">"læs kontaktpersoner"</item>
+    <item msgid="616161687718081936">"rediger kontaktpersoner"</item>
+    <item msgid="7638002295329050091">"læse opkaldsliste"</item>
+    <item msgid="6546959730920410907">"rediger opkaldslisten"</item>
+    <item msgid="446877710771379667">"læs kalenderen"</item>
+    <item msgid="7674458294386319722">"rediger kalenderen"</item>
+    <item msgid="8281201165558093009">"Wi-Fi-søgning"</item>
+    <item msgid="8694611243479480497">"underretning"</item>
+    <item msgid="7776439107987345446">"mobilscanning"</item>
+    <item msgid="514615766544675057">"ring til telefon"</item>
+    <item msgid="8181415497109310680">"læs sms"</item>
+    <item msgid="6816551144382117307">"skriv sms"</item>
+    <item msgid="4600463921908905030">"modtag sms"</item>
+    <item msgid="5958926493289432745">"modtag nød-sms"</item>
+    <item msgid="4945269495221089540">"modtag mms"</item>
+    <item msgid="5570472453573929087">"modtag WAP-push"</item>
+    <item msgid="7125408150230860501">"send sms"</item>
+    <item msgid="7080337936612188061">"læs ICC-sms"</item>
+    <item msgid="587124103118495063">"skriv ICC-sms"</item>
+    <item msgid="2320577158869025503">"skift indstillinger"</item>
+    <item msgid="1545733463471924009">"tegn ovenpå"</item>
+    <item msgid="3609046903962454582">"underretninger om adgang"</item>
+    <item msgid="4671646036128214513">"kamera"</item>
+    <item msgid="1097324338692486211">"optag lyd"</item>
+    <item msgid="5031552983987798163">"afspil lyd"</item>
+    <item msgid="8374996688066472414">"læs udklipsholder"</item>
+    <item msgid="3045529469061083747">"rediger udklipsholder"</item>
+    <item msgid="5124443975763747838">"medieknapper"</item>
+    <item msgid="4547883971364273343">"lydfokusering"</item>
+    <item msgid="2603878814882344450">"generel lydstyrke"</item>
+    <item msgid="7136963238377062018">"lydstyrke for stemme"</item>
+    <item msgid="4270236897655923007">"lydstyrke for ringetone"</item>
+    <item msgid="6325739889222559394">"lydstyrke for medier"</item>
+    <item msgid="5762123934816216821">"alarmlydstyrke"</item>
+    <item msgid="785049718065337473">"lydstyrke for underretninger"</item>
+    <item msgid="6700305533746877052">"lydstyrke for bluetooth"</item>
+    <item msgid="2029227495214047094">"hold aktiv"</item>
+    <item msgid="26109888160231211">"overvåg placering"</item>
+    <item msgid="5753382310468855812">"overvåg placering med højt strømforbrug"</item>
+    <item msgid="3356591542543137332">"hent brugsstatistik"</item>
+    <item msgid="3073734345226842233">"slå mikrofonlyd til/fra"</item>
+    <item msgid="1148142988678569310">"medieprojektion"</item>
+    <item msgid="9130014005474445273">"aktivér VPN"</item>
+    <item msgid="1165192162975045562">"skriv baggrund"</item>
+    <item msgid="7129487923652967258">"forslagsstruktur"</item>
+    <item msgid="1069023208100114540">"forslagsskærmbillede"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Placering"</item>
+    <item msgid="8677040780775113033">"Placering"</item>
+    <item msgid="1660743989948992916">"Placering"</item>
+    <item msgid="8791172739860195290">"Vibrer"</item>
+    <item msgid="383413555642128046">"Læs kontaktpersoner"</item>
+    <item msgid="3654594895269697313">"Rediger kontaktpersoner"</item>
+    <item msgid="7928393476362362538">"Læs opkaldslisten"</item>
+    <item msgid="6248591205254641116">"Rediger opkaldslisten"</item>
+    <item msgid="6093344633066170692">"Læs kalenderen"</item>
+    <item msgid="1334886368750347692">"Rediger kalenderen"</item>
+    <item msgid="1638204101698708656">"Placering"</item>
+    <item msgid="2154671955760380322">"Send underretning"</item>
+    <item msgid="4282477730595931828">"Placering"</item>
+    <item msgid="4891423912898525905">"Ring til telefon"</item>
+    <item msgid="2623604824935968113">"Læs sms/mms"</item>
+    <item msgid="4420177125221176306">"Skriv sms/mms"</item>
+    <item msgid="3986142739951490025">"Modtag sms/mms"</item>
+    <item msgid="3984213795861739778">"Modtag sms/mms"</item>
+    <item msgid="3656243523752472788">"Modtag sms/mms"</item>
+    <item msgid="8105802370238551510">"Modtag sms/mms"</item>
+    <item msgid="1407766984645388488">"Send sms/mms"</item>
+    <item msgid="3527273606643794973">"Læs sms/mms"</item>
+    <item msgid="4370895547001583812">"Skriv sms/mms"</item>
+    <item msgid="4218544235221631789">"Skift indstillinger"</item>
+    <item msgid="736541391767350377">"Tegn ovenpå"</item>
+    <item msgid="5530815681721654194">"Underretninger om adgang"</item>
+    <item msgid="781213371706962767">"Kamera"</item>
+    <item msgid="1720492593061838172">"Optag lyd"</item>
+    <item msgid="3493046322001257041">"Afspil lyd"</item>
+    <item msgid="136815868796597058">"Læs udklipsholder"</item>
+    <item msgid="5238692940326972503">"Rediger udklipsholder"</item>
+    <item msgid="5753789168376302997">"Medieknapper"</item>
+    <item msgid="3265262911688671938">"Lydfokusering"</item>
+    <item msgid="2098976479485046797">"Generel lydstyrke"</item>
+    <item msgid="5660213838861789350">"Lydstyrke for stemme"</item>
+    <item msgid="7983336752371254444">"Lydstyrke for ringetone"</item>
+    <item msgid="7878027809189330917">"Lydstyrke for medier"</item>
+    <item msgid="7260546305036218513">"Alarmlydstyrke"</item>
+    <item msgid="9103719301075748925">"Lydstyrke for underretninger"</item>
+    <item msgid="7025966722295861512">"Lydstyrke for bluetooth"</item>
+    <item msgid="4665183401128289653">"Hold aktiv"</item>
+    <item msgid="8584357129746649222">"Placering"</item>
+    <item msgid="7669257279311110599">"Placering"</item>
+    <item msgid="3459320345690097795">"Hent brugsstatistik"</item>
+    <item msgid="1312534577834048535">"Slå mikrofonlyd til/fra"</item>
+    <item msgid="5906017727368097853">"Medieprojektion"</item>
+    <item msgid="2486614710846178542">"Aktivér VPN"</item>
+    <item msgid="5586547561693629602">"Skriv baggrund"</item>
+    <item msgid="32794179825485062">"Forslagsstruktur"</item>
+    <item msgid="7872852746938272552">"Forslagsskærmbillede"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
     <item msgid="2560532955514699713">"Mellem"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"lav"</item>
     <item msgid="4212263919458209842">"kritisk"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Fra"</item>
-    <item msgid="5656544177755411222">"Begrænsede afbrydelser"</item>
-    <item msgid="8735337502532332056">"Nul afbrydelser"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Moderat"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b64ac99..2f5e3df 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kort"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxyindstillinger"</string>
     <string name="cancel" msgid="6859253417269739139">"Annuller"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ANNULLER"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"FORTSÆT"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"JA"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NEJ"</string>
-    <string name="forget" msgid="7267115980248732932">"GLEM"</string>
+    <string name="forget" msgid="1400428660472591263">"Glem"</string>
+    <string name="save" msgid="879993180139353333">"Gem"</string>
+    <string name="done" msgid="6942539184162713160">"Udført"</string>
     <string name="settings_label" msgid="1626402585530130914">"Indstillinger"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Indstillinger"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Genvej til Indstillinger"</string>
@@ -335,7 +333,7 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Placering"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Konti"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Sikkerhed"</string>
-    <string name="security_settings_summary" msgid="967393342537986570">"Angiv Min placering, oplåsning af skærmen, låsning af SIM-kort og lager for loginoplysninger"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"Angiv Min placering, oplåsning af skærmen, låst SIM-kort og lager for loginoplysninger"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Angiv Min placering, oplåsning af skærmen, lager for loginoplysninger"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Adgangskoder"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingeraftryk"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Tilslut din oplader, og prøv igen."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ingen pinkode eller adgangskode til skærmlås"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Du skal angive en pinkode eller adgangskode for skærmlås, inden du kan starte krypteringen."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Du skal tegne dit mønster til at låse op for at bekræfte krypteringen af din enhed."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Vil du kryptere?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Denne handling kan ikke fortrydes, og den kan ikke afbrydes uden tab af data til følge. Krypteringen tager mindst en time, og i den tid genstartes tabletten flere gange."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Denne handling kan ikke fortrydes, og den kan ikke afbrydes uden tab af data til følge. Krypteringen tager mindst en time, og i den tid genstartes telefonen flere gange."</string>
@@ -419,8 +416,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Mønster"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Pinkode"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Adgangskode"</string>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Når du har oprettet en skærmlås, kan du også oprette dit fingeraftryk i Indstillinger &gt; Sikkerhed."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Slå skærmlås fra"</string>
     <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>
@@ -522,8 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avanceret"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Avanceret Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Når Bluetooth er aktiveret, kan enheden kommunikere med andre Bluetooth-enheder i nærheden."</string>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"For at forbedre placeringsnøjagtigheden scanner apps og tjenester efter Bluetooth-enheder, selv når Bluetooth er slået fra. Du kan ændre dette i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>indstillinger for scanning<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Opret forbindelse til..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> afbrydes fra medielyd."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> afbrydes fra håndfri lyd."</string>
@@ -589,8 +584,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"For at forbedre placeringsnøjagtigheden scanner apps og tjenester efter Wi-Fi-netværk, selv når Wi-Fi er slået fra. Du kan ændre dette i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>indstillinger for scanning<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Vis ikke igen"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Hold Wi-Fi aktiveret i dvale"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Slå Wi-Fi til i dvaletilstand"</string>
@@ -607,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Søg"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avanceret"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Vis apps"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Vis Wi-Fi-signal"</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>
@@ -666,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Vil du logge ind for at oprette forbindelse?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> kræver, at du logger ind, inden du opretter forbindelse til netværket."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"OPRET FORBINDELSE"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Dette netværk er ikke forbundet til internettet. Vil du bruge netværket alligevel?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Spørg ikke igen for dette netværk"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Forbind"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Der kunne ikke oprettes forbindelse til netværket"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Glem"</string>
@@ -732,21 +726,17 @@
     <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> bærbart Wi-Fi-hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Opkald via Wi-Fi"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Opkaldspræference"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Tilstanden Opkald via Wi-Fi."</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"WiFi-netværk er foretrukket"</item>
     <item msgid="5267397515594230396">"Mobilnetværk er foretrukket"</item>
-    <item msgid="3132912693346866895">"Kun Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Når Wi-Fi-opkald er slået til, kan telefonen dirigere opkald via Wi-Fi-netværk eller dit mobilselskabs netværk, afhængigt af hvad du foretrækker, og hvor signalet er stærkest. Inden du slår denne funktion til, skal du kontakte dit mobilselskab angående gebyrer og andre oplysninger."</string>
     <string name="home_settings" msgid="212375129455718176">"Startskærm"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skærm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Lyd"</string>
@@ -836,9 +826,9 @@
     <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>
-    <string name="sim_lock_settings_category" msgid="5136244267576697004">"Konfigurer låsning af SIM-kort"</string>
-    <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kortlås"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"Indstillinger for låst SIM-kort"</string>
+    <string name="sim_lock_settings_category" msgid="5136244267576697004">"Konfigurer låst SIM-kort"</string>
+    <string name="sim_lock_settings_title" msgid="9018585580955414596">"Låst SIM-kort"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Lås SIM-kort"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Kræv pinkode for at bruge tabletcomputeren"</string>
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Kræv pinkode for at bruge telefonen"</string>
@@ -856,7 +846,7 @@
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Pinkoderne er ikke ens"</string>
     <string name="sim_change_failed" msgid="304964924772218382">"Pinkoden kan ikke ændres.\nPinkoden er muligvis forkert."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN-koden til SIM-kortet er ændret"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"SIM-kortlåsens tilstand kan ikke ændres.\nDet skyldes muligvis en forkert pinkode."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"SIM-kortets tilstand kan ikke ændres.\nMuligvis pga. en forkert pinkode."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Annuller"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Der blev fundet flere SIM-kort"</string>
@@ -918,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Tilgængelig (skrivebeskyttet)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Plads i alt"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Beregner..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Apps (appdata og medieindhold)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Apps og appdata"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Medier"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Downloads"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Billeder, videoer"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Lyd (musik, ringetoner osv.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Diverse"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Andre filer"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Cachelagrede data"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Demonter delt hukommelse"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Demonter SD-kort"</string>
@@ -956,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Demontering i gang"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Der er snart ikke mere lagerplads"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Nogle systemfunktioner, som f.eks. synkronisering, fungerer muligvis ikke korrekt. Prøv at frigøre plads ved at slette eller fjerne elementer såsom apps eller medieindhold."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Omdøb"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Monter"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Skub ud"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Slet og formatér"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Slet og formatér som internt lager"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB-tilslutning til computer"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-tilslutning til computer"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Tilslut som"</string>
@@ -966,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Gør det muligt for applikationer, der understøtter MIDI, at fungere via USB med MIDI-software på din computer."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Andre brugere"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Lagerplads på enheden"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Flytbart lager"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> ledig (I alt <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> blev monteret"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g> kunne ikke monteres"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> blev skubbet sikkert ud"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g> kunne ikke skubbes sikkert ud"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> blev formateret"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> kunne ikke formateres"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Omdøb lagerplads"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Efter formatering kan du bruge dette <xliff:g id="NAME_0">^1</xliff:g> i andre enheder. \n\nAlle data på dette <xliff:g id="NAME_1">^1</xliff:g> slettes. Overvej at tage en sikkerhedskopi først. \n\n"<b>"Sikkerhedskopiér billeder og andre medier"</b>\n"Flyt dine mediefiler til en anden lagerplads på denne enhed, eller overfør dem til en computer ved hjælp af et USB-kabel. \n\n"<b>"Sikkerhedskopiér apps"</b>\n"Alle apps, der er gemt på dette <xliff:g id="NAME_6">^1</xliff:g> afinstalleres, og de tilhørende data slettes. Hvis du vil beholde disse apps, skal du flytte dem til en anden lagerplads på denne enhed."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Når du skubber dette <xliff:g id="NAME_0">^1</xliff:g> ud, holder de apps, der er gemt her, op med at fungere, og mediefiler, der er gemt her, er utilgængelige, indtil det er sat i igen."</b>" \n\nDette <xliff:g id="NAME_1">^1</xliff:g> er formateret til kun at fungere på denne enhed og ikke på nogen andre."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Konfigurer dit <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Brug som bærbar lagerplads"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Til flytning af billeder og andre medier mellem enheder."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Brug som intern lagerplads"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Til lagring af hvad som helst kun på denne enhed, herunder apps og billeder. Kræver formatering, der forhindrer det i at fungere sammen med andre enheder."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatér som intern lagerplads"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Dette kræver, at dit <xliff:g id="NAME_0">^1</xliff:g> sikres ved hjælp af formatering. \n\nEfter formateringen fungerer dette <xliff:g id="NAME_1">^1</xliff:g> kun på denne enhed. \n\n"<b>"Ved formatering slettes alle data, der i øjeblikket er gemt på dit <xliff:g id="NAME_2">^1</xliff:g>."</b>" Overvej at tage en sikkerhedskopi for at undgå at miste dine data."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Slet og formatér"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formaterer <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Fjern ikke dit <xliff:g id="NAME">^1</xliff:g> under formateringen."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Flyt data til ny lagerplads"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Du kan flytte dine billeder, filer og appdata til dette nye <xliff:g id="NAME">^1</xliff:g>. \n\nFlytningen tager cirka <xliff:g id="TIME">^2</xliff:g> og vil frigøre <xliff:g id="SIZE">^3</xliff:g> intern lagerplads. Nogle apps fungerer ikke under flytningen."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Flyt nu"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Flyt senere"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Flyt data nu"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Flytningen tager cirka <xliff:g id="TIME">^1</xliff:g>. Det vil frigøre <xliff:g id="SIZE">^2</xliff:g> intern lagerplads."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Flyt"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Flytter data…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Under flytningen: \n• Undgå at fjerne dit <xliff:g id="NAME">^1</xliff:g>. \n• Nogle apps vil ikke fungere korrekt. \n• Hold enheden opladet."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> er klar"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Dit <xliff:g id="NAME">^1</xliff:g> er klar til billeder og andre medier."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Dit nye <xliff:g id="NAME">^1</xliff:g> fungerer. \n\nHvis du vil flytte billeder, filer og appdata til denne enhed, skal du gå til Indstillinger &gt; Lagerplads."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Flyt <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Flytningen af <xliff:g id="APP">^1</xliff:g> og de tilhørende data til <xliff:g id="NAME_0">^2</xliff:g> tager kun et øjeblik. Du kan ikke bruge appen, før flytningen er gennemført. \n\nFjern ikke dit <xliff:g id="NAME_1">^2</xliff:g> under flytningen."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Flytter <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Fjern ikke dit <xliff:g id="NAME">^1</xliff:g> under flytningen. \n\nAppen <xliff:g id="APP">^2</xliff:g> på denne enhed vil ikke være tilgængelig, før flytningen er gennemført."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Annuller flytning"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Batteristatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Batteriniveau"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Adgangspunkter"</string>
@@ -1010,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Nulstil til standard"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Standardindstillingerne for adgangspunktet er nulstillet."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Nulstil netværksindstillinger"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Dette vil nulstille alle netværksrelaterede indstillinger til fabriksstandarderne, herunder: \n\n"<li>"Wi-Fi"</li>\n<li>"Mobildata"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Denne handling nulstiller alle netværksindstillinger, herunder: \n\n"<li>"Wi-Fi"</li>\n<li>"Mobildata"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Nulstil indstillinger"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Vil du nulstille alle netværksindstillinger? Du kan ikke fortryde denne handling."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Vil du nulstille alle netværksindstillingerne? Du kan ikke fortryde denne handling."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Nulstil indstillinger"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Du skal tegne dit oplåsningsmønster for at bekræfte, at du vil nulstille netværksindstillingerne."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Vil du nulstille?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Nulstil netværksindstillinger"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Netværksindstillingerne er blevet nulstillet"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Nulstil enhed"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Gendannelse af fabriksdata"</string>
     <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>
@@ -1032,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Slet alle data på SD-kortet, f.eks. musik eller billeder"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Nulstil tablet"</string>
     <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_desc" msgid="1062841478823409667">"Vil du slette alle dine personlige oplysninger og downloadede apps? Du kan ikke fortryde denne handling."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Slet alt"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Gendannelse af fabriksindstillinger er ikke tilgængeligt for denne bruger"</string>
@@ -1051,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Konfigurer telefonsvarer, viderestilling af opkald, ventende opkald, opkalds-id"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Netdeling via USB"</string>
@@ -1084,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjælp"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobilnetværk"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilabonnement"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Standardapp til sms-beskeder"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Sms-app"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vil du skifte sms-app?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Vil du bruge <xliff:g id="NEW_APP">%1$s</xliff:g> i stedet for <xliff:g id="CURRENT_APP">%2$s</xliff:g> som din standardapp til sms?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Vil du bruge <xliff:g id="NEW_APP">%s</xliff:g> som din sms-app?"</string>
@@ -1115,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Brug GPS-signal til at fastslå din placering"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Søger"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Søger"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi-scanning"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Du kan opnå en forbedret placeringsnøjagtighed ved at tillade apps og tjenester at scanne efter Wi-Fi-netværk, selv når Wi-Fi er slået fra"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth-scanning"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Du kan opnå en forbedret placeringsnøjagtighed ved at tillade systemtjenester at scanne efter Bluetooth-enheder, selv når Bluetooth er slået fra"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Placering via Wi-Fi og mobilnetværk"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Tillad, at apps bruger Googles placeringstjeneste til at beregne din placering hurtigere. Der indsamles anonyme placeringsdata, som sendes til Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Placeringen fastlægges af Wi-Fi"</string>
@@ -1160,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Adgangskoden er indstillet"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Pinkoden er blevet indstillet"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Mønsteret er blevet indstillet"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Brug mønsteret til din enhed for at fortsætte."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Indtast pinkoden til din enhed for at fortsætte."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Indtast adgangskoden til din enhed for at fortsætte."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Forkert pinkode"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Forkert adgangskode"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Forkert mønster"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Enhedssikkerhed"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Skift oplåsningsmønster"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Skift pinkode til at låse op"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Bekræft gemt mønster"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Prøv igen:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Tegn et oplåsningsmønster"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Tryk på Menu for at få hjælp."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Slip, når du er færdig"</string>
@@ -1186,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Angiv oplåsningsmønster"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Skift oplåsningsmønster"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Sådan tegnes et oplåsningsmønster"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"For mange forkerte forsøg!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Prøv igen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"For mange mislykkede forsøg. Prøv igen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Applikationen er ikke installeret på din telefon."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrer apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrer og fjern installerede apps"</string>
@@ -1238,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sorter efter størrelse"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Vis kørende tjenester"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Cachelagrede processer"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Nødapp"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Nulstil app-præferencer"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Nulstil app-præferencer?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Dette vil nulstille alle præferencer for:\n\n "<li>"deaktiverede apps"</li>\n" "<li>"deaktiverede appunderretninger"</li>\n" "<li>"standardapplikationer til handlinger"</li>\n" "<li>"begrænsning af baggrundsdata for apps"</li>\n" "<li>"eventuelle begrænsede tilladelser"</li>\n\n" Du vil ikke miste nogen appdata."</string>
@@ -1443,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Gem alle Bluetooth HCI-pakker i en fil"</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="select_logd_size_title" msgid="7433137108348553508">"Størrelser for Logger-buffer"</string>
@@ -1708,7 +1742,7 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Opdater"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Medieserver"</string>
-    <string name="battery_saver" msgid="1426682272004907982">"Batteribesparelse"</string>
+    <string name="battery_saver" msgid="1426682272004907982">"Batterisparefunktion"</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="7536784431655058267">"ved %1$s batteri"</string>
@@ -1745,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 timer"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dag"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Vis systemet"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Skjul systemet"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Brug Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistiktype"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Baggrund"</string>
@@ -1841,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nuværende adgangskode:"</string>
@@ -2216,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Bruger"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Begrænset profil"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Vil du tilføje en ny bruger?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Du kan dele denne enhed med andre ved at oprette flere brugere. Hver bruger har deres eget område, hvor de kan tilpasse deres egne apps, baggrunde osv. Brugere kan også justere enhedsindstillinger, der påvirker alle, såsom Wi-Fi.\n\nNår du tilføjer en ny bruger, skal personen konfigurere sit område.\n\nEnhver bruger kan opdatere apps for alle andre brugere."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Du kan dele denne enhed med andre ved at oprette flere brugere. Hver bruger har sit eget område, som de kan tilpasse med apps, baggrunde osv. Brugere kan også justere enhedsindstillinger, der påvirker alle, som f.eks. Wi-Fi.\n\nNår du tilføjer en ny bruger, skal personen konfigurere sit område.\n\nEnhver bruger kan opdatere apps for alle andre brugere."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Når du tilføjer en ny bruger, skal personen konfigurere sit område.\n\nEnhver bruger kan opdatere apps for alle andre brugere."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Vil du konfigurere brugeren nu?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Sørg for, at brugeren har mulighed for at oprette sin egen plads på enheden"</string>
@@ -2396,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"begrænsning begræns begrænset"</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_reset_apps" msgid="6420313678620788457">"nulstilling af præferencer til standard"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"Nødapp, standard"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"system til download af applikationer"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"apps tilladelser sikkerhed"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"apps standard"</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>
@@ -2414,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmlydstyrke"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Lydstyrke for ringetone"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Lydstyrke for underretninger"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Blokér afbrydelser"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritet tillader kun"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatiske regler"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Når der modtages opkald og 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_alarms" msgid="7380265858042606857">"Tillad kun alarmer"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Afbryd ikke"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Kun prioritet"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Kun alarmer"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Ingen afbrydelser"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ringetone ved opkald"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Standardringetone for underretninger"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrer også ved opkald"</string>
@@ -2454,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Ingen underretningslyttere er installeret."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Skal <xliff:g id="SERVICE">%1$s</xliff:g> aktiveres?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> vil kunne læse alle underretninger, der er sendt af systemet eller en hvilken som helst installeret app, som kan indeholde personlige oplysninger, som f.eks. kontaktpersoner og teksten i beskeder, der sendes til dig. Den vil også kunne afvise disse underretninger eller trykke på handlingsknapper i dem."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Tjenester til formidling af betingelser"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ingen apps formidler betingelser"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="one">%d apps angiver betingelser</item>
-      <item quantity="other">%d apps angiver betingelser</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Der er ikke installeret nogen tjenester til formidling af betingelser."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Skal <xliff:g id="SERVICE">%1$s</xliff:g> aktiveres?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> kan tilføje afslutningsbetingelser til tilstanden Vil ikke forstyrres."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Indlæser apps..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloker alle"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Vis aldrig underretninger fra denne app"</string>
@@ -2476,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritet"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Følsomme"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Regelnavn"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Tilføj regel"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Slet regel"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Vil du slette reglen \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Slet"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Regeltype"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Ukendt"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Konfigurer regel"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Planlæg regel"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Reglen blev ikke fundet."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dage"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Ingen"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Hver dag"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Aldrig"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>-<xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> til <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2496,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmer"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Påmindelser"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Begivenheder"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Udvalgte opkaldere"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Gentagende opkald"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Tillad, hvis den samme person ringer for anden gang inden for en periode på <xliff:g id="MINUTES">%d</xliff:g> minutter"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Aktivér automatisk"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Aldrig"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Hver nat"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> næste dag"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Hvornår vil du afbrydes?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"I hvor lang tid?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"På ubestemt tid"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> minutter</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutter</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> timer</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> timer</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Skift til Kun prioriterede underretninger på ubestemt tid"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Skift til Kun prioriterede underretninger i <xliff:g id="DURATION">%1$d</xliff:g> minutter indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Skift til Kun prioriterede underretninger i <xliff:g id="DURATION">%1$d</xliff:g> minutter indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Skift til Kun prioriterede underretninger i <xliff:g id="DURATION">%1$d</xliff:g> timer (indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Skift til Kun prioriterede underretninger i <xliff:g id="DURATION">%1$d</xliff:g> timer (indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Skift til Kun alarmer på ubestemt tid"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">Skift til Kun alarmer i <xliff:g id="DURATION">%1$d</xliff:g> minutter (indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Skift til Kun alarmer i <xliff:g id="DURATION">%1$d</xliff:g> minutter (indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="one">Skift til Kun alarmer i <xliff:g id="DURATION">%1$d</xliff:g> timer indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Skift til Kun alarmer i <xliff:g id="DURATION">%1$d</xliff:g> timer indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Skift til Afbryd ikke på ubestemt tid"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Skift til Afbryd ikke i <xliff:g id="DURATION">%1$d</xliff:g> minutter (indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Skift til Afbryd ikke i <xliff:g id="DURATION">%1$d</xliff:g> minutter (indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Skift til Afbryd ikke i <xliff:g id="DURATION">%1$d</xliff:g> timer indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Skift til Afbryd ikke i <xliff:g id="DURATION">%1$d</xliff:g> timer indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Skift til Afbryd altid"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"for altid"</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>
@@ -2569,7 +2659,10 @@
       <item quantity="one">Der er givet <xliff:g id="COUNT_1">%d</xliff:g> tilladelser</item>
       <item quantity="other">Der er givet <xliff:g id="COUNT_1">%d</xliff:g> tilladelser</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> af <xliff:g id="COUNT_3">%d</xliff:g> tilladelser blev givet</item>
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> af <xliff:g id="COUNT_3">%d</xliff:g> tilladelser blev givet</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Der er angivet nogle standarder"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Der er ikke angivet nogen standarder"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Alle apps"</string>
@@ -2580,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritet"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Følsomt indhold"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Med domænets webadresser"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Nulstil præferencer i alle apps til standarderne"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> apps er installeret, herunder systemapps og downloadede apps"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Deaktiveret af administratoren"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avanceret"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Ukendt app"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Vælg profil"</string>
@@ -2596,4 +2688,11 @@
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> apps kan åbne domænets webadresser</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps kan åbne domænets webadresser</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Kan ikke genkendes"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Standardapps"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Browserapp"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Ingen standardbrowser"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Standard)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 1c4574b..d69f866 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Push-Schaltfläche"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"Medien"</item>
     <item msgid="7924928667052300589">"Gerät"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"Ungefährer Standort"</item>
+    <item msgid="5789673140227507995">"Genauer Standort"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"Vibration"</item>
+    <item msgid="3434165993711230924">"Kontakte lesen"</item>
+    <item msgid="616161687718081936">"Kontakte ändern"</item>
+    <item msgid="7638002295329050091">"Anrufliste lesen"</item>
+    <item msgid="6546959730920410907">"Anrufliste ändern"</item>
+    <item msgid="446877710771379667">"Kalender lesen"</item>
+    <item msgid="7674458294386319722">"Kalender ändern"</item>
+    <item msgid="8281201165558093009">"WLAN-Scan"</item>
+    <item msgid="8694611243479480497">"Benachrichtigung"</item>
+    <item msgid="7776439107987345446">"Mobilfunknetz-Scan"</item>
+    <item msgid="514615766544675057">"Telefonieren"</item>
+    <item msgid="8181415497109310680">"SMS lesen"</item>
+    <item msgid="6816551144382117307">"SMS schreiben"</item>
+    <item msgid="4600463921908905030">"SMS empfangen"</item>
+    <item msgid="5958926493289432745">"Notfall-SMS empfangen"</item>
+    <item msgid="4945269495221089540">"MMS empfangen"</item>
+    <item msgid="5570472453573929087">"WAP-Push-Nachricht empfangen"</item>
+    <item msgid="7125408150230860501">"SMS senden"</item>
+    <item msgid="7080337936612188061">"ICC-SMS lesen"</item>
+    <item msgid="587124103118495063">"ICC-SMS schreiben"</item>
+    <item msgid="2320577158869025503">"Einstellungen ändern"</item>
+    <item msgid="1545733463471924009">"An oberste Position ziehen"</item>
+    <item msgid="3609046903962454582">"Auf Benachrichtigungen zugreifen"</item>
+    <item msgid="4671646036128214513">"Kamera"</item>
+    <item msgid="1097324338692486211">"Audio aufnehmen"</item>
+    <item msgid="5031552983987798163">"Audio wiedergeben"</item>
+    <item msgid="8374996688066472414">"Zwischenablage lesen"</item>
+    <item msgid="3045529469061083747">"Zwischenablage ändern"</item>
+    <item msgid="5124443975763747838">"Medienschaltflächen"</item>
+    <item msgid="4547883971364273343">"Audiofokus"</item>
+    <item msgid="2603878814882344450">"Gesamtlautstärke"</item>
+    <item msgid="7136963238377062018">"Sprachlautstärke"</item>
+    <item msgid="4270236897655923007">"Klingeltonlautstärke"</item>
+    <item msgid="6325739889222559394">"Medienlautstärke"</item>
+    <item msgid="5762123934816216821">"Weckerlautstärke"</item>
+    <item msgid="785049718065337473">"Benachrichtigungslautstärke"</item>
+    <item msgid="6700305533746877052">"Bluetooth-Lautstärke"</item>
+    <item msgid="2029227495214047094">"aktiv lassen"</item>
+    <item msgid="26109888160231211">"Standort beobachten"</item>
+    <item msgid="5753382310468855812">"Orte mit hohem Stromverbrauch überwachen"</item>
+    <item msgid="3356591542543137332">"Nutzungsstatistiken abrufen"</item>
+    <item msgid="3073734345226842233">"Mikrofon aus- oder einschalten"</item>
+    <item msgid="1148142988678569310">"Projektion von Medieninhalten"</item>
+    <item msgid="9130014005474445273">"VPN aktivieren"</item>
+    <item msgid="1165192162975045562">"Hintergrund schreiben"</item>
+    <item msgid="7129487923652967258">"Strukturassistent"</item>
+    <item msgid="1069023208100114540">"Screenshotassistent"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Standort"</item>
+    <item msgid="8677040780775113033">"Standort"</item>
+    <item msgid="1660743989948992916">"Standort"</item>
+    <item msgid="8791172739860195290">"Vibration"</item>
+    <item msgid="383413555642128046">"Kontakte lesen"</item>
+    <item msgid="3654594895269697313">"Kontakte ändern"</item>
+    <item msgid="7928393476362362538">"Anrufliste lesen"</item>
+    <item msgid="6248591205254641116">"Anrufliste ändern"</item>
+    <item msgid="6093344633066170692">"Kalender lesen"</item>
+    <item msgid="1334886368750347692">"Kalender ändern"</item>
+    <item msgid="1638204101698708656">"Standort"</item>
+    <item msgid="2154671955760380322">"Benachrichtigung posten"</item>
+    <item msgid="4282477730595931828">"Standort"</item>
+    <item msgid="4891423912898525905">"Telefonieren"</item>
+    <item msgid="2623604824935968113">"SMS/MMS lesen"</item>
+    <item msgid="4420177125221176306">"SMS/MMS schreiben"</item>
+    <item msgid="3986142739951490025">"SMS/MMS empfangen"</item>
+    <item msgid="3984213795861739778">"SMS/MMS empfangen"</item>
+    <item msgid="3656243523752472788">"SMS/MMS empfangen"</item>
+    <item msgid="8105802370238551510">"SMS/MMS empfangen"</item>
+    <item msgid="1407766984645388488">"SMS/MMS senden"</item>
+    <item msgid="3527273606643794973">"SMS/MMS lesen"</item>
+    <item msgid="4370895547001583812">"SMS/MMS schreiben"</item>
+    <item msgid="4218544235221631789">"Einstellungen ändern"</item>
+    <item msgid="736541391767350377">"An oberste Position ziehen"</item>
+    <item msgid="5530815681721654194">"Auf Benachrichtigungen zugreifen"</item>
+    <item msgid="781213371706962767">"Kamera"</item>
+    <item msgid="1720492593061838172">"Audio aufnehmen"</item>
+    <item msgid="3493046322001257041">"Audio wiedergeben"</item>
+    <item msgid="136815868796597058">"Zwischenablage lesen"</item>
+    <item msgid="5238692940326972503">"Zwischenablage ändern"</item>
+    <item msgid="5753789168376302997">"Medienschaltflächen"</item>
+    <item msgid="3265262911688671938">"Audiofokus"</item>
+    <item msgid="2098976479485046797">"Gesamtlautstärke"</item>
+    <item msgid="5660213838861789350">"Sprachlautstärke"</item>
+    <item msgid="7983336752371254444">"Klingeltonlautstärke"</item>
+    <item msgid="7878027809189330917">"Medienlautstärke"</item>
+    <item msgid="7260546305036218513">"Weckerlautstärke"</item>
+    <item msgid="9103719301075748925">"Benachrichtigungslautstärke"</item>
+    <item msgid="7025966722295861512">"Bluetooth-Lautstärke"</item>
+    <item msgid="4665183401128289653">"Aktiv lassen"</item>
+    <item msgid="8584357129746649222">"Standort"</item>
+    <item msgid="7669257279311110599">"Ort"</item>
+    <item msgid="3459320345690097795">"Nutzungsstatistiken abrufen"</item>
+    <item msgid="1312534577834048535">"Mikrofon aus- oder einschalten"</item>
+    <item msgid="5906017727368097853">"Projektion von Medieninhalten"</item>
+    <item msgid="2486614710846178542">"VPN aktivieren"</item>
+    <item msgid="5586547561693629602">"Hintergrund schreiben"</item>
+    <item msgid="32794179825485062">"Strukturassistent"</item>
+    <item msgid="7872852746938272552">"Screenshotassistent"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kurz"</item>
     <item msgid="2560532955514699713">"Mittel"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"niedrig"</item>
     <item msgid="4212263919458209842">"kritisch"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Deaktiviert"</item>
-    <item msgid="5656544177755411222">"Begrenzte Unterbrechungen"</item>
-    <item msgid="8735337502532332056">"Keine Unterbrechungen"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Mittel"</item>
     <item msgid="866544120205026771">"Moderat"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 23aefb9..4158878 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-Karte"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy-Einstellungen"</string>
     <string name="cancel" msgid="6859253417269739139">"Abbrechen"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"Abbrechen"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"Weiter"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"Ja"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"Nein"</string>
-    <string name="forget" msgid="7267115980248732932">"Entfernen"</string>
+    <string name="forget" msgid="1400428660472591263">"Entfernen"</string>
+    <string name="save" msgid="879993180139353333">"Speichern"</string>
+    <string name="done" msgid="6942539184162713160">"Fertig"</string>
     <string name="settings_label" msgid="1626402585530130914">"Einstellungen"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Einstellungen"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Einstellungsverknüpfung"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Schließen Sie Ihr Ladegerät an und versuchen Sie es erneut."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Keine PIN oder kein Passwort für Displaysperre"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Sie müssen eine PIN oder ein Passwort für die Displaysperre festlegen, bevor Sie die Verschlüsselung starten können."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Zeichnen Sie Ihr Entsperrungsmuster, um die Geräteverschlüsselung zu bestätigen."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Verschlüsseln?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Dieser Vorgang ist nicht umkehrbar und jede Unterbrechung ist mit einem Datenverlust verbunden. Die Verschlüsselung dauert mindestens eine Stunde. In dieser Zeit wird das Tablet mehrfach neu gestartet."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Dieser Vorgang ist nicht umkehrbar und jede Unterbrechung ist mit einem Datenverlust verbunden. Die Verschlüsselung dauert mindestens eine Stunde. In dieser Zeit wird das Telefon mehrfach neu gestartet."</string>
@@ -419,8 +416,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Muster"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Passwort"</string>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Sobald Sie eine Displaysperre eingerichtet haben, können Sie unter \"Einstellungen\" &gt; \"Sicherheit\" auch Ihren Fingerabdruck einrichten."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Displaysperre deaktivieren"</string>
     <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>
@@ -523,8 +519,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Erweitert"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth - Erweitert"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bei aktiviertem Bluetooth kann Ihr Gerät mit Bluetooth-Geräten in der Nähe kommunizieren."</string>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Zur Erhöhung der Standortgenauigkeit suchen Apps und Dienste nach Bluetooth-Geräten, auch wenn die Bluetooth-Funktion deaktiviert ist. Sie können dies unter <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>Sucheinstellungen<xliff:g id="LINK_END_1">LINK_END</xliff:g> ändern."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Verbinden mit..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird vom Medien-Audiosystem getrennt."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird von der Freisprechfunktion getrennt."</string>
@@ -590,8 +585,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Zur Erhöhung der Standortgenauigkeit suchen Apps und Dienste nach WLAN-Netzwerken, auch wenn die WLAN-Funktion deaktiviert ist. Sie können dies unter <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>Sucheinstellungen<xliff:g id="LINK_END_1">LINK_END</xliff:g> ändern."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Nicht erneut anzeigen"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"WLAN im Ruhemodus aktiviert lassen"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"WLAN im Ruhemodus aktiviert"</string>
@@ -608,8 +602,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scannen"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Erweitert"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Apps anzeigen"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"WLAN-Stärke anzeigen"</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>
@@ -667,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Zum Verbinden anmelden?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> erfordert vor dem Verbinden mit dem Netzwerk Ihre Onlineameldung."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"Verbinden"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Dieses Netzwerk hat keinen Internetzugriff. Netzwerk trotzdem verwenden?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Für dieses Netzwerk nicht mehr fragen"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Verbinden"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Netzwerkverbindung konnte nicht hergestellt werden."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Entfernen"</string>
@@ -733,21 +727,17 @@
     <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> mobiler WLAN-Hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"WLAN-Telefonie"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Bevorzugte Anrufeinstellung"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"WLAN-Anrufmodus"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"WLAN bevorzugt"</item>
     <item msgid="5267397515594230396">"Mobilfunk bevorzugt"</item>
-    <item msgid="3132912693346866895">"Nur WLAN"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wenn WLAN-Anrufe aktiviert sind, kann Ihr Smartphone abhängig von Ihrer Einstellung und von der Signalstärke Anrufe über WLAN-Netzwerke oder über das Netz Ihres Mobilfunkanbieters übertragen. Erkundigen Sie sich bei Ihrem Mobilfunkanbieter über die hierfür erhobenen Gebühren und andere Informationen, bevor Sie diese Funktion aktivieren."</string>
     <string name="home_settings" msgid="212375129455718176">"Startseite"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Töne"</string>
@@ -919,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Verfügbar (schreibgeschützt)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Gesamtspeicher"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Wird berechnet..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Apps (Appdaten &amp; Medieninhalte)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Apps und App-Daten"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Medien"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Downloads"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Bilder, Videos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (Musik, Töne usw.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Sonstiges"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Sonstige Dateien"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Daten im Cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Gemeinsamen Speicher trennen"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD-Karte entnehmen"</string>
@@ -957,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Trennung..."</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Der Speicherplatz wird knapp"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Einige Systemfunktionen wie die Synchronisierung funktionieren möglicherweise nicht korrekt. Versuchen Sie, Speicherplatz freizugeben, indem Sie Elemente wie Apps oder Medieninhalte löschen oder ihre Offline-Verfügbarkeit aufheben."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Umbenennen"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Bereitstellen"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Auswerfen"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Löschen und formatieren"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Löschen und als internen Speicher formatieren"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB-Verbindung (PC)"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-Verbindung (PC)"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Verbinden als"</string>
@@ -967,6 +962,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Lässt MIDI-kompatible Apps über USB mit MIDI-Software auf Ihrem Computer arbeiten"</string>
     <string name="storage_other_users" msgid="808708845102611856">"Andere Nutzer"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Gerätespeicher"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Wechselmedien"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> verfügbar (<xliff:g id="TOTAL">%2$s</xliff:g> insgesamt)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> wurde bereitgestellt."</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g> konnte nicht bereitgestellt werden."</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> wurde sicher ausgeworfen."</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g> konnte nicht sicher ausgeworfen werden."</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> wurde formatiert."</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> konnte nicht formatiert werden."</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Speicher umbenennen"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Nachdem die Formatierung abgeschlossen wurde, können Sie die <xliff:g id="NAME_0">^1</xliff:g> in anderen Geräten verwenden. \n\nAlle Daten auf der <xliff:g id="NAME_1">^1</xliff:g> werden gelöscht. Sichern Sie Ihre Daten daher vor der Formatierung. \n\n"<b>"Sichern Sie Fotos und andere Medien."</b>" \nVerschieben Sie Ihre Mediendateien auf ein anderes Speichermedium auf diesem Gerät oder kopieren Sie sie über ein USB-Kabel auf einen Computer. \n\n"<b>"Sichern Sie Ihre Apps."</b>" \nAlle Apps auf der <xliff:g id="NAME_6">^1</xliff:g> werden deinstalliert und ihre Daten werden gelöscht. Wenn Sie diese Apps beibehalten möchten, verschieben Sie sie auf ein anderes Speichermedium auf diesem Gerät."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Wenn Sie die <xliff:g id="NAME_0">^1</xliff:g> aus dem Gerät entfernen, funktionieren die auf dem Speichermedium vorhandenen Apps nicht mehr. Die gespeicherten Mediendateien können erst wieder auf dem Gerät aufgerufen werden, wenn Sie das Speichermedium einlegen."</b>" \n\nDie <xliff:g id="NAME_1">^1</xliff:g> ist nur für dieses Gerät formatiert und kann nicht mit anderen Geräten verwendet werden."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> einrichten"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Als tragbaren Speicher verwenden"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Zum Übertragen von Fotos und anderen Medien zwischen Geräten"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Als internen Speicher verwenden"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Zum Speichern Ihrer Daten wie Apps und Fotos nur auf diesem Gerät. Eine Formatierung ist erforderlich. Dadurch kann das Speichermedium nicht mit anderen Geräten verwendet werden."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Als internen Speicher formatieren"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Um die Sicherheit zu gewährleisten, muss die <xliff:g id="NAME_0">^1</xliff:g> zuerst formatiert werden. \n\nDanach ist die <xliff:g id="NAME_1">^1</xliff:g> ausschließlich für dieses Gerät formatiert und funktioniert nicht mit anderen Geräten. \n\n"<b>"Durch die Formatierung werden alle derzeit auf der <xliff:g id="NAME_2">^1</xliff:g> gespeicherten Daten gelöscht."</b>" Um den Verlust von Daten zu verhindern, sichern Sie sie vor der Formatierung."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Löschen und formatieren"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> wird formatiert…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Entfernen Sie die <xliff:g id="NAME">^1</xliff:g> nicht während der Formatierung."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Daten in neuen Speicher verschieben"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Sie können Ihre Fotos, Dateien und App-Daten jetzt auf die neue <xliff:g id="NAME">^1</xliff:g> verschieben. \n\nDieser Vorgang dauert etwa <xliff:g id="TIME">^2</xliff:g>. Dabei wird <xliff:g id="SIZE">^3</xliff:g> interner Speicherplatz freigegeben. Einige Apps funktionieren während des Vorgangs nicht."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Jetzt verschieben"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Später verschieben"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Daten jetzt verschieben"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Das Verschieben dauert etwa <xliff:g id="TIME">^1</xliff:g>. Dabei wird <xliff:g id="SIZE">^2</xliff:g> interner Speicherplatz freigegeben."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Verschieben"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Daten werden verschoben…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Beachten Sie beim Verschieben Ihrer Daten Folgendes: \n• Entfernen Sie die <xliff:g id="NAME">^1</xliff:g> nicht. \n• Einige Apps funktionieren möglicherweise nicht. \n• Achten Sie darauf, dass das Gerät dabei stets geladen wird."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> steht für Sie bereit"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Sie können Ihre <xliff:g id="NAME">^1</xliff:g> nun zum Speichern von Fotos und anderen Medien einsetzen."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Ihre neue <xliff:g id="NAME">^1</xliff:g> steht nun für Sie bereit. \n\nWenn Sie Fotos, Dateien und App-Daten auf dieses Gerät verschieben möchten, gehen Sie zu \"Einstellungen\" &gt; \"Speicher\"."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> verschieben"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Das Verschieben von <xliff:g id="APP">^1</xliff:g> und den entsprechenden Daten auf die <xliff:g id="NAME_0">^2</xliff:g> dauert nur einen Moment. Sie können die App erst wieder verwenden, nachdem sie vollständig verschoben wurde. \n\nEntfernen Sie die <xliff:g id="NAME_1">^2</xliff:g> während des Vorgangs nicht."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> wird verschoben…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Entfernen Sie die <xliff:g id="NAME">^1</xliff:g> während des Vorgangs nicht. \n\nDie App <xliff:g id="APP">^2</xliff:g> auf diesem Gerät ist erst wieder verfügbar, nachdem sie vollständig verschoben wurde."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Verschieben abbrechen"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Akkustatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Akkuladung"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1011,13 +1045,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Auf Standard zurücksetzen"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Zurücksetzen auf Standard-APN-Einstellungen abgeschlossen"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Netzwerkeinstellungen zurücksetzen"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Dadurch werden alle netzwerkbezogenen Einstellungen auf die Werkseinstellungen zurückgesetzt, u. a. diese:\n\n"<li>"WLAN"</li>\n<li>"Mobiler Datenverkehr"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Dadurch werden alle Netzwerkeinstellungen zurückgesetzt, einschließlich:\n\n"<li>"WLAN"</li>\n<li>"Mobilfunkdaten"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Einstellungen zurücksetzen"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Alle Netzwerkeinstellungen zurücksetzen? Diese Aktion kann nicht rückgängig gemacht werden!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Alle Netzwerkeinstellungen zurücksetzen? Diese Aktion kann nicht rückgängig gemacht werden!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Einstellungen zurücksetzen"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Zeichnen Sie Ihr Entsperrungsmuster, um ein Zurücksetzen der Netzwerkeinstellungen zu bestätigen."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Zurücksetzen?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Netzwerkeinstellungen zurückgesetzt"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Die Netzwerkeinstellungen wurden zurückgesetzt."</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Gerät zurücksetzen"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Auf Werkszustand zurück"</string>
     <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>
@@ -1033,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Alle Daten, z. B. Musik und Fotos, von der SD-Karte löschen"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tablet zurücksetzen"</string>
     <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_desc" msgid="1062841478823409667">"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_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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Das Zurücksetzen auf Werkseinstellungen ist für diesen Nutzer nicht verfügbar."</string>
@@ -1052,8 +1084,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Mailbox, Rufweiterleitung, Anklopfen, Anruferkennung einrichten"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-Tethering"</string>
@@ -1085,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hilfe"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobilfunknetze"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilfunktarif"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Standard-SMS-App"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS-App"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS-App wechseln?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"<xliff:g id="NEW_APP">%1$s</xliff:g> statt <xliff:g id="CURRENT_APP">%2$s</xliff:g> als SMS-App verwenden?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g> als SMS-App verwenden?"</string>
@@ -1116,6 +1146,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPS zur Standortbestimmung nutzen"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Scannen"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Scannen"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"WLAN-Suche"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Apps und Diensten zwecks Erhöhung der Standortgenauigkeit die Suche nach WLAN-Netzwerken auch bei deaktivierter WLAN-Funktion gestatten"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth-Suche"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Systemdiensten zwecks Erhöhung der Standortgenauigkeit die Suche nach Bluetooth-Geräten auch bei deaktivierter Bluetooth-Funktion gestatten"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Standort per WLAN und Mobilfunk"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Apps dürfen meinen Standort mit dem Google-Standortdienst schneller bestimmen. Anonyme Standortdaten werden erfasst und an Google gesendet."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Standort per WLAN ermittelt"</string>
@@ -1161,11 +1195,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Das Passwort wurde festgelegt."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Die PIN wurde festgelegt."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Das Muster wurde festgelegt."</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Geben Sie zum Fortfahren das Muster für Ihr Gerät ein."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Geben Sie zum Fortfahren die PIN für Ihr Gerät ein."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Geben Sie zum Fortfahren das Passwort für Ihr Gerät ein."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Falsche PIN"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Falsches Passwort"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Falsches Muster"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Gerätesicherheit"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Entsperrungsmuster ändern"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Entsperrungs-PIN ändern"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Gespeichertes Muster bestätigen"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Erneut versuchen:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Zeichnen Sie ein Entsperrungsmuster."</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Menütaste drücken, um die Hilfe aufzurufen"</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Lassen Sie die Tasten los, wenn Sie fertig sind."</string>
@@ -1187,8 +1225,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Entsperrungsmuster"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Muster ändern"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Zeichnen eines Entsperrungsmusters"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Zu viele fehlgeschlagene Versuche!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"In <xliff:g id="NUMBER">%d</xliff:g> Sekunden erneut versuchen."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Zu viele fehlerhafte Versuche. Bitte versuchen Sie es in <xliff:g id="NUMBER">%d</xliff:g> Sekunden erneut."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"App ist nicht auf dem Telefon installiert."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Apps verwalten"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Installierte Apps verwalten und entfernen"</string>
@@ -1239,8 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Nach Größe sortieren"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Aktive Dienste anzeigen"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Prozesse im Cache anzeigen"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"App für Notfallbenachrichtigungen"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"App-Einstell. zurücksetzen"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"App-Einstellungen zurücksetzen?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Dies wird die folgenden Einstellungen zurücksetzen:\n\n "<li>"Deaktivierte Apps"</li>\n" "<li>"Deaktivierte App-Benachrichtigungen"</li>\n" "<li>"Standard-Apps für bestimmte Aktionen"</li>\n" "<li>"Einschränkungen der Hintergrunddaten für Apps"</li>\n" "<li>"Jegliche Zugriffsbeschränkungen"</li>\n\n" Alle App-Daten bleiben erhalten."</string>
@@ -1444,8 +1480,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Alle Bluetooth HCI-Pakete in einer Datei erfassen"</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="select_logd_size_title" msgid="7433137108348553508">"Logger-Puffergrößen"</string>
@@ -1746,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 Stunden"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 Tag"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Systemprozesse anzeigen"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"System ausblenden"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"USS verwenden"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistiktyp"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Hintergrund"</string>
@@ -1842,7 +1877,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Aktuelles Passwort:"</string>
@@ -2217,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Nutzer"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Eingeschränkte Profile"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Neuen Nutzer hinzufügen?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Sie können dieses Gerät für andere Nutzer freigeben, indem Sie weitere Nutzer erstellen. Jeder Nutzer erhält einen eigenen Bereich, in dem er Apps, den Hintergrund usw. personalisieren kann. Jeder Nutzer kann zudem Geräteeinstellungen wie WLAN ändern, die sich auf alle Nutzer auswirken.\n\nWenn Sie einen neuen Nutzer hinzufügen, muss dieser seinen Bereich einrichten.\n\nJeder Nutzer kann Apps für alle anderen Nutzer aktualisieren."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Sie können dieses Gerät für andere Nutzer freigeben, indem Sie weitere Nutzer erstellen. Jeder Nutzer erhält einen eigenen Bereich, in dem er Apps, den Hintergrund usw. personalisieren kann. Jeder Nutzer kann zudem Geräteeinstellungen wie WLAN ändern, die sich auf alle Nutzer auswirken.\n\nWenn Sie einen neuen Nutzer hinzufügen, muss dieser seinen Bereich einrichten.\n\nJeder Nutzer kann Apps für alle anderen Nutzer aktualisieren."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Wenn Sie einen neuen Nutzer hinzufügen, muss dieser seinen Bereich einrichten.\n\nJeder Nutzer kann Apps für alle anderen Nutzer aktualisieren."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Nutzer jetzt einrichten?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Die Person muss Zugang zu dem Gerät haben und ihren Speicherplatz einrichten."</string>
@@ -2397,10 +2431,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"einschränkung einschränken eingeschränkt"</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_reset_apps" msgid="6420313678620788457">"Standardeinstellung für das Zurücksetzen"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"notfall app standard"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"App-System für App-Download"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"App-Berechtigungen – Sicherheit"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"Apps-Standardeinstellung"</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>
@@ -2415,14 +2449,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Weckerlautstärke"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Klingeltonlautstärke"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Benachrichtigungslautstärke"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Unterbrechungen blockieren"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Nur wichtige Unterbr. zulassen"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatische Regeln"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Bei eingehenden Anrufen und Benachrichtigungen"</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_alarms" msgid="7380265858042606857">"Nur Alarme zulassen"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Nicht unterbrechen"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Nur wichtige Unterbrechungen"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Nur Wecker"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Keine Unterbrechungen"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Klingelton"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Standardton für Benachrichtigungen"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Bei Anrufen auch vibrieren"</string>
@@ -2455,15 +2487,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Keine Benachrichtigungs-Listener installiert"</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> aktivieren?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> darf alle Benachrichtigungen lesen, die vom System oder einer installierten App gesendet werden. Darin können personenbezogene Daten wie Kontaktnamen oder Inhalte der an Sie gesendeten Nachrichten enthalten sein. Der Listener kann diese Benachrichtigungen außerdem schließen oder Schaltflächen in den Benachrichtigungen betätigen."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Bedingungsanbieter"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Keine der Apps enthalten Bedingungen."</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d Apps enthalten Bedingungen</item>
-      <item quantity="one">%d App enthält Bedingungen</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Es sind keine Bedingungsanbieter installiert."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> aktivieren?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> kann Ausstiegsbedingungen zum Modus \"Nicht stören\" hinzufügen."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Apps werden geladen..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Alle blockieren"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Benachrichtigungen von dieser App nie anzeigen"</string>
@@ -2477,17 +2500,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Wichtig"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensibel"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Regelname"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Regel hinzufügen"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Regel löschen"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Regel \"<xliff:g id="RULE">%1$s</xliff:g>\" löschen?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Löschen"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Regeltyp"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Unbekannt"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Regel konfigurieren"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Regel planen"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Regel nicht gefunden"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Tage"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Keine"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Täglich"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nie"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> bis <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2497,15 +2526,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Wecker"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Erinnerungen"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Termine"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Ausgewählte Anrufer"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Wiederholte Anrufer"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Zulassen, falls dieselbe Person innerhalb von <xliff:g id="MINUTES">%d</xliff:g> Minuten erneut anruft"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Autom. aktivieren"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nie"</string>
     <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">"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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"Am nächsten Tag um <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"In welchen Fällen möchten Sie unterbrochen werden?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Wie lange?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Unbegrenzt"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> Minuten</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> Minute</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> Stunden</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> Stunde</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Für unbegrenzte Zeit zur Option \"Nur wichtige Benachrichtigungen\" wechseln"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Für <xliff:g id="DURATION">%1$d</xliff:g> Minuten bis <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> zur Option \"Nur wichtige Benachrichtigungen\" wechseln</item>
+      <item quantity="one">Für eine Minute bis <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> zur Option \"Nur wichtige Benachrichtigungen\" wechseln</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Für <xliff:g id="DURATION">%1$d</xliff:g> Stunden bis <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> zur Option \"Nur wichtige Benachrichtigungen\" wechseln</item>
+      <item quantity="one">Für eine Stunde bis <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> zur Option \"Nur wichtige Benachrichtigungen\" wechseln</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Für unbegrenzte Zeit zur Option \"Nur Wecker\" wechseln"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Für <xliff:g id="DURATION">%1$d</xliff:g> Minuten bis <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> zur Option \"Nur Wecker\" wechseln</item>
+      <item quantity="one">Für eine Minute bis <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> zur Option \"Nur Wecker\" wechseln</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Für <xliff:g id="DURATION">%1$d</xliff:g> Stunden bis <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> zur Option \"Nur Wecker\" wechseln</item>
+      <item quantity="one">Für eine Stunde bis <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> zur Option \"Nur Wecker\" wechseln</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Für unbegrenzte Zeit zur Option \"Nicht unterbrechen\" wechseln"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Für <xliff:g id="DURATION">%1$d</xliff:g> Minuten bis <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> zur Option \"Nicht unterbrechen\" wechseln</item>
+      <item quantity="one">Für eine Minute bis <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> zur Option \"Nicht unterbrechen\" wechseln</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Für <xliff:g id="DURATION">%1$d</xliff:g> Stunden bis <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> zur Option \"Nicht unterbrechen\" wechseln</item>
+      <item quantity="one">Für eine Stunde bis <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> zur Option \"Nicht unterbrechen\" wechseln</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Zur Option \"Immer unterbrechen\" wechseln"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"Dauerhaft"</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>
@@ -2570,7 +2660,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> Berechtigungen gewährt</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> Berechtigung gewährt</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> von <xliff:g id="COUNT_3">%d</xliff:g> Berechtigungen gewährt</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> von <xliff:g id="COUNT_1">%d</xliff:g> Berechtigung gewährt</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Einige Standardeinstellungen festgelegt"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Keine Standardeinstellungen festgelegt"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Alle Apps"</string>
@@ -2581,8 +2674,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Wichtig"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensibel"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Mit Domain-URLs"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Einstellungen für alle Apps auf Standard zurücksetzen"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> Apps installiert, einschließlich System-Apps und heruntergeladener Apps"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Vom Administrator deaktiviert"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Erweitert"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Unbekannte App"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Profil auswählen"</string>
@@ -2597,4 +2689,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> Apps können ihre Domain-URLs öffnen.</item>
       <item quantity="one">Eine App kann ihre Domain-URLs öffnen.</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Nicht erkannt"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Standard-Apps"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Browser-App"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Kein Standardbrowser"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Standard)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 7fdcd4a..9ee1117 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Πάτημα κουμπιού"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"χαμηλή"</item>
     <item msgid="4212263919458209842">"κρίσιμη"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Ανενεργό"</item>
-    <item msgid="5656544177755411222">"Περιορισμένες διακοπές"</item>
-    <item msgid="8735337502532332056">"Χωρίς διακοπές"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Κανονική"</item>
     <item msgid="866544120205026771">"Μέτρια"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index f51bb13..4377d09 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Κάρτα SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Ρυθμίσεις διακομιστή μεσολάβησης"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ΝΑΙ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"ΟΧΙ"</string>
-    <string name="forget" msgid="7267115980248732932">"ΔΙΑΓΡΑΦΗ"</string>
+    <string name="forget" msgid="1400428660472591263">"Διαγραφή"</string>
+    <string name="save" msgid="879993180139353333">"Αποθήκευση"</string>
+    <string name="done" msgid="6942539184162713160">"Τέλος"</string>
     <string name="settings_label" msgid="1626402585530130914">"Ρυθμίσεις"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Ρυθμίσεις"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Συντόμευση ρυθμίσεων"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Συνδέστε τον φορτιστή σας και δοκιμάστε ξανά."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Δεν υπάρχει κωδικός PIN ή κωδικός πρόσβασης κλειδώματος οθόνης"</string>
     <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">"Η λειτουργία κρυπτογράφησης είναι μη αναστρέψιμη και, αν τη διακόψετε, θα χαθούν δεδομένα. Η κρυπτογράφηση διαρκεί μια ώρα ή και περισσότερο, κατά τη διάρκεια της οποίας θα γίνει πολλές φορές επανεκκίνηση του tablet."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Η λειτουργία κρυπτογράφησης είναι μη αναστρέψιμη και, αν τη διακόψετε, θα χαθούν δεδομένα. Η κρυπτογράφηση διαρκεί μια ώρα ή και περισσότερο, κατά τη διάρκεια της οποίας θα γίνει πολλές φορές επανεκκίνηση του τηλεφώνου."</string>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Για προχωρημένους"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Προηγμένες ρυθμίσεις Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Eνεργοποιήστε το Bluetooth."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"Για τη βελτίωση του εντοπισμού τοποθεσίας, οι υπηρεσίες Google θα κάνουν σάρωση για συσκευές Bluetooth, ακόμα και όταν το Bluetooth είναι απενεργοποιημένο. Μπορείτε να αλλάξετε την επιλογή από τις LINK_BEGINρυθμίσεις σάρωσηςLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Για τη βελτίωση του εντοπισμού τοποθεσίας, οι εφαρμογές και οι υπηρεσίες θα εκτελούν σάρωση για συσκευές Bluetooth, ακόμα και όταν το Bluetooth είναι απενεργοποιημένο. Μπορείτε να αλλάξετε την επιλογή από τις <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ρυθμίσεις σάρωσης<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Σύνδεση σε..."</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> θα αποσυνδεθεί από τον ήχο handsfree."</string>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"Για τη βελτίωση του εντοπισμού τοποθεσίας, οι υπηρεσίες Google θα κάνουν σάρωση για δίκτυα Wi-Fi, ακόμα και όταν το Wi-Fi είναι απενεργοποιημένο. Μπορείτε να αλλάξετε την επιλογή από τις LINK_BEGINρυθμίσεις σάρωσηςLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Για τη βελτίωση του εντοπισμού τοποθεσίας, οι εφαρμογές και οι υπηρεσίες θα εκτελούν σάρωση για δίκτυα Wi‑Fi, ακόμα και όταν το Wi‑Fi είναι απενεργοποιημένο. Μπορείτε να αλλάξετε την επιλογή από τις <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ρυθμίσεις σάρωσης<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Να μην εμφανιστεί ξανά"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Να παραμένει ενεργοποιημένο το Wi-Fi κατά την αναστολή λειτουργίας"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Ενεργό Wi-Fi κατά την αδράνεια"</string>
@@ -604,8 +601,6 @@
     <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_apps" msgid="6003687912727859577">"Εμφάνιση εφαρμογών"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Εμφάνιση ισχύος WiFi"</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>
@@ -663,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Να γίνει σύνδεση στο σημείο πρόσβασης Wi-Fi;"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"Η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> απαιτεί σύνδεση διαδικτύου, πριν από τη σύνδεση στο δίκτυο."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ΣΥΝΔΕΣΗ"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Αυτό το δίκτυο δεν έχει πρόσβαση στο διαδίκτυο. Χρήση αυτού του δικτύου ούτως ή άλλως;"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Να μην ερωτηθώ ξανά γι\' αυτό το δίκτυο"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Σύνδεση"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Αποτυχία σύνδεσης στο δίκτυο"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Να διαγραφεί από τη μνήμη"</string>
@@ -729,21 +726,17 @@
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Φορητό σημείο πρόσβασης 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">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Κλήση Wi-Fi"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Προτίμηση κλήσεων"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Λειτουργία κλήσης Wi-Fi"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Προτίμηση Wi-Fi"</item>
     <item msgid="5267397515594230396">"Προτίμηση δικτύου κινητής τηλεφωνίας"</item>
-    <item msgid="3132912693346866895">"Μόνο Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Όταν είναι ενεργοποιημένη η λειτουργία κλήσης μέσω Wi-Fi, το τηλέφωνό σας μπορεί να δρομολογεί κλήσεις μέσω δικτύων Wi-Fi ή του δικτύου της εταιρείας κινητής τηλεφωνίας, ανάλογα με την προτίμησή σας και την ισχύ του κάθε σήματος. Πριν ενεργοποιήσετε τη λειτουργία, ρωτήστε την εταιρεία κινητής τηλεφωνίας για να μάθετε σχετικά με τις χρεώσεις και άλλες λεπτομέρειες."</string>
     <string name="home_settings" msgid="212375129455718176">"Αρχική σελίδα"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Προβολή"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ήχος"</string>
@@ -915,12 +908,12 @@
     <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="5128673488173839077">"Εφαρμογές και δεδομένα εφαρμογής"</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">"Ήχος (μουσική, ήχοι κλήσης, podcast κλπ.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Διάφορα"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Άλλα αρχεία"</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>
@@ -953,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Αφαίρεση σε εξέλιξη"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Ο χώρος αποθήκευσης εξαντλείται"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Ορισμένες λειτουργίες συστήματος, όπως ο συγχρονισμός ενδέχεται να μην λειτουργούν σωστά. Δοκιμάστε να αποδεσμεύσετε χώρο διαγράφοντας ή ξεκαρφιτσώνοντας στοιχεία, όπως εφαρμογές ή περιεχόμενο μέσων."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Μετονομασία"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Προσάρτηση"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Εξαγωγή"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Διαγραφή δεδομένων και μορφ."</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Διαγ.δεδ. και μορφ.εσ.απ.χώρου"</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>
@@ -963,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Επιτρέπει στις εφαρμογές με ενεργοποιημένο MIDI να λειτουργούν μέσω USB με λογισμικό MIDI στον υπολογιστή σας."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Άλλοι χρήστες"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Αποθηκευτικός χώρος συσκευής"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Αφαιρούμενος αποθηκ. χώρος"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> ελεύθερα (Σύνολο <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Προσαρτήθηκε <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Δεν ήταν δυνατή η προσάρτηση <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"Έγινε εξαγωγή του <xliff:g id="NAME">%1$s</xliff:g> με ασφάλεια"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Δεν ήταν δυνατή η εξαγωγή του <xliff:g id="NAME">%1$s</xliff:g> με ασφάλεια"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"Το <xliff:g id="NAME">%1$s</xliff:g> μορφοποιήθηκε"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Δεν ήταν δυνατή η μορφοποίηση <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Μετονομασία αποθηκευτικού χώρου"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Μετά τη μορφοποίηση, μπορείτε να χρησιμοποιήσετε αυτό το μέσο αποθήκευσης <xliff:g id="NAME_0">^1</xliff:g> σε άλλες συσκευές. \n\nΌλα τα δεδομένα σε αυτό το μέσο <xliff:g id="NAME_1">^1</xliff:g> θα διαγραφούν. Εξετάστε το ενδεχόμενο να δημιουργήσετε πρώτα αντίγραφα ασφαλείας. \n\n"<b>"Δημιουργήσετε αντίγραφα ασφαλείας για τις φωτογραφίες και άλλα μέσα"</b>" \nΜετακίνηστε τα αρχεία πολυμέσων σας σε έναν εναλλακτικό αποθηκευτικό χώρο στη συσκευή ή μεταφέρετέ τα σε έναν υπολογιστή χρησιμοποιώντας ένα καλώδιο USB. \n\n"<b>"Δημιουργήστε αντίγραφα ασφαλείας για τις συσκευές"</b>" \nΌλες οι εφαρμογές που είναι αποθηκευμένες σε αυτό το μέσο αποθήκευσης <xliff:g id="NAME_6">^1</xliff:g> θα απεγκατασταθούν και τα δεδομένα τους θα διαγραφούν. Για να διατηρήσετε αυτές τις εφαρμογές, μετακινήστε τις σε έναν εναλλακτικό αποθηκευτικό χώρο σε αυτήν τη συσκευή."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Όταν αφαιρέσετε αυτό το μέσο αποθήκευσης <xliff:g id="NAME_0">^1</xliff:g>, οι εφαρμογές που είναι αποθηκευμένες σε αυτό θα σταματήσουν να λειτουργούν και τα αρχεία μέσων που είναι αποθηκευμένα σε αυτό δεν θα είναι διαθέσιμα πριν από την εκ νέου εισαγωγή τους."</b>" \n\nΑυτό το μέσο αποθήκευσης <xliff:g id="NAME_1">^1</xliff:g> έχει μορφοποιηθεί έτσι ώστε να λειτουργεί μόνο σε αυτήν τη συσκευή. Δεν θα λειτουργεί σε άλλες συσκευές."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Ρυθμίστε τη μέσο αποθήκευσης <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Χρήση ως φορητού αποθηκευτικού χώρου"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Για τη μετακίνηση των φωτογραφιών και άλλων πολυμέσων μεταξύ συσκευών."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Χρήση ως εσωτερικού αποθηκευτικού χώρου"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Για την αποθήκευση περιεχομένου σε αυτήν τη συσκευή μόνο, συμπεριλαμβανομένων εφαρμογών και φωτογραφιών, απαιτείται μορφοποίηση που παρεμποδίζει τη λειτουργία σε άλλες συσκευές."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Μορφοπ. ως εσωτ.αποθ.χώρου"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Αυτό απαιτεί τη μορφοποίηση του μέσου αποθήκευσης <xliff:g id="NAME_0">^1</xliff:g> προκειμένου να είναι ασφαλές. \n\nΜετά τη μορφοποίηση, αυτό το μέσο αποθήκευσης <xliff:g id="NAME_1">^1</xliff:g> θα λειτουργεί μόνο σε αυτήν τη συσκευή. \n\n"<b>"Η μορφοποίηση διαγράφει όλα τα δεδομένα που είναι αποθηκευμένα αυτήν τη στιγμή στο μέσο αποθήκευσης <xliff:g id="NAME_2">^1</xliff:g>."</b>" Για να αποφύγετε την απώλεια των δεδομένων σας, εξετάστε το ενδεχόμενο να δημιουργήσετε αντίγραφα ασφαλείας γι΄αυτά."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Διαγραφή δεδομένων και μορφ."</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Μορφοποίηση μέσου αποθήκευσης <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Μην αφαιρέσετε το μέσο αποθήκευσης <xliff:g id="NAME">^1</xliff:g> κατά τη μορφοποίηση."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Μετακίνηση δεδ.σε νέο χώρο αποθ."</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Μπορείτε να μετακινήσετε τις φωτογραφίες, τα αρχεία και τα δεδομένα της εφαρμογής σας σε αυτό το νέο μέσο αποθήκευσης <xliff:g id="NAME">^1</xliff:g>. \n\nΗ μετακίνηση διαρκεί περίπου <xliff:g id="TIME">^2</xliff:g> και θα απελευθερώσει <xliff:g id="SIZE">^3</xliff:g> στον εσωτερικό αποθηκευτικό χώρο. Ορισμένες εφαρμογές δεν θα λειτουργούν κατά τη διάρκεια της μετακίνησης."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Μετακίνηση τώρα"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Μετακίνηση αργότερα"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Μετακίνηση δεδομένων τώρα"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Η μετακίνηση διαρκεί περίπου <xliff:g id="TIME">^1</xliff:g>. Θα απελευθερωθούν <xliff:g id="SIZE">^2</xliff:g> εσωτερικού αποθηκευτικού χώρου."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Μετακίνηση"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Μετακίνηση δεδομένων…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Κατά τη διάρκεια της μετακίνησης: \n• Μην αφαιρέσετε το μέσο αποθήκευσης <xliff:g id="NAME">^1</xliff:g>. \n• Ορισμένες εφαρμογές δεν θα λειτουργούν σωστά. \n• Διατηρείτε φορτισμένη τη συσκευή."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"Ο χώρος αποθήκ. <xliff:g id="NAME">^1</xliff:g> είναι έτοιμος"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Το μέσο αποθήκευσης <xliff:g id="NAME">^1</xliff:g> είναι έτοιμο για χρήση φωτογραφιών και άλλων μέσων."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Το νέο μέσο αποθήκευσης <xliff:g id="NAME">^1</xliff:g> λειτουργεί. \n\n Για να μετακινήσετε φωτογραφίες, αρχεία και δεδομένα εφαρμογών σε αυτήν τη συσκευή, μεταβείτε στις Ρυθμίσεις &gt; Αποθηκευτικός χώρος."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Μετακίνηση <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Η μετακίνηση της εφαρμογής <xliff:g id="APP">^1</xliff:g> και των δεδομένων της στο μέσο αποθήκευσης <xliff:g id="NAME_0">^2</xliff:g> θα διαρκέσει μόνο μερικά λεπτά. Δεν θα έχετε τη δυνατότητα να χρησιμοποιήσετε την εφαρμογή έως ότου ολοκληρωθεί η μετακίνηση. \n\nΜην αφαιρέσετε το μέσο αποθήκευσης <xliff:g id="NAME_1">^2</xliff:g> κατά τη διάρκεια της μετακίνησης."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Μετακίνηση <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Μην αφαιρέσετε το μέσο αποθήκευσης <xliff:g id="NAME">^1</xliff:g> κατά τη διάρκεια της μετακίνησης. \n\n Η εφαρμογή <xliff:g id="APP">^2</xliff:g> σε αυτήν τη συσκευή δεν θα είναι διαθέσιμη έως ότου ολοκληρωθεί η μετακίνηση."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Ακύρωση μετακίνησης"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Κατάσταση μπαταρίας"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Επίπεδο μπαταρίας"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Επαναφορά στις προεπιλογές"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Η επαναφορά των εργοστασιακών ρυθμίσεων APN ολοκληρώθηκε."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Επαναφορά των ρυθμίσεων δικτύου"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Αυτό θα επαναφέρει όλες τις ρυθμίσεις που σχετίζονται με τα δίκτυα στις εργοστασιακές προεπιλογές, συμπεριλαμβανομένων:\n\n"<li>"Wi-Fi"</li>\n<li>"Δεδομένα κινητής τηλεφωνίας"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Με αυτόν τον τρόπο θα γίνει επαναφορά όλων των ρυθμίσεων δικτύου, μεταξύ των οποίων για:\n\n"<li>"Wi‑Fi"</li>\n<li>"Δεδομένα κινητής τηλεφωνίας"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Επαναφορά ρυθμίσεων"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Επαναφορά όλων των ρυθμίσεων δικτύου; Δεν είναι δυνατή η αναίρεση αυτής της ενέργειας!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Επαναφορά όλων των ρυθμίσεων δικτύου; Δεν είναι δυνατή η αναίρεση αυτής της ενέργειας!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Επαναφορά ρυθμίσεων"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε την επαναφορά των ρυθμίσεων δικτύου."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Να γίνει επαναφορά;"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Έγινε επαναφορά των ρυθμίσεων δικτύου"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Έγινε επαναφορά των ρυθμίσεων δικτύου."</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Επαναφορά συσκευής"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Επαναφορά εργοστασιακών δεδομένων"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον "<b>"εσωτερικό χώρο αποθήκευσης"</b>" της συσκευής σας tablet, συμπεριλαμβανομένων:\n\nΤων δεδομένων και των ρυθμίσεων συστήματος "<li>"του Λογαριασμού σας Google "</li>\n<li></li>\n<li>"Ληφθείσες εφαρμογές"</li></string>
@@ -1029,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Διαγράψτε όλα τα δεδομένα που υπάρχουν στην κάρτα SD, όπως αρχεία μουσικής και φωτογραφίες"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Επαναφορά tablet"</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="1062841478823409667">"Να διαγραφούν όλα τα προσωπικά σας στοιχεία και οι ληφθείσες εφαρμογές; Δεν είναι δυνατή η αναίρεση αυτής της ενέργειας!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Διαγραφή όλων"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Η επαναφορά των εργοστασιακών ρυθμίσεων δεν είναι διαθέσιμη γι\' αυτόν το χρήστη"</string>
@@ -1048,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Ορισμ.αυτόμ.τηλεφ., προώθ.κλήσης, αναμ.κλήσης, αναγν.κλήσ."</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Πρόσδεση USB"</string>
@@ -1081,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Βοήθεια"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Δίκτυα κινητής τηλεφωνίας"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Πρόγραμμα κινητής τηλεφωνίας"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Προεπιλεγμένη εφαρμογή SMS"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Εφαρμογή SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Αλλαγή εφαρμογής SMS;"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Χρήση του <xliff:g id="NEW_APP">%1$s</xliff:g> αντί του <xliff:g id="CURRENT_APP">%2$s</xliff:g> ως εφαρμογή SMS;"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Χρήση του <xliff:g id="NEW_APP">%s</xliff:g> ως εφαρμογή SMS;"</string>
@@ -1112,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Χρήση GPS για τον προσδιορισμό της τοποθεσίας"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Σάρωση"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Σάρωση"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Σάρωση Wi-Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Βελτιώστε την τοποθεσία επιτρέποντας σε εφαρμογές και υπηρεσίες να εκτελούν σάρωση για δίκτυα Wi-Fi, ακόμη και όταν το Wi-Fi είναι απενεργοποιημένο"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Σάρωση Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Βελτιώστε την τοποθεσία επιτρέποντας στις υπηρεσίες συστήματος για να εκτελούν σάρωση για υπηρεσίες Bluetooth, ακόμη και όταν το Bluetooth είναι απενεργοποιημένο"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi και τοποθ. δικτύου κιν. τηλ."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Να επιτρέπεται στις εφαρμογές να χρησιμοποιούν την υπηρεσία τοποθεσίας της Google για γρήγορη εκτίμηση της τοποθεσίας σας. Θα συλλεχθούν ανώνυμα δεδομένα και θα αποσταλούν στην Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Η τοποθεσία καθορίζεται από το Wi-Fi"</string>
@@ -1157,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Ο κωδικός πρόσβασης έχει οριστεί"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Ο αριθμός PIN έχει οριστεί"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Το μοτίβο έχει οριστεί"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Χρησιμοποιήστε το μοτιβό της συσκευής σας για να συνεχίσετε."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Εισαγάγετε το PIN της συσκευής σας για να συνεχίσετε."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Εισαγάγετε τον κωδικό πρόσβασης της συσκευής σας για να συνεχίσετε."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Εσφαλμένος κωδικός PIN"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Εσφαλμένος κωδικός πρόσβασης"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Εσφαλμένο μοτίβο"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Ασφάλεια συσκευής"</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_wrong" msgid="4694973540770105678">"Επανάληψη:"</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>
@@ -1183,8 +1224,7 @@
     <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" msgid="6909161623701848863">"Πάρα πολλές αποτυχημένες προσπάθειες. Δοκιμάστε ξανά σε <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>
@@ -1235,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Ταξινόμηση με βάση μέγεθος"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Εμφ. υπ. που εκτελούνται"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Εμφ. διαδ. προσωρ. μνήμης"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Εφαρμογή έκτακτης ανάγκης"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Επαναφ. προτιμ. εφαρμ."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Επαναφ. προτιμ. εφαρμ;"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Με αυτόν τον τρόπο θα γίνει επαναφορά όλων των προτιμήσεων για:\n\n "<li>"Απενεργοποιημένες εφαρμογές"</li>\n" "<li>"Απενεργοποιημένες ειδοποιήσεις εφαρμογών"</li>\n" "<li>"Προεπιλεγμένες εφαρμογές για ενέργειες"</li>\n" "<li>"Περιορισμούς δεδομένων παρασκηνίου για εφαρμογές"</li>\n" "<li>"Τυχόν περιορισμούς αδειών"</li>\n\n" Δεν θα χάσετε τυχόν δεδομένα εφαρμογών."</string>
@@ -1440,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Καταγραφή όλων των πακέτων bluetooth HCI σε ένα αρχείο"</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="select_logd_size_title" msgid="7433137108348553508">"Μέγεθος προσωρινής μνήμης για τη λειτουργία καταγραφής"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 ώρες"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 ημέρα"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Εμφάνιση συστήματος"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Απόκρυψη συστήματος"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Χρήση Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Τύπος στατιστικών στοιχείων"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Φόντο"</string>
@@ -1838,7 +1876,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_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>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Χρήστης"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Προφίλ περιορ. πρόσβασης"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Προσθήκη νέου χρήστη;"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Μπορείτε να μοιραστείτε αυτήν τη συσκευή με άλλα άτομα, δημιουργώντας επιπλέον χρήστες. Κάθε χρήστης θα έχει το δικό του χώρο, τον οποίο μπορεί να προσαρμόσει με τις δικές του εφαρμογές, ταπετσαρία κ.λπ. Οι χρήστες μπορούν επίσης να προσαρμόσουν ρυθμίσεις της συσκευής, όπως το Wi‑Fi, που επηρεάζουν τους πάντες.\n\nΚατά την προσθήκη ενός νέου χρήστη, αυτός θα πρέπει να ρυθμίσει το χώρο του.\n\nΟποιοσδήποτε χρήστης μπορεί να ενημερώσει τις εφαρμογές για όλους τους άλλους χρήστες."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Μπορείτε να μοιραστείτε αυτήν τη συσκευή με άλλα άτομα, δημιουργώντας επιπλέον χρήστες. Κάθε χρήστης θα έχει το δικό του χώρο, τον οποίο μπορεί να προσαρμόσει με τις δικές του εφαρμογές, ταπετσαρία κ.λπ. Οι χρήστες μπορούν επίσης να προσαρμόσουν ρυθμίσεις της συσκευής, όπως το Wi‑Fi, που επηρεάζουν τους πάντες.\n\nΚατά την προσθήκη ενός νέου χρήστη, αυτός θα πρέπει να ρυθμίσει το χώρο του.\n\nΟποιοσδήποτε χρήστης μπορεί να ενημερώσει τις εφαρμογές για όλους τους άλλους χρήστες."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Κατά την προσθήκη ενός νέου χρήστη, αυτός θα πρέπει να ρυθμίσει το χώρο του.\n\nΟποιοσδήποτε χρήστης μπορεί να ενημερώσει τις εφαρμογές για όλους τους άλλους χρήστες."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Να γίνει ρύθμιση χρήστη τώρα;"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Βεβαιωθείτε ότι ο χρήστης μπορεί να πάρει τη συσκευή και ρυθμίστε το χώρο του"</string>
@@ -2395,10 +2432,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"περιορισμός περιορίζω περιορίστηκε"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"διόρθωση κειμένου διόρθωση ήχου δόνηση αυτόματο γλώσσα κίνηση προτείνω πρόταση θέμα προσβλητικό λέξη τύπος emoticon διεθνές"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"επαναφορά προεπιλεγμένων προτιμήσεων"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"Προεπιλογή εφαρμογής για περιπτώσεις έκτακτης ανάγκης"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"εφαρμογές λήψη εφαρμογές σύστημα"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"ασφάλεια δικαιωμάτων εφαρμογών"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"προεπιλεγμένες εφαρμογές"</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>
@@ -2413,14 +2450,12 @@
     <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="6948120138640252732">"Αποκλεισμός διακοπών"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Μόνο προτεραιότητας"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Αυτόματοι κανόνες"</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_alarms" msgid="7380265858042606857">"Να επιτρέπονται μόνο οι ειδοποιήσεις"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Χωρίς διακοπή"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Μόνο προτεραιότητας"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Μόνο ειδοποιήσεις"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Χωρίς διακοπές"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ήχος κλήσης τηλεφώνου"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Προεπιλεγμένος ήχος ειδοποίησης"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Επίσης δόνηση για κλήσεις"</string>
@@ -2453,15 +2488,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Δεν έχουν εγκατασταθεί υπηρεσίες ακρόασης ειδοποιήσεων."</string>
     <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">"Καμία εφαρμογή δεν παρέχει συνθήκες"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d εφαρμογές παρέχουν συνθήκες</item>
-      <item quantity="one">%d εφαρμογή παρέχει συνθήκες</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="loading_notification_apps" msgid="5031818677010335895">"Φόρτωση εφαρμογών…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Αποκλεισμός όλων"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Να μην εμφανίζονται ποτέ ειδοποιήσεις από αυτήν την εφαρμογή"</string>
@@ -2475,17 +2501,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"Όνομα κανόνα"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Προσθήκη κανόνα"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Διαγραφή κανόνα"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Διαγραφή κανόνα \"<xliff:g id="RULE">%1$s</xliff:g>\";"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Διαγραφή"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Τύπος κανόνα"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Άγνωστο"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Διαμόρφωση κανόνων"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Κανόνας χρονοδιαγράμματος"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Ο κανόνας δεν βρέθηκε."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Ημέρες"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Κανένα"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Κάθε ημέρα"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Ποτέ"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> έως <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Κλήσεις"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Μηνύματα"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Κλήσεις/μηνύματα από"</string>
@@ -2495,15 +2527,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Ξυπνητήρια"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Υπενθυμίσεις"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Εκδηλώσεις"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Επιλεγμένοι καλούντες"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Καλούντες κατ\' επανάληψη"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Εάν το ίδιο άτομο καλέσει δεύτερη φορά εντός διαστήματος <xliff:g id="MINUTES">%d</xliff:g> λεπτών, να επιτρέπεται"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> την επόμενη ημέρα"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Πότε θέλετε να λαμβάνετε διακοπές;"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Για πόσο καιρό;"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Επ\' αόριστον"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> λεπτά</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> λεπτό</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ώρες</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ώρα</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Αλλαγή σε ειδοποιήσεις προτεραιότητας μόνο επ\' αόριστον"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Αλλαγή σε ειδοποιήσεις προτεραιότητας μόνο για <xliff:g id="DURATION">%1$d</xliff:g> λεπτά έως τις <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Αλλαγή σε ειδοποιήσεις προτεραιότητας μόνο για ένα λεπτό έως τις <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Αλλαγή σε ειδοποιήσεις προτεραιότητας μόνο για <xliff:g id="DURATION">%1$d</xliff:g> ώρες (έως τις <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Αλλαγή σε ειδοποιήσεις προτεραιότητας μόνο για μία ώρα, έως τις <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Αλλαγή σε ξυπνητήρια μόνο επ\' αόριστον"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Αλλαγή σε ξυπνητήρια μόνο για <xliff:g id="DURATION">%1$d</xliff:g> λεπτά (έως τις <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Αλλαγή σε ξυπνητήρια μόνο για ένα λεπτό έως τις <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Αλλαγή σε ξυπνητήρια μόνο για <xliff:g id="DURATION">%1$d</xliff:g> ώρες, έως τις <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Αλλαγή σε ξυπνητήρια μόνο για μία ώρα, έως τις <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Αλλαγή σε καμία διακοπή επ\' αόριστον"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Αλλαγή σε καμία διακοπή για <xliff:g id="DURATION">%1$d</xliff:g> λεπτά (έως τις <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Αλλαγή σε καμία διακοπή για ένα λεπτό έως τις <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Αλλαγή σε καμία διακοπή για <xliff:g id="DURATION">%1$d</xliff:g> ώρες, έως τις <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Αλλαγή σε καμία διακοπή για μία ώρα, έως τις <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Αλλαγή σε διακοπές πάντα"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"για πάντα"</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>
@@ -2568,7 +2661,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> άδειες χορηγήθηκαν</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> άδεια χορηγήθηκε</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other">Χορηγήθηκαν <xliff:g id="COUNT_2">%d</xliff:g> από <xliff:g id="COUNT_3">%d</xliff:g> άδειες</item>
+      <item quantity="one">Χορηγήθηκε <xliff:g id="COUNT_0">%d</xliff:g> από <xliff:g id="COUNT_1">%d</xliff:g> άδεια</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Έχουν οριστεί κάποιες προεπιλογές"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Δεν έχουν οριστεί προεπιλογές"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Όλες οι εφαρμογές"</string>
@@ -2579,8 +2675,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Προτεραιότητας"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Ευαίσθητες"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Με διευθύνσεις URL τομέα"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Επαναφορά προεπιλεγμένων προτιμήσεων σε όλες τις εφαρμογές"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"Εγκαταστάθηκαν <xliff:g id="COUNT">%d</xliff:g> εφαρμογές, συμπεριλαμβανομένων των εφαρμογών συστήματος και των λήψεων εφαρμογών"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Απενεργοποιήθηκε από το διαχειριστή"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Σύνθετες ρυθμίσεις"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Άγνωστη εφαρμογή"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Επιλογή προφίλ"</string>
@@ -2595,4 +2690,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> εφαρμογές μπορούν να ανοίξουν τις διευθύνσεις URL του τομέα τους</item>
       <item quantity="one">Μία εφαρμογή μπορεί να ανοίξει τις διευθύνσεις URL του τομέα της</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Δεν αναγνωρίστηκε"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Προεπιλεγμένες εφαρμογές"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Εφαρμογή προγρ.περιήγησης"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Κανένα προεπιλεγμένο πρόγραμμα περιήγησης"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Προεπιλογή)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml
index 3c2bf1a..3f09f20 100644
--- a/res/values-en-rAU/arrays.xml
+++ b/res/values-en-rAU/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Push button"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"low"</item>
     <item msgid="4212263919458209842">"critical"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Off"</item>
-    <item msgid="5656544177755411222">"Limited interruptions"</item>
-    <item msgid="8735337502532332056">"Zero interruptions"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Moderate"</item>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index e11fddc..71a8ff1 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD card"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy settings"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancel"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"CANCEL"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUE"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"YES"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NO"</string>
-    <string name="forget" msgid="7267115980248732932">"FORGET"</string>
+    <string name="forget" msgid="1400428660472591263">"Forget"</string>
+    <string name="save" msgid="879993180139353333">"Save"</string>
+    <string name="done" msgid="6942539184162713160">"Done"</string>
     <string name="settings_label" msgid="1626402585530130914">"Settings"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Settings"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Settings shortcut"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Please plug in your charger and try again."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"No lock-screen PIN or password"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"You need to set a lock screen PIN or password before you can start encryption."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"You need to draw your unlock pattern to confirm encrypting your device."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Encrypt?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"The encryption operation is irreversible and if you interrupt it, you\'ll lose data. Encryption takes an hour or more, during which the tablet will restart several times."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"The encryption operation is irreversible and if you interrupt it, you\'ll lose data. Encryption takes an hour or more, during which the phone will restart several times."</string>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Advanced"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Advanced Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"When Bluetooth is turned on, your device can communicate with other nearby Bluetooth devices."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"To improve location accuracy, Google services will scan for Bluetooth devices, even when Bluetooth is off. You can change this in LINK_BEGINscanning settingsLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"To improve location accuracy, apps and services will scan for Bluetooth devices, even when Bluetooth is off. You can change this in <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>scanning settings<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Connect to…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from media audio."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from hands-free audio."</string>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"To improve location accuracy, Google services will scan for Wi‑Fi networks, even when Wi‑Fi is off. You can change this in LINK_BEGINscanning settingsLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"To improve location accuracy, apps and services will scan for Wi‑Fi networks, even when Wi‑Fi is off. You can change this in <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>scanning settings<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Don\'t show again"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Keep Wi‑Fi on during sleep"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi on during sleep"</string>
@@ -604,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scan"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Advanced"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Show Apps"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Show Wi-Fi Strength"</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>
@@ -663,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Sign in to connect?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> requires you to sign in online before you connect to the network."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONNECT"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"This network has no Internet access. Use this network anyway?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Don\'t ask again for this network"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connect"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Failed to connect to network"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Forget"</string>
@@ -734,12 +731,10 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi preferred"</item>
     <item msgid="5267397515594230396">"Mobile preferred"</item>
-    <item msgid="3132912693346866895">"Wi-Fi only"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"When Wi-Fi calling is on, your phone can route calls via Wi-Fi networks or your operator\'s network, depending on your preference and which signal is stronger. Before turning on this feature, check with your operator regarding fees and other details."</string>
     <string name="home_settings" msgid="212375129455718176">"Home"</string>
@@ -913,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Available (read-only)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Total space"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calculating..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Apps (app data &amp; media content)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Apps &amp; app data"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Downloads"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Pictures, videos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (music, ringtones, podcasts, etc.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Misc."</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Other files"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Cached data"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Unmount shared storage"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Unmount SD card"</string>
@@ -951,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Unmount in progress"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Storage space is running out"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Some system functions, such as syncing, may not work correctly. Try to free space by deleting or unpinning items, such as apps or media content."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Rename"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Mount"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Eject"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Erase &amp; format"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Erase &amp; format as internal storage"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB computer connection"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB computer connection"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Connect as"</string>
@@ -961,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Lets MIDI-enabled applications work over USB with MIDI software on your computer."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Other users"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Device storage"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Removable storage"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> free (Total <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> is mounted"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Couldn\'t mount <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> is safely ejected"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Couldn\'t safely eject <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> is formatted"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Couldn\'t format <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Rename storage"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"After formatting, you can use this <xliff:g id="NAME_0">^1</xliff:g> in other devices. \n\nAll data on this <xliff:g id="NAME_1">^1</xliff:g> will be erased. Consider backing up first. \n\n"<b>"Back up photos &amp; other media"</b>" \nMove your media files to alternative storage on this device, or transfer them to a computer using a USB cable. \n\n"<b>"Back up apps"</b>" \nAll apps stored on this <xliff:g id="NAME_6">^1</xliff:g> will be uninstalled and their data will be erased. To keep these apps, move them to alternative storage on this device."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"When you eject this <xliff:g id="NAME_0">^1</xliff:g>, apps stored on it will stop working, and media files stored on it will not be available until it is reinserted."</b>" \n\nThis <xliff:g id="NAME_1">^1</xliff:g> is formatted to work on this device only. It won\'t work on any others."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Set up your <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Use as portable storage"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"For moving photos and other media between devices."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Use as internal storage"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"For storing anything on this device only, including apps and photos. Requires formatting that prevents it from working with other devices."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Format as internal storage"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"This requires the <xliff:g id="NAME_0">^1</xliff:g> to be formatted to make it secure. \n\nAfter formatting, this <xliff:g id="NAME_1">^1</xliff:g> will only work in this device. \n\n"<b>"Formatting erases all data currently stored on the <xliff:g id="NAME_2">^1</xliff:g>."</b>" To avoid losing the data, consider backing it up."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Erase &amp; format"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatting <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Don\'t remove the <xliff:g id="NAME">^1</xliff:g> while it\'s formatting."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Move data to new storage"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"You can move your photos, files and app data to this new <xliff:g id="NAME">^1</xliff:g>. \n\nThe move takes about <xliff:g id="TIME">^2</xliff:g> and will free <xliff:g id="SIZE">^3</xliff:g> on internal storage. Some apps won\'t work while it\'s underway."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Move now"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Move later"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Move data now"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"The move takes about <xliff:g id="TIME">^1</xliff:g>. It will free <xliff:g id="SIZE">^2</xliff:g> of internal storage."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Move"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Moving data…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"During the move: \n• Don\'t remove the <xliff:g id="NAME">^1</xliff:g>. \n• Some apps won\'t work correctly. \n• Keep the device charged."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> is ready"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Your <xliff:g id="NAME">^1</xliff:g> is all set to use with photos and other media."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Your new <xliff:g id="NAME">^1</xliff:g> is working. \n\nTo move photos, files and app data to this device, go to Settings &gt; Storage."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Move <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Moving <xliff:g id="APP">^1</xliff:g> and its data to <xliff:g id="NAME_0">^2</xliff:g> will take only a few moments. You won\'t be able to use the app until the move is complete. \n\nDon\'t remove the <xliff:g id="NAME_1">^2</xliff:g> during the move."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Moving <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Don\'t remove the <xliff:g id="NAME">^1</xliff:g> during the move. \n\nThe <xliff:g id="APP">^2</xliff:g> app on this device won\'t be available until the move is complete."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancel move"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Battery status"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Battery level"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1005,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Reset to default"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Reset default APN settings completed"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Network settings reset"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"This will reset all settings related to networking to the factory defaults, including:\n\n"<li>"Wi-Fi"</li>\n<li>"Mobile data"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"This will reset all network settings, including:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobile data"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Reset settings"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Reset all network settings? You can\'t reverse this action!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Reset all network settings? You can\'t undo this action!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Reset settings"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"You need to draw your unlock pattern to confirm a network settings reset."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Reset?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Network settings reset"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Network settings have been reset"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Reset device"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Factory data reset"</string>
     <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>
@@ -1027,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Erase all the data on the SD card, such as music or photos"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Reset tablet"</string>
     <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_desc" msgid="1062841478823409667">"Erase all your personal information and downloaded apps? You can\'t undo this action!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Erase everything"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Factory reset is not available for this user"</string>
@@ -1046,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Set up voicemail, call forwarding, call waiting, caller ID"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB tethering"</string>
@@ -1079,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Help"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobile networks"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobile plan"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Default SMS app"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS app"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Change SMS app?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Use <xliff:g id="NEW_APP">%1$s</xliff:g> instead of <xliff:g id="CURRENT_APP">%2$s</xliff:g> as your SMS app?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Use <xliff:g id="NEW_APP">%s</xliff:g> as your SMS app?"</string>
@@ -1110,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Use GPS to determine location"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Scanning"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Scanning"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi scanning"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Improve location by allowing apps and services to scan for Wi‑Fi networks even when Wi‑Fi is off"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth scanning"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Improve location by allowing system services to scan for Bluetooth devices, even when Bluetooth is off"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; mobile network location"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Let apps use Google\'s location service to estimate your location faster. Anonymous location data will be collected and sent to Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Location determined by Wi‑Fi"</string>
@@ -1155,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"password has been set"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN has been set"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Pattern has been set"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Use your device pattern to continue."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Enter your device PIN to continue."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Enter your device password to continue."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Wrong PIN"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Wrong password"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Wrong pattern"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Device security"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Change unlock pattern"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Change unlock PIN"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirm saved pattern"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Try again:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Draw an unlock pattern"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Press Menu for help."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Release finger when done"</string>
@@ -1181,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Set unlock pattern"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Change unlock pattern"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"How to draw an unlock pattern"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Too many incorrect attempts!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Try again in <xliff:g id="NUMBER">%d</xliff:g> seconds."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Too many incorrect attempts. Try again in <xliff:g id="NUMBER">%d</xliff:g> seconds."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Application is not installed on your phone."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Manage apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Manage and remove installed apps"</string>
@@ -1233,7 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sort by size"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Show running services"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Show cached processes"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"Default emergency app"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Emergency app"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Reset app preferences"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Reset app preferences?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"This will reset all preferences for:\n\n "<li>"Disabled apps"</li>\n" "<li>"Disabled app notifications"</li>\n" "<li>"Default applications for actions"</li>\n" "<li>"Background data restrictions for apps"</li>\n" "<li>"Any permission restrictions"</li>\n\n" You will not lose any app data."</string>
@@ -1437,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capture all Bluetooth HCI packets in a file"</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="select_logd_size_title" msgid="7433137108348553508">"Logger buffer sizes"</string>
@@ -1739,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 hours"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 day"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Show system"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Hide system"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Use Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Stats type"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Background"</string>
@@ -1835,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Current password:"</string>
@@ -2210,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"User"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Restricted profile"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Add new user?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"You can share this device with other people by creating additional users. Each user has their own space, which they can customise with their own apps, wallpaper and so on. Users can also adjust device settings like Wi‑Fi that affect everyone.\n\nWhen you add a new user, that person needs to set up their space.\n\nAny user can update apps for all other users."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"You can share this device with other people by creating additional users. Each user has their own space, which they can customise with apps, wallpaper and so on. Users can also adjust device settings like Wi‑Fi that affect everyone.\n\nWhen you add a new user, that person needs to set up their space.\n\nAny user can update apps for all other users."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"When you add a new user, that person needs to set up their space.\n\nAny user can update apps for all other users."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Set up user now?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Make sure that the person is available to take the device and set up their space"</string>
@@ -2393,6 +2433,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"emergency ice app default"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"apps download applications system"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"apps permissions security"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"apps default"</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>
@@ -2407,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarm volume"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Ring volume"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Notification volume"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Block interruptions"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Priority only allows"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatic rules"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"When calls and 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_alarms" msgid="7380265858042606857">"Allow only alarms"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Don\'t interrupt"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Priority only"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarms only"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"No interruptions"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Phone ringtone"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Default notification ringtone"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Also vibrate for calls"</string>
@@ -2447,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"No notification listeners are installed."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Enable <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> will be able to read all notifications posted by the system or any installed app, which may include personal information such as contact names and the text of messages sent to you. It will also be able to dismiss these notifications or touch action buttons within them."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Condition providers"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"No apps provide conditions"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d apps provide conditions</item>
-      <item quantity="one">%d app provides conditions</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"No condition providers are installed."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Enable <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> will be able to add exit conditions to Do not disturb mode."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Block all"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Never show notifications from this app"</string>
@@ -2469,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priority"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitive"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Rule name"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Add rule"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Delete rule"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Delete \"<xliff:g id="RULE">%1$s</xliff:g>\" rule?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Deleting"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Rule type"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Unknown"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configure rule"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Schedule rule"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Rule not found."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Days"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"None"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Every day"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Never"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> to <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2489,15 +2525,66 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarms"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Reminders"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Events"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Selected callers"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Repeat callers"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"If the same person calls a second time within a <xliff:g id="MINUTES">%d</xliff:g> minute period, allow it"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automatically turn on"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Never"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Every night"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> next day"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Interruptions"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"When calls and notifications arrive"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"When would you like to be interrupted?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"For how long?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Always interrupt"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"off,all,everything"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Allow only priority interruptions"</string>
+    <string name="zen_mode_option_voice_important_synonyms" msgid="6120004096615029102">"important,priority,priority notifications"</string>
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Allow only alarms"</string>
+    <string name="zen_mode_option_voice_alarms_synonyms" msgid="7463720676061371446">"alarms"</string>
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Don\'t interrupt"</string>
+    <string name="zen_mode_option_voice_no_interruptions_synonyms" msgid="6196235656198436233">"none,nothing,no interruptions"</string>
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Indefinitely"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutes</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minute</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> hours</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hour</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Change to priority notifications only indefinitely"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Change to priority notifications only for <xliff:g id="DURATION">%1$d</xliff:g> minutes until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Change to priority notifications only for one minute until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Change to priority notifications only for <xliff:g id="DURATION">%1$d</xliff:g> hours (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Change to priority notifications only for one hour until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Change to alarms only indefinitely"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> minutes (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Change to alarms only for one minute until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> hours until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Change to alarms only for one hour until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Change to don\'t interrupt indefinitely"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Change to don\'t interrupt for <xliff:g id="DURATION">%1$d</xliff:g> minutes (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Change to don\'t interrupt for one minute until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Change to don\'t interrupt for <xliff:g id="DURATION">%1$d</xliff:g> hours until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Change to don\'t interrupt for one hour until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Change to always interrupt"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"forever"</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>
@@ -2562,7 +2649,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> permissions granted</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> permission granted</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> of <xliff:g id="COUNT_3">%d</xliff:g> permissions granted</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> permission granted</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Some defaults set"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"No defaults set"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"All apps"</string>
@@ -2573,8 +2663,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Priority"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensitive"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"With domain URLs"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Reset preferences across all apps to defaults"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> apps installed, including system and downloaded apps"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Disabled by administrator"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Unknown app"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Choose Profile"</string>
@@ -2589,4 +2678,10 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps can open their domain URLs</item>
       <item quantity="one">One app can open its domain URLs</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Not recognised"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Default Apps"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Browser app"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"No default Browser"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Default)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Apps storage"</string>
 </resources>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 3c2bf1a..3f09f20 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Push button"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"low"</item>
     <item msgid="4212263919458209842">"critical"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Off"</item>
-    <item msgid="5656544177755411222">"Limited interruptions"</item>
-    <item msgid="8735337502532332056">"Zero interruptions"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Moderate"</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index e11fddc..71a8ff1 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD card"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy settings"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancel"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"CANCEL"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUE"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"YES"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NO"</string>
-    <string name="forget" msgid="7267115980248732932">"FORGET"</string>
+    <string name="forget" msgid="1400428660472591263">"Forget"</string>
+    <string name="save" msgid="879993180139353333">"Save"</string>
+    <string name="done" msgid="6942539184162713160">"Done"</string>
     <string name="settings_label" msgid="1626402585530130914">"Settings"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Settings"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Settings shortcut"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Please plug in your charger and try again."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"No lock-screen PIN or password"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"You need to set a lock screen PIN or password before you can start encryption."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"You need to draw your unlock pattern to confirm encrypting your device."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Encrypt?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"The encryption operation is irreversible and if you interrupt it, you\'ll lose data. Encryption takes an hour or more, during which the tablet will restart several times."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"The encryption operation is irreversible and if you interrupt it, you\'ll lose data. Encryption takes an hour or more, during which the phone will restart several times."</string>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Advanced"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Advanced Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"When Bluetooth is turned on, your device can communicate with other nearby Bluetooth devices."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"To improve location accuracy, Google services will scan for Bluetooth devices, even when Bluetooth is off. You can change this in LINK_BEGINscanning settingsLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"To improve location accuracy, apps and services will scan for Bluetooth devices, even when Bluetooth is off. You can change this in <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>scanning settings<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Connect to…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from media audio."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from hands-free audio."</string>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"To improve location accuracy, Google services will scan for Wi‑Fi networks, even when Wi‑Fi is off. You can change this in LINK_BEGINscanning settingsLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"To improve location accuracy, apps and services will scan for Wi‑Fi networks, even when Wi‑Fi is off. You can change this in <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>scanning settings<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Don\'t show again"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Keep Wi‑Fi on during sleep"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi on during sleep"</string>
@@ -604,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scan"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Advanced"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Show Apps"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Show Wi-Fi Strength"</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>
@@ -663,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Sign in to connect?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> requires you to sign in online before you connect to the network."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONNECT"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"This network has no Internet access. Use this network anyway?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Don\'t ask again for this network"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connect"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Failed to connect to network"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Forget"</string>
@@ -734,12 +731,10 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi preferred"</item>
     <item msgid="5267397515594230396">"Mobile preferred"</item>
-    <item msgid="3132912693346866895">"Wi-Fi only"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"When Wi-Fi calling is on, your phone can route calls via Wi-Fi networks or your operator\'s network, depending on your preference and which signal is stronger. Before turning on this feature, check with your operator regarding fees and other details."</string>
     <string name="home_settings" msgid="212375129455718176">"Home"</string>
@@ -913,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Available (read-only)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Total space"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calculating..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Apps (app data &amp; media content)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Apps &amp; app data"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Downloads"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Pictures, videos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (music, ringtones, podcasts, etc.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Misc."</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Other files"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Cached data"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Unmount shared storage"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Unmount SD card"</string>
@@ -951,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Unmount in progress"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Storage space is running out"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Some system functions, such as syncing, may not work correctly. Try to free space by deleting or unpinning items, such as apps or media content."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Rename"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Mount"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Eject"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Erase &amp; format"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Erase &amp; format as internal storage"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB computer connection"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB computer connection"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Connect as"</string>
@@ -961,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Lets MIDI-enabled applications work over USB with MIDI software on your computer."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Other users"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Device storage"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Removable storage"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> free (Total <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> is mounted"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Couldn\'t mount <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> is safely ejected"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Couldn\'t safely eject <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> is formatted"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Couldn\'t format <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Rename storage"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"After formatting, you can use this <xliff:g id="NAME_0">^1</xliff:g> in other devices. \n\nAll data on this <xliff:g id="NAME_1">^1</xliff:g> will be erased. Consider backing up first. \n\n"<b>"Back up photos &amp; other media"</b>" \nMove your media files to alternative storage on this device, or transfer them to a computer using a USB cable. \n\n"<b>"Back up apps"</b>" \nAll apps stored on this <xliff:g id="NAME_6">^1</xliff:g> will be uninstalled and their data will be erased. To keep these apps, move them to alternative storage on this device."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"When you eject this <xliff:g id="NAME_0">^1</xliff:g>, apps stored on it will stop working, and media files stored on it will not be available until it is reinserted."</b>" \n\nThis <xliff:g id="NAME_1">^1</xliff:g> is formatted to work on this device only. It won\'t work on any others."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Set up your <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Use as portable storage"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"For moving photos and other media between devices."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Use as internal storage"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"For storing anything on this device only, including apps and photos. Requires formatting that prevents it from working with other devices."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Format as internal storage"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"This requires the <xliff:g id="NAME_0">^1</xliff:g> to be formatted to make it secure. \n\nAfter formatting, this <xliff:g id="NAME_1">^1</xliff:g> will only work in this device. \n\n"<b>"Formatting erases all data currently stored on the <xliff:g id="NAME_2">^1</xliff:g>."</b>" To avoid losing the data, consider backing it up."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Erase &amp; format"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatting <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Don\'t remove the <xliff:g id="NAME">^1</xliff:g> while it\'s formatting."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Move data to new storage"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"You can move your photos, files and app data to this new <xliff:g id="NAME">^1</xliff:g>. \n\nThe move takes about <xliff:g id="TIME">^2</xliff:g> and will free <xliff:g id="SIZE">^3</xliff:g> on internal storage. Some apps won\'t work while it\'s underway."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Move now"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Move later"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Move data now"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"The move takes about <xliff:g id="TIME">^1</xliff:g>. It will free <xliff:g id="SIZE">^2</xliff:g> of internal storage."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Move"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Moving data…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"During the move: \n• Don\'t remove the <xliff:g id="NAME">^1</xliff:g>. \n• Some apps won\'t work correctly. \n• Keep the device charged."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> is ready"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Your <xliff:g id="NAME">^1</xliff:g> is all set to use with photos and other media."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Your new <xliff:g id="NAME">^1</xliff:g> is working. \n\nTo move photos, files and app data to this device, go to Settings &gt; Storage."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Move <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Moving <xliff:g id="APP">^1</xliff:g> and its data to <xliff:g id="NAME_0">^2</xliff:g> will take only a few moments. You won\'t be able to use the app until the move is complete. \n\nDon\'t remove the <xliff:g id="NAME_1">^2</xliff:g> during the move."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Moving <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Don\'t remove the <xliff:g id="NAME">^1</xliff:g> during the move. \n\nThe <xliff:g id="APP">^2</xliff:g> app on this device won\'t be available until the move is complete."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancel move"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Battery status"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Battery level"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1005,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Reset to default"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Reset default APN settings completed"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Network settings reset"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"This will reset all settings related to networking to the factory defaults, including:\n\n"<li>"Wi-Fi"</li>\n<li>"Mobile data"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"This will reset all network settings, including:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobile data"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Reset settings"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Reset all network settings? You can\'t reverse this action!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Reset all network settings? You can\'t undo this action!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Reset settings"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"You need to draw your unlock pattern to confirm a network settings reset."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Reset?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Network settings reset"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Network settings have been reset"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Reset device"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Factory data reset"</string>
     <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>
@@ -1027,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Erase all the data on the SD card, such as music or photos"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Reset tablet"</string>
     <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_desc" msgid="1062841478823409667">"Erase all your personal information and downloaded apps? You can\'t undo this action!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Erase everything"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Factory reset is not available for this user"</string>
@@ -1046,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Set up voicemail, call forwarding, call waiting, caller ID"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB tethering"</string>
@@ -1079,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Help"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobile networks"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobile plan"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Default SMS app"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS app"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Change SMS app?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Use <xliff:g id="NEW_APP">%1$s</xliff:g> instead of <xliff:g id="CURRENT_APP">%2$s</xliff:g> as your SMS app?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Use <xliff:g id="NEW_APP">%s</xliff:g> as your SMS app?"</string>
@@ -1110,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Use GPS to determine location"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Scanning"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Scanning"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi scanning"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Improve location by allowing apps and services to scan for Wi‑Fi networks even when Wi‑Fi is off"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth scanning"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Improve location by allowing system services to scan for Bluetooth devices, even when Bluetooth is off"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; mobile network location"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Let apps use Google\'s location service to estimate your location faster. Anonymous location data will be collected and sent to Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Location determined by Wi‑Fi"</string>
@@ -1155,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"password has been set"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN has been set"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Pattern has been set"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Use your device pattern to continue."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Enter your device PIN to continue."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Enter your device password to continue."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Wrong PIN"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Wrong password"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Wrong pattern"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Device security"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Change unlock pattern"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Change unlock PIN"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirm saved pattern"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Try again:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Draw an unlock pattern"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Press Menu for help."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Release finger when done"</string>
@@ -1181,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Set unlock pattern"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Change unlock pattern"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"How to draw an unlock pattern"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Too many incorrect attempts!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Try again in <xliff:g id="NUMBER">%d</xliff:g> seconds."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Too many incorrect attempts. Try again in <xliff:g id="NUMBER">%d</xliff:g> seconds."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Application is not installed on your phone."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Manage apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Manage and remove installed apps"</string>
@@ -1233,7 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sort by size"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Show running services"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Show cached processes"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"Default emergency app"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Emergency app"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Reset app preferences"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Reset app preferences?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"This will reset all preferences for:\n\n "<li>"Disabled apps"</li>\n" "<li>"Disabled app notifications"</li>\n" "<li>"Default applications for actions"</li>\n" "<li>"Background data restrictions for apps"</li>\n" "<li>"Any permission restrictions"</li>\n\n" You will not lose any app data."</string>
@@ -1437,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capture all Bluetooth HCI packets in a file"</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="select_logd_size_title" msgid="7433137108348553508">"Logger buffer sizes"</string>
@@ -1739,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 hours"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 day"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Show system"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Hide system"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Use Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Stats type"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Background"</string>
@@ -1835,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Current password:"</string>
@@ -2210,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"User"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Restricted profile"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Add new user?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"You can share this device with other people by creating additional users. Each user has their own space, which they can customise with their own apps, wallpaper and so on. Users can also adjust device settings like Wi‑Fi that affect everyone.\n\nWhen you add a new user, that person needs to set up their space.\n\nAny user can update apps for all other users."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"You can share this device with other people by creating additional users. Each user has their own space, which they can customise with apps, wallpaper and so on. Users can also adjust device settings like Wi‑Fi that affect everyone.\n\nWhen you add a new user, that person needs to set up their space.\n\nAny user can update apps for all other users."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"When you add a new user, that person needs to set up their space.\n\nAny user can update apps for all other users."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Set up user now?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Make sure that the person is available to take the device and set up their space"</string>
@@ -2393,6 +2433,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"emergency ice app default"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"apps download applications system"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"apps permissions security"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"apps default"</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>
@@ -2407,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarm volume"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Ring volume"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Notification volume"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Block interruptions"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Priority only allows"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatic rules"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"When calls and 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_alarms" msgid="7380265858042606857">"Allow only alarms"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Don\'t interrupt"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Priority only"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarms only"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"No interruptions"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Phone ringtone"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Default notification ringtone"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Also vibrate for calls"</string>
@@ -2447,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"No notification listeners are installed."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Enable <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> will be able to read all notifications posted by the system or any installed app, which may include personal information such as contact names and the text of messages sent to you. It will also be able to dismiss these notifications or touch action buttons within them."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Condition providers"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"No apps provide conditions"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d apps provide conditions</item>
-      <item quantity="one">%d app provides conditions</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"No condition providers are installed."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Enable <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> will be able to add exit conditions to Do not disturb mode."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Block all"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Never show notifications from this app"</string>
@@ -2469,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priority"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitive"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Rule name"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Add rule"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Delete rule"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Delete \"<xliff:g id="RULE">%1$s</xliff:g>\" rule?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Deleting"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Rule type"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Unknown"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configure rule"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Schedule rule"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Rule not found."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Days"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"None"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Every day"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Never"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> to <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2489,15 +2525,66 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarms"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Reminders"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Events"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Selected callers"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Repeat callers"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"If the same person calls a second time within a <xliff:g id="MINUTES">%d</xliff:g> minute period, allow it"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automatically turn on"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Never"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Every night"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> next day"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Interruptions"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"When calls and notifications arrive"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"When would you like to be interrupted?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"For how long?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Always interrupt"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"off,all,everything"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Allow only priority interruptions"</string>
+    <string name="zen_mode_option_voice_important_synonyms" msgid="6120004096615029102">"important,priority,priority notifications"</string>
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Allow only alarms"</string>
+    <string name="zen_mode_option_voice_alarms_synonyms" msgid="7463720676061371446">"alarms"</string>
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Don\'t interrupt"</string>
+    <string name="zen_mode_option_voice_no_interruptions_synonyms" msgid="6196235656198436233">"none,nothing,no interruptions"</string>
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Indefinitely"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutes</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minute</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> hours</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hour</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Change to priority notifications only indefinitely"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Change to priority notifications only for <xliff:g id="DURATION">%1$d</xliff:g> minutes until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Change to priority notifications only for one minute until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Change to priority notifications only for <xliff:g id="DURATION">%1$d</xliff:g> hours (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Change to priority notifications only for one hour until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Change to alarms only indefinitely"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> minutes (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Change to alarms only for one minute until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> hours until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Change to alarms only for one hour until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Change to don\'t interrupt indefinitely"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Change to don\'t interrupt for <xliff:g id="DURATION">%1$d</xliff:g> minutes (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Change to don\'t interrupt for one minute until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Change to don\'t interrupt for <xliff:g id="DURATION">%1$d</xliff:g> hours until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Change to don\'t interrupt for one hour until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Change to always interrupt"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"forever"</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>
@@ -2562,7 +2649,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> permissions granted</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> permission granted</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> of <xliff:g id="COUNT_3">%d</xliff:g> permissions granted</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> permission granted</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Some defaults set"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"No defaults set"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"All apps"</string>
@@ -2573,8 +2663,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Priority"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensitive"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"With domain URLs"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Reset preferences across all apps to defaults"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> apps installed, including system and downloaded apps"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Disabled by administrator"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Unknown app"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Choose Profile"</string>
@@ -2589,4 +2678,10 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps can open their domain URLs</item>
       <item quantity="one">One app can open its domain URLs</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Not recognised"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Default Apps"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Browser app"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"No default Browser"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Default)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Apps storage"</string>
 </resources>
diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index 3c2bf1a..3f09f20 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Push button"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"low"</item>
     <item msgid="4212263919458209842">"critical"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Off"</item>
-    <item msgid="5656544177755411222">"Limited interruptions"</item>
-    <item msgid="8735337502532332056">"Zero interruptions"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Moderate"</item>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index e11fddc..71a8ff1 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD card"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy settings"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancel"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"CANCEL"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUE"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"YES"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NO"</string>
-    <string name="forget" msgid="7267115980248732932">"FORGET"</string>
+    <string name="forget" msgid="1400428660472591263">"Forget"</string>
+    <string name="save" msgid="879993180139353333">"Save"</string>
+    <string name="done" msgid="6942539184162713160">"Done"</string>
     <string name="settings_label" msgid="1626402585530130914">"Settings"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Settings"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Settings shortcut"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Please plug in your charger and try again."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"No lock-screen PIN or password"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"You need to set a lock screen PIN or password before you can start encryption."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"You need to draw your unlock pattern to confirm encrypting your device."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Encrypt?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"The encryption operation is irreversible and if you interrupt it, you\'ll lose data. Encryption takes an hour or more, during which the tablet will restart several times."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"The encryption operation is irreversible and if you interrupt it, you\'ll lose data. Encryption takes an hour or more, during which the phone will restart several times."</string>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Advanced"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Advanced Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"When Bluetooth is turned on, your device can communicate with other nearby Bluetooth devices."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"To improve location accuracy, Google services will scan for Bluetooth devices, even when Bluetooth is off. You can change this in LINK_BEGINscanning settingsLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"To improve location accuracy, apps and services will scan for Bluetooth devices, even when Bluetooth is off. You can change this in <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>scanning settings<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Connect to…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from media audio."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from hands-free audio."</string>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"To improve location accuracy, Google services will scan for Wi‑Fi networks, even when Wi‑Fi is off. You can change this in LINK_BEGINscanning settingsLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"To improve location accuracy, apps and services will scan for Wi‑Fi networks, even when Wi‑Fi is off. You can change this in <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>scanning settings<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Don\'t show again"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Keep Wi‑Fi on during sleep"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi on during sleep"</string>
@@ -604,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scan"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Advanced"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Show Apps"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Show Wi-Fi Strength"</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>
@@ -663,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Sign in to connect?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> requires you to sign in online before you connect to the network."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONNECT"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"This network has no Internet access. Use this network anyway?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Don\'t ask again for this network"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connect"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Failed to connect to network"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Forget"</string>
@@ -734,12 +731,10 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi preferred"</item>
     <item msgid="5267397515594230396">"Mobile preferred"</item>
-    <item msgid="3132912693346866895">"Wi-Fi only"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"When Wi-Fi calling is on, your phone can route calls via Wi-Fi networks or your operator\'s network, depending on your preference and which signal is stronger. Before turning on this feature, check with your operator regarding fees and other details."</string>
     <string name="home_settings" msgid="212375129455718176">"Home"</string>
@@ -913,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Available (read-only)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Total space"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calculating..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Apps (app data &amp; media content)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Apps &amp; app data"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Downloads"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Pictures, videos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (music, ringtones, podcasts, etc.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Misc."</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Other files"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Cached data"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Unmount shared storage"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Unmount SD card"</string>
@@ -951,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Unmount in progress"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Storage space is running out"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Some system functions, such as syncing, may not work correctly. Try to free space by deleting or unpinning items, such as apps or media content."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Rename"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Mount"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Eject"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Erase &amp; format"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Erase &amp; format as internal storage"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB computer connection"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB computer connection"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Connect as"</string>
@@ -961,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Lets MIDI-enabled applications work over USB with MIDI software on your computer."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Other users"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Device storage"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Removable storage"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> free (Total <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> is mounted"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Couldn\'t mount <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> is safely ejected"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Couldn\'t safely eject <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> is formatted"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Couldn\'t format <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Rename storage"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"After formatting, you can use this <xliff:g id="NAME_0">^1</xliff:g> in other devices. \n\nAll data on this <xliff:g id="NAME_1">^1</xliff:g> will be erased. Consider backing up first. \n\n"<b>"Back up photos &amp; other media"</b>" \nMove your media files to alternative storage on this device, or transfer them to a computer using a USB cable. \n\n"<b>"Back up apps"</b>" \nAll apps stored on this <xliff:g id="NAME_6">^1</xliff:g> will be uninstalled and their data will be erased. To keep these apps, move them to alternative storage on this device."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"When you eject this <xliff:g id="NAME_0">^1</xliff:g>, apps stored on it will stop working, and media files stored on it will not be available until it is reinserted."</b>" \n\nThis <xliff:g id="NAME_1">^1</xliff:g> is formatted to work on this device only. It won\'t work on any others."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Set up your <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Use as portable storage"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"For moving photos and other media between devices."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Use as internal storage"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"For storing anything on this device only, including apps and photos. Requires formatting that prevents it from working with other devices."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Format as internal storage"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"This requires the <xliff:g id="NAME_0">^1</xliff:g> to be formatted to make it secure. \n\nAfter formatting, this <xliff:g id="NAME_1">^1</xliff:g> will only work in this device. \n\n"<b>"Formatting erases all data currently stored on the <xliff:g id="NAME_2">^1</xliff:g>."</b>" To avoid losing the data, consider backing it up."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Erase &amp; format"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatting <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Don\'t remove the <xliff:g id="NAME">^1</xliff:g> while it\'s formatting."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Move data to new storage"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"You can move your photos, files and app data to this new <xliff:g id="NAME">^1</xliff:g>. \n\nThe move takes about <xliff:g id="TIME">^2</xliff:g> and will free <xliff:g id="SIZE">^3</xliff:g> on internal storage. Some apps won\'t work while it\'s underway."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Move now"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Move later"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Move data now"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"The move takes about <xliff:g id="TIME">^1</xliff:g>. It will free <xliff:g id="SIZE">^2</xliff:g> of internal storage."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Move"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Moving data…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"During the move: \n• Don\'t remove the <xliff:g id="NAME">^1</xliff:g>. \n• Some apps won\'t work correctly. \n• Keep the device charged."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> is ready"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Your <xliff:g id="NAME">^1</xliff:g> is all set to use with photos and other media."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Your new <xliff:g id="NAME">^1</xliff:g> is working. \n\nTo move photos, files and app data to this device, go to Settings &gt; Storage."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Move <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Moving <xliff:g id="APP">^1</xliff:g> and its data to <xliff:g id="NAME_0">^2</xliff:g> will take only a few moments. You won\'t be able to use the app until the move is complete. \n\nDon\'t remove the <xliff:g id="NAME_1">^2</xliff:g> during the move."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Moving <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Don\'t remove the <xliff:g id="NAME">^1</xliff:g> during the move. \n\nThe <xliff:g id="APP">^2</xliff:g> app on this device won\'t be available until the move is complete."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancel move"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Battery status"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Battery level"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1005,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Reset to default"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Reset default APN settings completed"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Network settings reset"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"This will reset all settings related to networking to the factory defaults, including:\n\n"<li>"Wi-Fi"</li>\n<li>"Mobile data"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"This will reset all network settings, including:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobile data"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Reset settings"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Reset all network settings? You can\'t reverse this action!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Reset all network settings? You can\'t undo this action!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Reset settings"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"You need to draw your unlock pattern to confirm a network settings reset."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Reset?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Network settings reset"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Network settings have been reset"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Reset device"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Factory data reset"</string>
     <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>
@@ -1027,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Erase all the data on the SD card, such as music or photos"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Reset tablet"</string>
     <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_desc" msgid="1062841478823409667">"Erase all your personal information and downloaded apps? You can\'t undo this action!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Erase everything"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Factory reset is not available for this user"</string>
@@ -1046,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Set up voicemail, call forwarding, call waiting, caller ID"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB tethering"</string>
@@ -1079,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Help"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobile networks"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobile plan"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Default SMS app"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS app"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Change SMS app?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Use <xliff:g id="NEW_APP">%1$s</xliff:g> instead of <xliff:g id="CURRENT_APP">%2$s</xliff:g> as your SMS app?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Use <xliff:g id="NEW_APP">%s</xliff:g> as your SMS app?"</string>
@@ -1110,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Use GPS to determine location"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Scanning"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Scanning"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi scanning"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Improve location by allowing apps and services to scan for Wi‑Fi networks even when Wi‑Fi is off"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth scanning"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Improve location by allowing system services to scan for Bluetooth devices, even when Bluetooth is off"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; mobile network location"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Let apps use Google\'s location service to estimate your location faster. Anonymous location data will be collected and sent to Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Location determined by Wi‑Fi"</string>
@@ -1155,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"password has been set"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN has been set"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Pattern has been set"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Use your device pattern to continue."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Enter your device PIN to continue."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Enter your device password to continue."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Wrong PIN"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Wrong password"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Wrong pattern"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Device security"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Change unlock pattern"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Change unlock PIN"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirm saved pattern"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Try again:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Draw an unlock pattern"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Press Menu for help."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Release finger when done"</string>
@@ -1181,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Set unlock pattern"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Change unlock pattern"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"How to draw an unlock pattern"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Too many incorrect attempts!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Try again in <xliff:g id="NUMBER">%d</xliff:g> seconds."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Too many incorrect attempts. Try again in <xliff:g id="NUMBER">%d</xliff:g> seconds."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Application is not installed on your phone."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Manage apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Manage and remove installed apps"</string>
@@ -1233,7 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sort by size"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Show running services"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Show cached processes"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"Default emergency app"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Emergency app"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Reset app preferences"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Reset app preferences?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"This will reset all preferences for:\n\n "<li>"Disabled apps"</li>\n" "<li>"Disabled app notifications"</li>\n" "<li>"Default applications for actions"</li>\n" "<li>"Background data restrictions for apps"</li>\n" "<li>"Any permission restrictions"</li>\n\n" You will not lose any app data."</string>
@@ -1437,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capture all Bluetooth HCI packets in a file"</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="select_logd_size_title" msgid="7433137108348553508">"Logger buffer sizes"</string>
@@ -1739,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 hours"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 day"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Show system"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Hide system"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Use Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Stats type"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Background"</string>
@@ -1835,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Current password:"</string>
@@ -2210,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"User"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Restricted profile"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Add new user?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"You can share this device with other people by creating additional users. Each user has their own space, which they can customise with their own apps, wallpaper and so on. Users can also adjust device settings like Wi‑Fi that affect everyone.\n\nWhen you add a new user, that person needs to set up their space.\n\nAny user can update apps for all other users."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"You can share this device with other people by creating additional users. Each user has their own space, which they can customise with apps, wallpaper and so on. Users can also adjust device settings like Wi‑Fi that affect everyone.\n\nWhen you add a new user, that person needs to set up their space.\n\nAny user can update apps for all other users."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"When you add a new user, that person needs to set up their space.\n\nAny user can update apps for all other users."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Set up user now?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Make sure that the person is available to take the device and set up their space"</string>
@@ -2393,6 +2433,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"emergency ice app default"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"apps download applications system"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"apps permissions security"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"apps default"</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>
@@ -2407,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarm volume"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Ring volume"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Notification volume"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Block interruptions"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Priority only allows"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatic rules"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"When calls and 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_alarms" msgid="7380265858042606857">"Allow only alarms"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Don\'t interrupt"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Priority only"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarms only"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"No interruptions"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Phone ringtone"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Default notification ringtone"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Also vibrate for calls"</string>
@@ -2447,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"No notification listeners are installed."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Enable <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> will be able to read all notifications posted by the system or any installed app, which may include personal information such as contact names and the text of messages sent to you. It will also be able to dismiss these notifications or touch action buttons within them."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Condition providers"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"No apps provide conditions"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d apps provide conditions</item>
-      <item quantity="one">%d app provides conditions</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"No condition providers are installed."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Enable <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> will be able to add exit conditions to Do not disturb mode."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Block all"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Never show notifications from this app"</string>
@@ -2469,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priority"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitive"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Rule name"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Add rule"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Delete rule"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Delete \"<xliff:g id="RULE">%1$s</xliff:g>\" rule?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Deleting"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Rule type"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Unknown"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configure rule"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Schedule rule"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Rule not found."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Days"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"None"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Every day"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Never"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> to <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2489,15 +2525,66 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarms"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Reminders"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Events"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Selected callers"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Repeat callers"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"If the same person calls a second time within a <xliff:g id="MINUTES">%d</xliff:g> minute period, allow it"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automatically turn on"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Never"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Every night"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> next day"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Interruptions"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"When calls and notifications arrive"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"When would you like to be interrupted?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"For how long?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Always interrupt"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"off,all,everything"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Allow only priority interruptions"</string>
+    <string name="zen_mode_option_voice_important_synonyms" msgid="6120004096615029102">"important,priority,priority notifications"</string>
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Allow only alarms"</string>
+    <string name="zen_mode_option_voice_alarms_synonyms" msgid="7463720676061371446">"alarms"</string>
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Don\'t interrupt"</string>
+    <string name="zen_mode_option_voice_no_interruptions_synonyms" msgid="6196235656198436233">"none,nothing,no interruptions"</string>
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Indefinitely"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutes</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minute</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> hours</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hour</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Change to priority notifications only indefinitely"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Change to priority notifications only for <xliff:g id="DURATION">%1$d</xliff:g> minutes until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Change to priority notifications only for one minute until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Change to priority notifications only for <xliff:g id="DURATION">%1$d</xliff:g> hours (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Change to priority notifications only for one hour until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Change to alarms only indefinitely"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> minutes (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Change to alarms only for one minute until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> hours until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Change to alarms only for one hour until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Change to don\'t interrupt indefinitely"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Change to don\'t interrupt for <xliff:g id="DURATION">%1$d</xliff:g> minutes (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Change to don\'t interrupt for one minute until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Change to don\'t interrupt for <xliff:g id="DURATION">%1$d</xliff:g> hours until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Change to don\'t interrupt for one hour until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Change to always interrupt"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"forever"</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>
@@ -2562,7 +2649,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> permissions granted</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> permission granted</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> of <xliff:g id="COUNT_3">%d</xliff:g> permissions granted</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> permission granted</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Some defaults set"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"No defaults set"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"All apps"</string>
@@ -2573,8 +2663,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Priority"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensitive"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"With domain URLs"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Reset preferences across all apps to defaults"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> apps installed, including system and downloaded apps"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Disabled by administrator"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Unknown app"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Choose Profile"</string>
@@ -2589,4 +2678,10 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps can open their domain URLs</item>
       <item quantity="one">One app can open its domain URLs</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Not recognised"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Default Apps"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Browser app"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"No default Browser"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Default)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Apps storage"</string>
 </resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 65eaad4..300aaeb 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Presionar botón"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"bajo"</item>
     <item msgid="4212263919458209842">"crítico"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Desactivado"</item>
-    <item msgid="5656544177755411222">"Interrupciones limitadas"</item>
-    <item msgid="8735337502532332056">"Sin interrupciones"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Moderado"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 601295c..4788365 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Tarjeta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Configuración de proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancelar"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"CANCELAR"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUAR"</string>
     <string name="okay" msgid="1997666393121016642">"Aceptar"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"SÍ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NO"</string>
-    <string name="forget" msgid="7267115980248732932">"OLVIDAR"</string>
+    <string name="forget" msgid="1400428660472591263">"Olvidar"</string>
+    <string name="save" msgid="879993180139353333">"Guardar"</string>
+    <string name="done" msgid="6942539184162713160">"Listo"</string>
     <string name="settings_label" msgid="1626402585530130914">"Configuración"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Configuración"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Configuración"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Enchufa tu cargador e inténtalo nuevamente."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Sin contraseña o PIN de pantalla de bloqueo"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Debes configurar una contraseña o PIN de pantalla de bloqueo antes de comenzar con la encriptación."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Debes crear tu patrón de desbloqueo para confirmar la encriptación del dispositivo."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"¿Deseas encriptar el dispositivo?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"La encriptación es irreversible y no puede interrumpirse; de lo contrario, perderás información. La encriptación demora al menos una hora. Durante este tiempo, la tablet se reiniciará varias veces."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"La encriptación es irreversible y no puede interrumpirse; de lo contrario, perderás información. La encriptación demora al menos una hora. Durante este tiempo, el dispositivo se reiniciará varias veces."</string>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Config. avanzada"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth avanzado"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetooth permite conexión con disposit. cercanos."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"Para mejorar la precisión de la ubicación, los servicios de Google buscarán dispositivos Bluetooth aunque Bluetooth esté apagado. Puedes modificar esta opción en LINK_BEGINla configuración de búsquedaLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Para mejorar la precisión de la ubicación, las aplicaciones y los servicios buscarán dispositivos Bluetooth, incluso cuando la conexión Bluetooth esté desactivada. Puedes modificar esta opción en la <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configuración de búsqueda<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Conectar a..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del audio multimedia."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del audio de manos libres."</string>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"Para mejorar la precisión de la ubicación, los servicios de Google buscarán redes Wi-Fi aunque la conexión Wi-Fi esté desactivada. Puedes cambiar esta opción en la LINK_BEGINconfiguración de búsquedaLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Para mejorar la precisión de la ubicación, las aplicaciones y los servicios buscarán redes Wi‑Fi, incluso cuando la conexión Wi‑Fi esté desactivada. Puedes modificar esta opción en la <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configuración de búsqueda<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"No volver a mostrar"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Mantener Wi-Fi durante suspensión"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi activada en suspensión"</string>
@@ -604,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Buscar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Config. avanzada"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Mostrar aplicaciones"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Mostrar señal Wi-Fi"</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>
@@ -663,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"¿Acceder para conectarse?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> requiere acceso en línea para conectar a la red."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONECTAR"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Esta red no tiene acceso a Internet. ¿Deseas usarla de todos modos?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"No volver a preguntar para esta red"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"No se pudo establecer conexión con la red."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Olvidar"</string>
@@ -729,21 +726,17 @@
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Zona Wi‑Fi portátil <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 Hotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Llamadas por Wi-Fi"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Preferencia de llamada"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Modo de llamada por Wi-Fi"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Red Wi-Fi preferida"</item>
     <item msgid="5267397515594230396">"Red móvil preferida"</item>
-    <item msgid="3132912693346866895">"Solo Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Cuando están activadas las llamadas por Wi-Fi, el teléfono puede enviar las llamadas por redes Wi-Fi o por la red del proveedor, según tu preferencia y la señal que sea más intensa. Antes de activar esta función, verifica el costo y otros detalles con el proveedor de red."</string>
     <string name="home_settings" msgid="212375129455718176">"Página principal"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sonido"</string>
@@ -915,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Disponible (solo lectura)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espacio total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calculando…"</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplicaciones (datos de aplic. y cont. multimedia)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Aplicaciones y datos de aplicaciones"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Medios"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Descargas"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Imágenes, videos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (música, tonos de teléfono, podcasts, etc.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Varios."</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Otros archivos"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Datos almacenados en caché"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desactivar alm. comp."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desmontar la tarjeta SD"</string>
@@ -953,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desmontaje en progreso"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Poco espacio de almacenamiento"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Es posible que algunas funciones del sistema, como la sincronización, no funcionen correctamente. Intenta eliminar o a desactivar elementos para liberar espacio (por ejemplo, aplicaciones o contenido multimedia)."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Cambiar nombre"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Activar"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Expulsar"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Borrar y formatear"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Borrar/format. como alm. int."</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Conexión con computadora por USB"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Conexión con comput. por USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Conectarse como"</string>
@@ -963,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Permite que las aplicaciones compatibles con MIDI funcionen con software MIDI mediante USB en tu computadora."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Otros usuarios"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Almacenamiento del dispositivo"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Almacenamiento desmontable"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> libres (total: <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Se activó <xliff:g id="NAME">%1$s</xliff:g>."</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"No se pudo activar <xliff:g id="NAME">%1$s</xliff:g>."</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> se expulsó de forma segura."</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g> no se pudo expulsar de forma segura."</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"Se formateó <xliff:g id="NAME">%1$s</xliff:g>."</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"No se pudo formatear <xliff:g id="NAME">%1$s</xliff:g>."</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Renombrar almacenamiento"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Luego de formatear el dispositivo <xliff:g id="NAME_0">^1</xliff:g>, puedes usarlo en otros dispositivos. \n\nTodos los datos se borrarán de <xliff:g id="NAME_1">^1</xliff:g>. Primero, deberías realizar una copia de seguridad. \n\n"<b>"Realizar una copia de seguridad de las fotos y otro contenido multimedia"</b>" \nTransfiere los archivos multimedia a un medio de almacenamiento alternativo en este dispositivo o a un equipo mediante un cable USB. \n\n"<b>"Realizar una copia de seguridad de las aplicaciones"</b>" \nSe desinstalarán todas las aplicaciones guardadas en <xliff:g id="NAME_6">^1</xliff:g> y se eliminarán todos los datos relacionados. Para conservar estas aplicaciones, puedes transferirlas a un medio de almacenamiento alternativo en este dispositivo."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Al expulsar este dispositivo interno <xliff:g id="NAME_0">^1</xliff:g>, las aplicaciones allí guardadas dejarán de funcionar, y los archivos multimedia almacenados no estarán disponibles hasta que vuelvas a insertarlo."</b>" \n\nEl medio de almacenamiento <xliff:g id="NAME_1">^1</xliff:g> está formateado para funcionar solo en este dispositivo; no funcionará en otro."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurar el dispositivo <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Usar como medio de almacenamiento portátil"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Para transferir fotos y otros archivos multimedia entre dispositivos"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Usar como medio de almacenamiento interno"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Para guardar contenido solo en este dispositivo, incluidas aplicaciones y fotos. Requiere de formateo para evitar que funcione con otros dispositivos."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatear como almacenamiento"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Debes formatear el dispositivo <xliff:g id="NAME_0">^1</xliff:g> para que funcione de manera segura. \n\nAl finalizar, el medio de almacenamiento <xliff:g id="NAME_1">^1</xliff:g> solo funcionará en este dispositivo. \n\n"<b>"Al formatearlo, borrarás todos los datos almacenados en <xliff:g id="NAME_2">^1</xliff:g> de forma reciente."</b>" Para evitar perderlos, puedes realizar una copia de seguridad."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Borrar y formatear"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formateando dispositivo (<xliff:g id="NAME">^1</xliff:g>)…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"No extraigas el dispositivo <xliff:g id="NAME">^1</xliff:g> durante el proceso de formateo."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Transferir a almacenam. nuevo"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Puedes transferir las fotos, los archivos y los datos de aplicaciones a este nuevo dispositivo de almacenamiento <xliff:g id="NAME">^1</xliff:g>. \n\nLa transferencia demora <xliff:g id="TIME">^2</xliff:g>, y se libera(n) <xliff:g id="SIZE">^3</xliff:g> de almacenamiento interno. Algunas aplicaciones dejarán de funcionar durante el proceso."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Transferir los datos ahora"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Transferir los datos más tarde"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Transferir los datos ahora"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Transferir el contenido demora alrededor de <xliff:g id="TIME">^1</xliff:g>. Con esta acción, se liberará(n) <xliff:g id="SIZE">^2</xliff:g> de almacenamiento interno."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Transferir"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Transfiriendo los datos…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Al transferir el contenido: \n• No extraigas el dispositivo <xliff:g id="NAME">^1</xliff:g>. \n• Algunas aplicaciones no funcionarán de forma correcta. \n• Mantén el dispositivo cargado."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"El dispositivo <xliff:g id="NAME">^1</xliff:g> está listo"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"El dispositivo <xliff:g id="NAME">^1</xliff:g> está listo para que lo uses con fotos y otro contenido multimedia."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"El nuevo dispositivo <xliff:g id="NAME">^1</xliff:g> está funcionando. \n\nPara transferir fotos, archivos y datos de aplicaciones a este dispositivo, ve a Configuración y almacenamiento."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Transferir la aplicación <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Transferir la aplicación <xliff:g id="APP">^1</xliff:g> y los datos relacionados al dispositivo <xliff:g id="NAME_0">^2</xliff:g> solo demorará un momento. Hasta que no se complete la transferencia, no podrás usar la aplicación. \n\nNo extraigas el dispositivo <xliff:g id="NAME_1">^2</xliff:g> durante el proceso."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Transfiriendo la aplicación <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Durante el proceso, no extraigas el dispositivo <xliff:g id="NAME">^1</xliff:g>. \n\nLa aplicación <xliff:g id="APP">^2</xliff:g> estará disponible en este dispositivo cuando se complete el proceso."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancelar transferencia"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Estado de batería"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivel de la batería"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Restablecer valores predeterminados"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Se ha restablecido la configuración predeterminada de APN."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Restablecimiento de configuración de red"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Esta acción restablecerá los parámetros relacionados con la red a la configuración de fábrica, lo que incluye: \n\n"<li>"Wi-Fi"</li>\n<li>"Datos móviles"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Esta acción restablecerá las opciones de configuración de red, como las siguientes:\n\n"<li>"Wi‑Fi"</li>\n<li>"datos móviles"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Restablecer configuración"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"¿Quieres restablecer la configuración de red? No podrás revertir esta acción."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"¿Quieres restablecer la configuración de red? Esta acción no se puede deshacer."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Restablecer configuración"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Debes dibujar el patrón de desbloqueo para confirmar el restablecimiento de la configuración de red."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"¿Restablecer?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Configuración de red restablecida"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Se restableció la configuración de red."</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Restablecer dispositivo"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Restablecer valores de fábrica"</string>
     <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>
@@ -1029,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Borra todos los datos de la tarjeta SD, como música o fotos."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restablecer la tablet"</string>
     <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_desc" msgid="1062841478823409667">"¿Deseas eliminar 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">"Eliminar todo"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"El restablecimiento de la configuración de fábrica no está disponible para este usuario."</string>
@@ -1048,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Establecer correo de voz, desvío de llamadas, llamada en espera, identificador de llamadas"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Anclaje a red USB"</string>
@@ -1081,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ayuda"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Redes móviles"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plan móvil"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Aplicación de SMS predeterminada"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplicación de SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"¿Quieres cambiar la aplicación de SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"¿Quieres usar <xliff:g id="NEW_APP">%1$s</xliff:g> en lugar de <xliff:g id="CURRENT_APP">%2$s</xliff:g> como la aplicación de SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"¿Quieres usar <xliff:g id="NEW_APP">%s</xliff:g> como la aplicación de SMS?"</string>
@@ -1112,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Determinar ubicación con GPS"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Analizando"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Analizando"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Búsqueda de redes Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Para mejorar la precisión de la ubicación, permite que las aplicaciones y los servicios busquen redes Wi‑Fi, incluso cuando la conexión Wi‑Fi esté desactivada."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Búsqueda de dispositivos Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Para mejorar la precisión de la ubicación, permite que los servicios del sistema busquen dispositivos Bluetooth, incluso cuando la conexión Bluetooth esté desactivada."</string>
     <string name="location_network_based" msgid="6010456018401296590">"Ubicación de Wi-Fi y red móvil"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que aplicaciones usen el servicio de ubicación de Google para calcular tu ubicación (se enviarán datos anónimos a Google)"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Ubicación determinada por Wi-Fi"</string>
@@ -1157,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Se ha configurado la contraseña."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Se ha configurado el PIN."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Se ha configurado el patrón."</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Para continuar, usa el patrón del dispositivo."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Para continuar, ingresa el PIN del dispositivo."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Para continuar, ingresa la contraseña del dispositivo."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN incorrecto"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Contraseña incorrecta"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Patrón incorrecto"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Seguridad del dispositivo"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Cambiar patrón de desbloqueo"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Cambiar PIN de desbloqueo"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmar el patrón guardado"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Inténtalo de nuevo:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Dibuja un patrón de desbloqueo"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Presiona Menú para obtener ayuda."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Levanta el dedo cuando termines."</string>
@@ -1183,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Conf. patrón de desbloq."</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Cambiar patrón de desbloqueo"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Cómo se debe extraer un patrón de desbloqueo"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"¡Demasiados intentos incorrectos!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Vuelve a intentarlo en <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Demasiados intentos incorrectos. Vuelve a intentarlo en <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"La aplicación no está instalada en tu dispositivo."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrar aplicaciones"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrar y eliminar aplicaciones instaladas"</string>
@@ -1235,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Ordenar por tamaño"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Mostrar los servicios en ejecución"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Mostrar procesos almacenados en la memoria caché"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Aplicación de emergencia"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Restablecer preferencias"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"¿Restablec. preferencias?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Se restablecerán todas las preferencias de:\n\n "<li>"aplicaciones inhabilitadas;"</li>\n" "<li>"notificaciones de aplicaciones inhabilitadas;"</li>\n" "<li>"aplicaciones predeterminadas para realizar acciones;"</li>\n" "<li>"restricciones de datos en segundo plano para aplicaciones;"</li>\n" "<li>"restricciones de permisos."</li>\n\n" Los datos de las aplicaciones no se perderán."</string>
@@ -1440,8 +1479,6 @@
     <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="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="select_logd_size_title" msgid="7433137108348553508">"Tamaños de búfer de Logger"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 horas"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 día"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Mostrar sistema"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Ocultar sistema"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Usar USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipo de estadística"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"En el fondo"</string>
@@ -1838,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Contraseña actual:"</string>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Usuario"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil restringido"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"¿Agregar usuario nuevo?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Si creas usuarios adicionales, puedes compartir este dispositivo con otras personas. Cada usuario tendrá su propio espacio, que podrá personalizar con sus propias aplicaciones, fondos de pantalla, etc. Los usuarios también pueden cambiar la configuración que afecta a todos, como la conexión Wi-Fi.\n\nCuando agregas un nuevo usuario, la persona debe configurar su espacio.\n\nCualquier usuario puede actualizar aplicaciones para todos los usuarios."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Si creas usuarios adicionales, puedes compartir este dispositivo con otras personas. Cada usuario tendrá su propio espacio, que podrá personalizar con sus propias aplicaciones, fondos de pantalla, etc. Además, los usuarios pueden cambiar las opciones de configuración del dispositivo que afectan a todos, como la conexión Wi-Fi.\n\nAl agregar un usuario nuevo, esa persona debe configurar su espacio.\n\nCualquier usuario puede actualizar las aplicaciones para todos los usuarios."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Cuando agregas un nuevo usuario, esa persona debe configurar su espacio.\n\nCualquier usuario puede actualizar aplicaciones para todos los usuarios."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"¿Configurar el usuario ahora?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Asegúrate de que la persona pueda acceder al dispositivo y configurar su espacio."</string>
@@ -2393,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"restricción restringir restringido"</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_reset_apps" msgid="6420313678620788457">"restablecer, preferencias, predeterminadas"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"aplicación predeterminada en caso de emergencia"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"aplicaciones, descarga, aplicaciones, sistema"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"seguridad de permisos de aplicaciones"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"configuración predeterminada de las aplicaciones"</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>
@@ -2411,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volumen de alarma"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volumen de tono"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volumen de notificación"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Bloquear interrupciones"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Permitir solo prioridad"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Reglas de automatización"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Al recibir llamadas o 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_alarms" msgid="7380265858042606857">"Permitir solo las alarmas"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"No interrumpir"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Solo prioridad"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Solo alarmas"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Sin interrupciones"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tono de llamada"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Tono de notificación predeterminado"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrar también en llamadas"</string>
@@ -2449,15 +2484,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"No hay detectores de notificaciones instalados."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"¿Habilitar <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> podrá leer todas las notificaciones publicadas por el sistema o por cualquier aplicación instalada. Las notificaciones pueden contener información personal, como nombres de contacto y el texto de los mensajes que recibes. También podrá rechazar estas notificaciones o tocar los botones de acción dentro de ellas."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Proveedores de condiciones"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ninguna aplicación proporciona condiciones"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d aplicaciones proporcionan condiciones.</item>
-      <item quantity="one">%d aplicación proporciona condiciones.</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"No hay ningún proveedor de condiciones instalado."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"¿Habilitar <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> podrá agregar condiciones de salida al modo No molestar."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicaciones…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear todos"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"No mostrar nunca notificaciones de esta aplicación"</string>
@@ -2471,17 +2497,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioridad"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Personal"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Nombre de la regla"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Agregar regla"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Borrar regla"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"¿Quieres eliminar la regla \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Borrar"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Tipo de regla"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Desconocido"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configurar regla"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Programar regla"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"No se encontró la regla."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Días"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Ninguno"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Todos los días"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nunca"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"De <xliff:g id="START">%1$s</xliff:g> a <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2491,15 +2523,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmas"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Recordatorios"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Emisores seleccionados"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Repetir emisores"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Permitir llamada si la misma persona llama por segunda vez en un período de <xliff:g id="MINUTES">%d</xliff:g> minuto(s)"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activar automáticam."</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nunca"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Todas las noches"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> el día siguiente"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"¿Cuándo quieres que te interrumpan?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"¿Por cuánto tiempo?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Indefinidamente"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutos</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuto</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> horas</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hora</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Cambiar a solo notificaciones de prioridad de forma indefinida"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Cambiar a solo notificaciones de prioridad durante <xliff:g id="DURATION">%1$d</xliff:g> minutos hasta la hora <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Cambiar a solo notificaciones de prioridad durante un minuto hasta la hora <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Cambiar a solo notificaciones de prioridad durante <xliff:g id="DURATION">%1$d</xliff:g> horas hasta la hora <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Cambiar a solo notificaciones de prioridad durante una hora hasta la hora <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Cambiar a solo alarmas de forma indefinida"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Cambiar a solo alarmas durante <xliff:g id="DURATION">%1$d</xliff:g> minutos hasta la hora <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Cambiar a solo alarmas durante un minuto hasta la hora <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Cambiar a solo alarmas durante <xliff:g id="DURATION">%1$d</xliff:g> horas hasta la hora <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Cambiar a solo alarmas durante una hora hasta la hora <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Cambiar a no interrumpir de forma indefinida"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Cambiar a no interrumpir durante <xliff:g id="DURATION">%1$d</xliff:g> minutos hasta la hora <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Cambiar a no interrumpir durante un minuto hasta la hora <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Cambiar a no interrumpir durante <xliff:g id="DURATION">%1$d</xliff:g> horas hasta la hora <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Cambiar a no interrumpir durante una hora hasta la hora <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Cambiar a interrumpir siempre"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"siempre"</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>
@@ -2564,7 +2657,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> permisos otorgados</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> permiso otorgado</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> permisos de <xliff:g id="COUNT_3">%d</xliff:g> otorgados</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> permiso de <xliff:g id="COUNT_1">%d</xliff:g> otorgado</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Hay algunas configuraciones predeterminadas establecidas."</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"No hay configuraciones predeterminadas establecidas."</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Todas las aplicaciones"</string>
@@ -2575,8 +2671,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritarias"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Confidenciales"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Con URL de dominio"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Restablecer preferencias a sus valores predeterminados en todas las aplicaciones"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"Hay <xliff:g id="COUNT">%d</xliff:g> aplicaciones instaladas, incluidas las aplicaciones del sistema y las descargadas."</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Inhabilitado por el administrador"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avanzada"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicación desconocida"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Elegir perfil"</string>
@@ -2591,4 +2686,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicaciones pueden abrir sus URL de dominio.</item>
       <item quantity="one">Una aplicación puede abrir sus URL de dominio.</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"No reconocido"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Aplicaciones predeterminadas"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Aplicación del navegador"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"No hay un navegador predeterminado."</string>
+    <string name="default_app" msgid="6864503001385843060">"(Predeterminada)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 8cf8409..6b1ec90 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Botón WPS"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"Multimedia"</item>
     <item msgid="7924928667052300589">"Dispositivo"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"ubicación común"</item>
+    <item msgid="5789673140227507995">"ubicación precisa"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibrar"</item>
+    <item msgid="3434165993711230924">"consultar contactos"</item>
+    <item msgid="616161687718081936">"modificar los contactos"</item>
+    <item msgid="7638002295329050091">"leer el registro de llamadas"</item>
+    <item msgid="6546959730920410907">"modificar el registro de llamadas"</item>
+    <item msgid="446877710771379667">"leer calendario"</item>
+    <item msgid="7674458294386319722">"modificar el calendario"</item>
+    <item msgid="8281201165558093009">"búsqueda de Wi-Fi"</item>
+    <item msgid="8694611243479480497">"notificación"</item>
+    <item msgid="7776439107987345446">"búsqueda de red móvil"</item>
+    <item msgid="514615766544675057">"llamar a un teléfono"</item>
+    <item msgid="8181415497109310680">"leer SMS"</item>
+    <item msgid="6816551144382117307">"escribir SMS"</item>
+    <item msgid="4600463921908905030">"recibir SMS"</item>
+    <item msgid="5958926493289432745">"recibir SMS de emergencia"</item>
+    <item msgid="4945269495221089540">"recibir MMS"</item>
+    <item msgid="5570472453573929087">"recibir WAP Push"</item>
+    <item msgid="7125408150230860501">"enviar SMS"</item>
+    <item msgid="7080337936612188061">"leer SMS ICC"</item>
+    <item msgid="587124103118495063">"escribir SMS ICC"</item>
+    <item msgid="2320577158869025503">"modificar la configuración"</item>
+    <item msgid="1545733463471924009">"dibujar en parte superior"</item>
+    <item msgid="3609046903962454582">"acceder a las notificaciones"</item>
+    <item msgid="4671646036128214513">"cámara"</item>
+    <item msgid="1097324338692486211">"grabar audio"</item>
+    <item msgid="5031552983987798163">"reproducir audio"</item>
+    <item msgid="8374996688066472414">"leer portapapeles"</item>
+    <item msgid="3045529469061083747">"modificar portapapeles"</item>
+    <item msgid="5124443975763747838">"botones multimedia"</item>
+    <item msgid="4547883971364273343">"foco de audio"</item>
+    <item msgid="2603878814882344450">"volumen principal"</item>
+    <item msgid="7136963238377062018">"volumen de la voz"</item>
+    <item msgid="4270236897655923007">"volumen del tono"</item>
+    <item msgid="6325739889222559394">"volumen multimedia"</item>
+    <item msgid="5762123934816216821">"volumen de la alarma"</item>
+    <item msgid="785049718065337473">"volumen de las notificaciones"</item>
+    <item msgid="6700305533746877052">"volumen de Bluetooth"</item>
+    <item msgid="2029227495214047094">"mantener activo"</item>
+    <item msgid="26109888160231211">"controlar ubicación"</item>
+    <item msgid="5753382310468855812">"supervisar ubicación de alta potencia"</item>
+    <item msgid="3356591542543137332">"obtener estadísticas de uso"</item>
+    <item msgid="3073734345226842233">"silenciar/activar micrófono"</item>
+    <item msgid="1148142988678569310">"proyectar contenido multimedia"</item>
+    <item msgid="9130014005474445273">"activar VPN"</item>
+    <item msgid="1165192162975045562">"editar fondo de pantalla"</item>
+    <item msgid="7129487923652967258">"proporcionar asistencia a estructura"</item>
+    <item msgid="1069023208100114540">"proporcionar asistencia a captura de pantalla"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Ubicación"</item>
+    <item msgid="8677040780775113033">"Ubicación"</item>
+    <item msgid="1660743989948992916">"Ubicación"</item>
+    <item msgid="8791172739860195290">"Vibrar"</item>
+    <item msgid="383413555642128046">"Consultar contactos"</item>
+    <item msgid="3654594895269697313">"Modificar los contactos"</item>
+    <item msgid="7928393476362362538">"Leer el registro de llamadas"</item>
+    <item msgid="6248591205254641116">"Modificar el registro de llamadas"</item>
+    <item msgid="6093344633066170692">"Leer calendario"</item>
+    <item msgid="1334886368750347692">"Modificar el calendario"</item>
+    <item msgid="1638204101698708656">"Ubicación"</item>
+    <item msgid="2154671955760380322">"Publicar notificación"</item>
+    <item msgid="4282477730595931828">"Ubicación"</item>
+    <item msgid="4891423912898525905">"Llamar a un teléfono"</item>
+    <item msgid="2623604824935968113">"Leer SMS/MMS"</item>
+    <item msgid="4420177125221176306">"Escribir SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Recibir SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Recibir SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Recibir SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Recibir SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Enviar SMS/MMS"</item>
+    <item msgid="3527273606643794973">"Leer SMS/MMS"</item>
+    <item msgid="4370895547001583812">"Escribir SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Modificar la configuración"</item>
+    <item msgid="736541391767350377">"Dibujar en parte superior"</item>
+    <item msgid="5530815681721654194">"Acceder a las notificaciones"</item>
+    <item msgid="781213371706962767">"Cámara"</item>
+    <item msgid="1720492593061838172">"Grabar audio"</item>
+    <item msgid="3493046322001257041">"Reproducir audio"</item>
+    <item msgid="136815868796597058">"Leer portapapeles"</item>
+    <item msgid="5238692940326972503">"Modificar portapapeles"</item>
+    <item msgid="5753789168376302997">"Botones multimedia"</item>
+    <item msgid="3265262911688671938">"Foco de audio"</item>
+    <item msgid="2098976479485046797">"Volumen principal"</item>
+    <item msgid="5660213838861789350">"Volumen de la voz"</item>
+    <item msgid="7983336752371254444">"Volumen del tono"</item>
+    <item msgid="7878027809189330917">"Volumen multimedia"</item>
+    <item msgid="7260546305036218513">"Volumen de alarma"</item>
+    <item msgid="9103719301075748925">"Volumen de notificaciones"</item>
+    <item msgid="7025966722295861512">"Volumen de Bluetooth"</item>
+    <item msgid="4665183401128289653">"Mantener activo"</item>
+    <item msgid="8584357129746649222">"Ubicación"</item>
+    <item msgid="7669257279311110599">"Ubicación"</item>
+    <item msgid="3459320345690097795">"Obtener estadísticas de uso"</item>
+    <item msgid="1312534577834048535">"Silenciar/activar micrófono"</item>
+    <item msgid="5906017727368097853">"Proyectar contenido multimedia"</item>
+    <item msgid="2486614710846178542">"Activar VPN"</item>
+    <item msgid="5586547561693629602">"Editar fondo de pantalla"</item>
+    <item msgid="32794179825485062">"Proporcionar asistencia a estructura"</item>
+    <item msgid="7872852746938272552">"Proporcionar asistencia a captura de pantalla"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Corto"</item>
     <item msgid="2560532955514699713">"Medio"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"bajo"</item>
     <item msgid="4212263919458209842">"crítico"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Desactivado"</item>
-    <item msgid="5656544177755411222">"Interrupciones limitadas"</item>
-    <item msgid="8735337502532332056">"Sin interrupciones"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Moderado"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5e6766e..0ba1799 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Tarjeta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Ajustes de proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancelar"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"CANCELAR"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUAR"</string>
     <string name="okay" msgid="1997666393121016642">"Aceptar"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"SÍ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NO"</string>
-    <string name="forget" msgid="7267115980248732932">"BORRAR"</string>
+    <string name="forget" msgid="1400428660472591263">"Borrar"</string>
+    <string name="save" msgid="879993180139353333">"Guardar"</string>
+    <string name="done" msgid="6942539184162713160">"Listo"</string>
     <string name="settings_label" msgid="1626402585530130914">"Ajustes"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Ajustes"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Acceso a Ajustes"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Conecta el cargador y vuelve a intentarlo."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Falta la contraseña o el PIN de la pantalla de bloqueo"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Debes establecer una contraseña o un PIN de la pantalla de bloqueo para poder iniciar el proceso de cifrado."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Tienes que dibujar tu patrón de desbloqueo para confirmar el cifrado del dispositivo."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"¿Cifrar dispositivo?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"La operación de cifrado no se puede deshacer y, si la interrumpes, perderás datos. El cifrado tarda aproximadamente una hora y el tablet se reinicia varias veces durante este proceso."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"La operación de cifrado no se puede deshacer y, si la interrumpes, perderás datos. El cifrado puede tardar una hora o más y el teléfono se reinicia varias veces durante este proceso."</string>
@@ -419,8 +416,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Patrón"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Contraseña"</string>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Una vez que hayas configurado un bloqueo de pantalla, podrás configurar también la huella digital en Ajustes &gt; Seguridad."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desactivar bloqueo pantalla"</string>
     <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>
@@ -522,8 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Ajustes avanzados"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Ajustes avanzados de Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Cuando se activa el Bluetooth, tu dispositivo puede comunicarse con otros dispositivos Bluetooh cercanos."</string>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Para mejorar la precisión de la ubicación, las aplicaciones y los servicios buscarán dispositivos Bluetooth aunque la conexión Bluetooth esté desactivada. Puedes cambiar esta opción en los <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ajustes de búsqueda<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Conectar con…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del perfil de audio A2DP."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del audio manos libres."</string>
@@ -589,8 +584,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Para mejorar la precisión de la ubicación, las aplicaciones y los servicios buscarán redes Wi‑Fi aunque la conexión Wi‑Fi esté desactivada. Puedes cambiar esta opción en los <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ajustes de búsqueda<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"No volver a mostrar"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Usar Wi-Fi en suspensión"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi activado en suspensión"</string>
@@ -607,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Buscar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Ajustes avanzados"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Mostrar aplicaciones"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Mostrar señal Wi-Fi"</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>
@@ -666,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"¿Iniciar sesión para conectar?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> requiere que inicies sesión para conectarte."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONECTAR"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Esta red no tiene acceso a Internet. ¿Quieres utilizarla de todos modos?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"No volver a preguntar por esta red"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Error al conectar a la red"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Borrar"</string>
@@ -732,21 +726,17 @@
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Zona Wi-Fi portátil: <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="wifi_calling_settings_title" msgid="4102921303993404577">"Llamadas Wi-Fi"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Preferencia de llamada"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Modo de llamadas Wi-Fi"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Preferir Wi-Fi"</item>
     <item msgid="5267397515594230396">"Preferir datos móviles"</item>
-    <item msgid="3132912693346866895">"Solo conexión Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Si has activado las llamadas Wi-Fi, tu teléfono puede establecer las llamadas por redes Wi-Fi o por la red de tu operador, en función de la preferencia que hayas establecido y de qué señal tenga más potencia. Antes de activar esta función, consulta con tu proveedor las tarifas aplicables y otros detalles."</string>
     <string name="home_settings" msgid="212375129455718176">"Inicio"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sonido"</string>
@@ -918,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Disponible (solo lectura)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espacio total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calculando…"</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplicaciones (datos y multimedia)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Aplicaciones y datos de aplicaciones"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Multimedia"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Descargas"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Imágenes, vídeos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (música, tonos, etc.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Varios"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Otros archivos"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Datos almacenados en caché"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desactivar almacenam comp"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desactivar tarjeta SD"</string>
@@ -956,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"La tarjeta SD se está desactivando."</string>
     <string name="storage_low_title" msgid="1388569749716225155">"No queda espacio de almacenamiento"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Es posible que algunas funciones del sistema, como la sincronización, no funcionen correctamente. Prueba a eliminar o a desactivar elementos para liberar espacio (por ejemplo, aplicaciones o contenido multimedia)."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Cambiar nombre"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Activar"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Expulsar"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Borrar y formatear"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Borrar/format. como alm. int."</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Conexión USB al ordenador"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Conexión USB a ordenador"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Conectar como"</string>
@@ -966,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Permite a las aplicaciones compatibles con MIDI utilizar software de MIDI en tu ordenador por USB."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Otros usuarios"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Almacenamiento del dispositivo"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Almacenamiento extraíble"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> libres (<xliff:g id="TOTAL">%2$s</xliff:g> en total)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> se ha activado"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Error al activar <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> se ha expulsado de forma segura"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"No se ha podido expulsar <xliff:g id="NAME">%1$s</xliff:g> de forma segura"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> se ha formateado"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Error al formatear <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Cambiar nombre de almacenamiento"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Después de formatear la unidad, puedes utilizar tu <xliff:g id="NAME_0">^1</xliff:g> en otros dispositivos. \n\nTe recomendamos que hagas una copia de seguridad de los datos de tu <xliff:g id="NAME_1">^1</xliff:g>, ya que se borrarán cuando se formatee. \n\n"<b>"Copia de seguridad de fotos y de otro contenido multimedia"</b>" \nMueve tus archivos multimedia a otro espacio de almacenamiento del dispositivo o transfiérelos a un ordenador con un cable USB. \n\n"<b>"Copia de seguridad de aplicaciones"</b>" \nSe desinstalarán todas las aplicaciones almacenadas en tu <xliff:g id="NAME_6">^1</xliff:g> y se borrarán sus datos. Para conservarlas, muévelas a otro espacio de almacenamiento del dispositivo."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Al extraer tu <xliff:g id="NAME_0">^1</xliff:g>, las aplicaciones almacenadas en esa unidad dejarán de funcionar y los archivos multimedia guardados en ella no estarán disponibles hasta que se vuelva a insertar."</b>" \n\nTu <xliff:g id="NAME_1">^1</xliff:g> se ha formateado para este dispositivo y no se puede utilizar en otros."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurar tu <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utilizar como almacenamiento portátil"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Para mover fotos y otro contenido multimedia de un dispositivo a otro."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Utilizar como almacenamiento interno"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Para almacenar cualquier contenido (como aplicaciones y fotos) únicamente en este dispositivo. Se debe formatear la unidad para que no se pueda utilizar con otros dispositivos."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatear como almacen. interno"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Debes formatear tu <xliff:g id="NAME_0">^1</xliff:g> por seguridad. \n\nUna vez que se formatee, tu <xliff:g id="NAME_1">^1</xliff:g> solo funcionará en este dispositivo. \n\n"<b>"Al formatear tu <xliff:g id="NAME_2">^1</xliff:g>, se borrarán todos los datos que tenga almacenados."</b>" Te recomendamos que hagas una copia de seguridad de los datos para no perderlos."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Borrar y formatear"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formateando <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"No extraigas tu <xliff:g id="NAME">^1</xliff:g> mientras se esté formateando."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Mover a nuevo almacenamiento"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Puedes mover tus fotos, tus archivos y los datos de tus aplicaciones a la nueva <xliff:g id="NAME">^1</xliff:g>. \n\nLa operación durará aproximadamente <xliff:g id="TIME">^2</xliff:g> y permitirá liberar <xliff:g id="SIZE">^3</xliff:g> de espacio de almacenamiento interno. Algunas aplicaciones no funcionarán hasta que finalice el proceso."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Mover ahora"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Mover más tarde"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Mover datos ahora"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"La migración durará aproximadamente <xliff:g id="TIME">^1</xliff:g> y permitirá liberar <xliff:g id="SIZE">^2</xliff:g> de espacio de almacenamiento interno."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Mover"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Moviendo datos…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Durante la migración: \n• No extraigas tu <xliff:g id="NAME">^1</xliff:g>. \n• Algunas aplicaciones no funcionarán correctamente. \n• Mantén cargado el dispositivo."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"Tu <xliff:g id="NAME">^1</xliff:g> ya se puede utilizar"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Tu <xliff:g id="NAME">^1</xliff:g> se ha configurado para que se utilice con fotos y con otro contenido multimedia."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Tu nueva <xliff:g id="NAME">^1</xliff:g> está lista. \n\nPara mover fotos, archivos y datos de aplicaciones a este dispositivo, accede a Ajustes &gt; Almacenamiento."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Mover <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"La migración de <xliff:g id="APP">^1</xliff:g> y de sus datos a tu <xliff:g id="NAME_0">^2</xliff:g> solo durará un momento. No podrás utilizar la aplicación hasta que finalice el proceso. \n\nNo extraigas tu <xliff:g id="NAME_1">^2</xliff:g> durante la migración."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Moviendo <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"No extraigas tu <xliff:g id="NAME">^1</xliff:g> durante la migración \n\nLa aplicación <xliff:g id="APP">^2</xliff:g> de este dispositivo no estará disponible hasta que finalice el proceso."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancelar migración"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Estado de la batería"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivel de batería"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1010,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Restablecer configuración"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Se ha restablecido la configuración predeterminada de APN."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Restablecimiento de ajustes de red"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Se restablecerán los valores de fábrica de todos los ajustes relacionados con las redes, como:\n\n"<li>"Wi-Fi"</li>\n<li>"Datos móviles"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Se restablecerán todos los ajustes de red, como:\n\n"<li>"Wi‑Fi"</li>\n<li>"Datos móviles"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Restablecer ajustes"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"¿Quieres restablecer todos los ajustes de red? Esta acción no se puede deshacer."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"¿Quieres restablecer todos los ajustes de red? Esta acción no se puede deshacer."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Restablecer ajustes"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Debes dibujar el patrón de desbloqueo para confirmar que quieres que se restablezcan los ajustes de red."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"¿Restablecer?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Restablecimiento de ajustes de red"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Se han restablecido los ajustes de red"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Restablecer dispositivo"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Restablecer datos de fábrica"</string>
     <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>
@@ -1032,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Borra todos los datos de la tarjeta SD, como la música o las fotos."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restablecer tablet"</string>
     <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_desc" msgid="1062841478823409667">"¿Quieres borrar toda tu información personal y todas 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_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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Este usuario no puede restablecer los datos de fábrica"</string>
@@ -1051,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configurar buzón, llamada en espera, desvío e identificador"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Anclaje por USB"</string>
@@ -1084,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ayuda"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Redes móviles"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plan móvil"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Aplicación de SMS predeterminada"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplicación SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"¿Cambiar aplicación de SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"¿Usar <xliff:g id="NEW_APP">%1$s</xliff:g> en lugar de <xliff:g id="CURRENT_APP">%2$s</xliff:g> como aplicación de SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"¿Usar <xliff:g id="NEW_APP">%s</xliff:g> como aplicación de SMS?"</string>
@@ -1115,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Determinar ubicación con el GPS"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Buscando"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Buscando"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Búsqueda de redes Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Permitir que las aplicaciones y los servicios busquen redes Wi‑Fi aunque la conexión Wi‑Fi esté desactivada para mejorar la precisión de la ubicación"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Búsqueda de dispositivos Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Permitir que los servicios del sistema busquen dispositivos Bluetooth aunque la conexión Bluetooth esté desactivada para mejorar la precisión de la ubicación"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Ubicación de red móvil y Wi‑Fi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que las aplicaciones usen el servicio de ubicación de Google para calcular tu ubicación más rápido. Se recopilarán datos de ubicación anónimos y se enviarán a Google"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Ubicación determinada por Wi-Fi"</string>
@@ -1160,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"La contraseña se ha establecido."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"El PIN se ha establecido."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"El patrón se ha establecido."</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Para continuar, utiliza el patrón del dispositivo."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Para continuar, introduce el PIN del dispositivo."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Para continuar, introduce la contraseña del dispositivo."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN incorrecto"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Contraseña incorrecta"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Patrón incorrecto"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Seguridad del dispositivo"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Cambiar patrón desbloqueo"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Cambiar PIN de desbloqueo"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirma el patrón guardado"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Inténtalo de nuevo"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Crea un patrón de desbloqueo"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pulsa la tecla de menú para obtener ayuda."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Levanta el dedo cuando termines"</string>
@@ -1186,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Patrón de desbloqueo"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Cambiar patrón desbloqueo"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Cómo crear un patrón de desbloqueo"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Se han realizado demasiados intentos incorrectos."</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Espera <xliff:g id="NUMBER">%d</xliff:g> segundos y vuelve a intentarlo."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Demasiados intentos fallidos. Vuelve a intentarlo en <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"La aplicación no está instalada en el teléfono."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrar aplicaciones"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrar y eliminar aplicaciones instaladas"</string>
@@ -1238,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Ordenar por tamaño"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Servicios en ejecución"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Procesos en caché"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Aplicación Emergencia"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Restablecer preferencias"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"¿Restablecer preferencias?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Se restablecerán todas las preferencias de:\n\n "<li>"aplicaciones inhabilitadas,"</li>\n" "<li>"notificaciones de aplicaciones inhabilitadas,"</li>\n" "<li>"aplicaciones predeterminadas para realizar acciones,"</li>\n" "<li>"restricciones de conexiones automáticas de aplicaciones,"</li>\n" "<li>"restricciones de permisos."</li>\n\n" No se perderán los datos de las aplicaciones."</string>
@@ -1443,8 +1479,6 @@
     <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="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="select_logd_size_title" msgid="7433137108348553508">"Tamaños de búfer de Logger"</string>
@@ -1745,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 horas"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 día"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Mostrar sistema"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Ocultar procesos del sistema"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Usar USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipo de estadísticas"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"En segundo plano"</string>
@@ -1841,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Contraseña actual:"</string>
@@ -2216,7 +2250,7 @@
     <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 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_long" msgid="8562152293752222985">"Puedes crear más usuarios para compartir este dispositivo con otras personas. Cada usuario tiene su propio espacio, que puede personalizar con aplicaciones, fondos de pantalla, etc., y puede modificar opciones de configuración del dispositivo que afectan a todos los usuarios, como la conexión Wi‑Fi.\n\nCuando se añade un usuario, 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>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Asegúrate de que la persona pueda acceder al dispositivo y configurar su espacio"</string>
@@ -2396,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"restricción, restringir, restringido"</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_reset_apps" msgid="6420313678620788457">"restablecer preferencias predeterminadas"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"aplicación predeterminada en caso de emergencia"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"aplicación, descargar, aplicaciones, sistema"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"seguridad de permisos de aplicaciones"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"aplicaciones predeterminadas"</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>
@@ -2414,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volumen de alarma"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volumen del tono"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volumen de notificaciones"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Bloquear interrupciones"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Permitir solo con prioridad"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Reglas automáticas"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Al recibir llamadas o 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_alarms" msgid="7380265858042606857">"Permitir solo alarmas"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"No interrumpir"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Solo prioritarias"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Solo alarmas"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Sin interrupciones"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tono del teléfono"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Tono de notificación predeterminado"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrar también en llamadas"</string>
@@ -2454,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"No hay detectores de notificaciones instalados."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"¿Quieres habilitar <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> podrá leer todas las notificaciones que el sistema o cualquier aplicación instalada publique. Estas notificaciones pueden incluir información personal, como nombres de contactos y texto de mensajes que hayas recibido. También podrás ignorar estas notificaciones o tocar botones de acción."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Proveedores de condiciones"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ninguna aplicación proporciona condiciones"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d aplicaciones proporcionan condiciones</item>
-      <item quantity="one">%d aplicación proporciona condiciones</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"No se ha instalado ningún proveedor de condiciones."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"¿Quieres habilitar <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> podrá añadir condiciones de salida al modo No molestar."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicaciones..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear todo"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"No mostrar nunca notificaciones de esta aplicación"</string>
@@ -2476,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioridad"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensible"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Nombre de la regla"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Añadir regla"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Eliminar regla"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"¿Quieres eliminar la regla \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Eliminar"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Tipo de regla"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Desconocida"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configurar regla"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Regla de programación"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"No se ha encontrado esa regla."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Días"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Ninguno"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Todos los días"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nunca"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>-<xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"De <xliff:g id="START">%1$s</xliff:g> a <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2496,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmas"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Recordatorios"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Llamadas seleccionadas"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Llamadas repetidas"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Permitir llamada que proceda de la misma persona si no han pasado más de <xliff:g id="MINUTES">%d</xliff:g> desde su primera llamada"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activar automáticamente"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nunca"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Todas las noches"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"Día siguiente a las <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"¿Cuándo quieres que se te interrumpa?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"¿Durante cuánto tiempo?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Indefinidamente"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutos</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuto</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> horas</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hora</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Cambiar para ver solo notificaciones prioritarias de forma indefinida"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Cambiar para ver solo notificaciones prioritarias durante <xliff:g id="DURATION">%1$d</xliff:g> minutos (hasta las <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambiar para ver solo notificaciones prioritarias durante un minuto (hasta las <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Cambiar para ver solo notificaciones prioritarias durante <xliff:g id="DURATION">%1$d</xliff:g> horas (hasta las <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambiar para ver solo notificaciones prioritarias durante una hora (hasta las <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Cambiar para ver solo alarmas de forma indefinida"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Cambiar para ver solo alarmas durante <xliff:g id="DURATION">%1$d</xliff:g> minutos (hasta las <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambiar para ver solo alarmas durante un minuto (hasta las <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Cambiar para ver solo alarmas durante <xliff:g id="DURATION">%1$d</xliff:g> horas (hasta las <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambiar para ver solo alarmas durante una hora (hasta las <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Cambiar a no interrumpir de forma indefinida"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Cambiar a no interrumpir durante <xliff:g id="DURATION">%1$d</xliff:g> minutos (hasta las <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambiar a no interrumpir durante un minuto (hasta las <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Cambiar a no interrumpir durante <xliff:g id="DURATION">%1$d</xliff:g> horas (hasta las <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambiar a no interrumpir durante una hora (hasta las <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Cambiar a interrumpir siempre"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"siempre"</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>
@@ -2569,7 +2659,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> permisos concedidos</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> permiso concedido</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> de <xliff:g id="COUNT_3">%d</xliff:g> permisos concedidos</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> permiso concedido</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Se han establecido algunos valores predeterminados"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"No se han establecido valores predeterminados"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Todas las aplicaciones"</string>
@@ -2580,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioridad"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensible"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Con URLs de dominio"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Restablecer los valores predeterminados de las preferencias de todas las aplicaciones"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> aplicaciones instaladas, incluidas aplicaciones descargadas y del sistema"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Inhabilitado por el administrador"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Opciones avanzadas"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicación desconocida"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Seleccionar perfil"</string>
@@ -2596,4 +2688,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicaciones pueden abrir sus URL de dominio</item>
       <item quantity="one">Una aplicación puede abrir sus URL de dominio</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"No reconocido"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Aplicaciones predeterminadas"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Aplicación Navegador"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Sin navegador predeterminado"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Predeterminada)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-et-rEE/arrays.xml b/res/values-et-rEE/arrays.xml
index d53b09a..b3139b7 100644
--- a/res/values-et-rEE/arrays.xml
+++ b/res/values-et-rEE/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Vajutusnupp"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"Meedia"</item>
     <item msgid="7924928667052300589">"Seade"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"üldine asukoht"</item>
+    <item msgid="5789673140227507995">"täpne asukoht"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibratsioon"</item>
+    <item msgid="3434165993711230924">"kontaktide lugemine"</item>
+    <item msgid="616161687718081936">"kontaktide muutmine"</item>
+    <item msgid="7638002295329050091">"kõnelogi lugemine"</item>
+    <item msgid="6546959730920410907">"kõnelogi muutmine"</item>
+    <item msgid="446877710771379667">"kalendri lugemine"</item>
+    <item msgid="7674458294386319722">"kalendri muutmine"</item>
+    <item msgid="8281201165558093009">"WiFi skannimine"</item>
+    <item msgid="8694611243479480497">"märguanne"</item>
+    <item msgid="7776439107987345446">"mobiili skannimine"</item>
+    <item msgid="514615766544675057">"helistamine telefonile"</item>
+    <item msgid="8181415497109310680">"SMS-i lugemine"</item>
+    <item msgid="6816551144382117307">"SMS-i kirjutamine"</item>
+    <item msgid="4600463921908905030">"SMS-i vastuvõtmine"</item>
+    <item msgid="5958926493289432745">"hädaolukorra SMS-i vastuvõtmine"</item>
+    <item msgid="4945269495221089540">"MMS-i vastuvõtmine"</item>
+    <item msgid="5570472453573929087">"WAP-edastuse vastuvõtmine"</item>
+    <item msgid="7125408150230860501">"SMS-i saatmine"</item>
+    <item msgid="7080337936612188061">"ICC SMS-i lugemine"</item>
+    <item msgid="587124103118495063">"ICC SMS-i kirjutamine"</item>
+    <item msgid="2320577158869025503">"seadete muutmine"</item>
+    <item msgid="1545733463471924009">"peale joonistamine"</item>
+    <item msgid="3609046903962454582">"juurdepääsumärguanded"</item>
+    <item msgid="4671646036128214513">"kaamera"</item>
+    <item msgid="1097324338692486211">"heli salvestamine"</item>
+    <item msgid="5031552983987798163">"heli esitamine"</item>
+    <item msgid="8374996688066472414">"lõikelaua lugemine"</item>
+    <item msgid="3045529469061083747">"lõikelaua muutmine"</item>
+    <item msgid="5124443975763747838">"meedianupud"</item>
+    <item msgid="4547883971364273343">"helifookus"</item>
+    <item msgid="2603878814882344450">"põhihelitugevus"</item>
+    <item msgid="7136963238377062018">"hääle helitugevus"</item>
+    <item msgid="4270236897655923007">"helina helitugevus"</item>
+    <item msgid="6325739889222559394">"meedia helitugevus"</item>
+    <item msgid="5762123934816216821">"äratuse helitugevus"</item>
+    <item msgid="785049718065337473">"märguande helitugevus"</item>
+    <item msgid="6700305533746877052">"Bluetoothi helitugevus"</item>
+    <item msgid="2029227495214047094">"hoia ärkvel"</item>
+    <item msgid="26109888160231211">"monitori asukoht"</item>
+    <item msgid="5753382310468855812">"suure võimsusega asukoha jälgimine"</item>
+    <item msgid="3356591542543137332">"kasutusstatistika hankimine"</item>
+    <item msgid="3073734345226842233">"mikrofoni vaigistamine või vaigistuse tühistamine"</item>
+    <item msgid="1148142988678569310">"meediumi projitseerimine"</item>
+    <item msgid="9130014005474445273">"VPN-i aktiveerimine"</item>
+    <item msgid="1165192162975045562">"taustapilt kirjutamiseks"</item>
+    <item msgid="7129487923652967258">"abistruktuur"</item>
+    <item msgid="1069023208100114540">"abistav ekraanipilt"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Asukoht"</item>
+    <item msgid="8677040780775113033">"Asukoht"</item>
+    <item msgid="1660743989948992916">"Asukoht"</item>
+    <item msgid="8791172739860195290">"Vibratsioon"</item>
+    <item msgid="383413555642128046">"Kontaktide lugemine"</item>
+    <item msgid="3654594895269697313">"Kontaktide muutmine"</item>
+    <item msgid="7928393476362362538">"Kõnelogi lugemine"</item>
+    <item msgid="6248591205254641116">"Kõnelogi muutmine"</item>
+    <item msgid="6093344633066170692">"Kalendri lugemine"</item>
+    <item msgid="1334886368750347692">"Kalendri muutmine"</item>
+    <item msgid="1638204101698708656">"Asukoht"</item>
+    <item msgid="2154671955760380322">"Märguande postitamine"</item>
+    <item msgid="4282477730595931828">"Asukoht"</item>
+    <item msgid="4891423912898525905">"Helistamine telefonile"</item>
+    <item msgid="2623604824935968113">"SMS-i/MMS-i lugemine"</item>
+    <item msgid="4420177125221176306">"SMS-i/MMS-i kirjutamine"</item>
+    <item msgid="3986142739951490025">"SMS-i/MMS-i vastuvõtmine"</item>
+    <item msgid="3984213795861739778">"SMS-i/MMS-i vastuvõtmine"</item>
+    <item msgid="3656243523752472788">"SMS-i/MMS-i vastuvõtmine"</item>
+    <item msgid="8105802370238551510">"SMS-i/MMS-i vastuvõtmine"</item>
+    <item msgid="1407766984645388488">"SMS-i/MMS-i saatmine"</item>
+    <item msgid="3527273606643794973">"SMS-i/MMS-i lugemine"</item>
+    <item msgid="4370895547001583812">"SMS-i/MMS-i kirjutamine"</item>
+    <item msgid="4218544235221631789">"Seadete muutmine"</item>
+    <item msgid="736541391767350377">"Peale joonistamine"</item>
+    <item msgid="5530815681721654194">"Juurdepääsumärguanded"</item>
+    <item msgid="781213371706962767">"Kaamera"</item>
+    <item msgid="1720492593061838172">"Heli salvestamine"</item>
+    <item msgid="3493046322001257041">"Heli esitamine"</item>
+    <item msgid="136815868796597058">"Lõikelaua lugemine"</item>
+    <item msgid="5238692940326972503">"Lõikelaua muutmine"</item>
+    <item msgid="5753789168376302997">"Meedianupud"</item>
+    <item msgid="3265262911688671938">"Helifookus"</item>
+    <item msgid="2098976479485046797">"Põhihelitugevus"</item>
+    <item msgid="5660213838861789350">"Hääle helitugevus"</item>
+    <item msgid="7983336752371254444">"Helina helitugevus"</item>
+    <item msgid="7878027809189330917">"Meedia helitugevus"</item>
+    <item msgid="7260546305036218513">"Alarmi helitugevus"</item>
+    <item msgid="9103719301075748925">"Märguande helitugevus"</item>
+    <item msgid="7025966722295861512">"Bluetoothi helitugevus"</item>
+    <item msgid="4665183401128289653">"Hoia ärkvel"</item>
+    <item msgid="8584357129746649222">"Asukoht"</item>
+    <item msgid="7669257279311110599">"Asukoht"</item>
+    <item msgid="3459320345690097795">"Kasutusstatistika hankimine"</item>
+    <item msgid="1312534577834048535">"Mikrofoni vaigistamine või vaigistuse tühistamine"</item>
+    <item msgid="5906017727368097853">"Meediumi projitseerimine"</item>
+    <item msgid="2486614710846178542">"VPN-i aktiveerimine"</item>
+    <item msgid="5586547561693629602">"Taustapilt kirjutamiseks"</item>
+    <item msgid="32794179825485062">"Abistruktuur"</item>
+    <item msgid="7872852746938272552">"Abistav ekraanipilt"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Lühike"</item>
     <item msgid="2560532955514699713">"Keskmine"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"madal"</item>
     <item msgid="4212263919458209842">"kriitiline"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Väljas"</item>
-    <item msgid="5656544177755411222">"Piiratud katkestustega"</item>
-    <item msgid="8735337502532332056">"Katkestusteta"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Tavaline"</item>
     <item msgid="866544120205026771">"Mõõdukas"</item>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 0bc6621..f1e5c47 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kaart"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Puhverserveri seaded"</string>
     <string name="cancel" msgid="6859253417269739139">"Tühista"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"TÜHISTA"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"JÄTKA"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"JAH"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"EI"</string>
-    <string name="forget" msgid="7267115980248732932">"UNUSTA"</string>
+    <string name="forget" msgid="1400428660472591263">"Unusta"</string>
+    <string name="save" msgid="879993180139353333">"Salvesta"</string>
+    <string name="done" msgid="6942539184162713160">"Valmis"</string>
     <string name="settings_label" msgid="1626402585530130914">"Seaded"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Seaded"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Seadete otsetee"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Ühendage laadija ja proovige uuesti."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ekraaniluku PIN-koodi või parooli ei ole"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Enne krüpteerimist peate määrama lukustusekraani PIN-koodi või parooli."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Seadme krüpteerimise kinnitamiseks tuleb teil joonistada luku avamismuster."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Kas krüpteerida?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Krüpteerimistoiming on pöördumatu ja katkestamisel kaotate andmed. Krüpteerimiseks kulub tund või rohkem, mille jooksul tahvelarvuti taaskäivitub mitu korda."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Krüpteerimistoiming on pöördumatu ja selle katkestamisel kaotate andmed. Krüpteerimiseks kulub tund või rohkem, selle aja jooksul taaskäivitub telefon mitu korda."</string>
@@ -419,8 +416,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Muster"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN-kood"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Parool"</string>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Kui olete ekraaniluku seadistanud, saate menüüs Seaded &gt; Turvalisus seadistada ka oma sõrmejälje."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Lülita ekraanilukk välja"</string>
     <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>
@@ -522,8 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Täpsemad"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Täpsemad Bluetoothi seaded"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Kui Bluetooth on sisse lülitatud, saab seade suhelda teiste lähikonna Bluetooth-seadmetega."</string>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Asukoha täpsuse parandamiseks skannivad rakendused ja teenused Bluetoothi seadmeid, isegi kui Bluetooth on välja lülitatud. Saate seda muuta <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>skannimisseadetes<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Ühendamine ..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Seadme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ühendus meediumiheliga katkestatakse."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Seadme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ühendus vabakäeseadme heliga katkestatakse."</string>
@@ -589,8 +584,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Asukoha täpsuse parandamiseks skannivad rakendused ja teenused WiFi-võrke, isegi kui WiFi on välja lülitatud. Saate seda muuta <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>skannimisseadetes<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ära kuva uuesti"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Hoia WiFi unerežiimis sees"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"WiFi on unerež. sisselülitatud"</string>
@@ -607,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"WiFi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skannimine"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Täpsemalt"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Kuva rakendused"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Kuva WiFi tugevus"</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>
@@ -666,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Kas logida sisse, et ühendada?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> nõuab, et peate enne võrguga ühendamist veebis sisse logima."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ÜHENDA"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Sellel võrgul puudub juurdepääs Internetile. Kas soovite siiski seda võrku kasutada?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Ära selle võrgu puhul uuesti küsi"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Ühenda"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Võrguga ühenduse loomine ebaõnnestus"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unusta"</string>
@@ -732,21 +726,17 @@
     <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> kaasaskantav WiFi-tugijaam"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"WiFi-kõned"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Kõne-eelistus"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"WiFi-kõnerežiim"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"WiFi eelistusega"</item>
     <item msgid="5267397515594230396">"Mobiilside eelistusega"</item>
-    <item msgid="3132912693346866895">"Ainult WiFi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Kui WiFi-kõned on sisse lülitatud, saab telefon olenevalt eelistustest ja signaalitugevusest kõnesid marsruutida WiFi-võrkude või teie operaatori võrgu kaudu. Enne selle funktsiooni sisselülitamist uurige operaatorilt tasude ja muude üksikasjade kohta."</string>
     <string name="home_settings" msgid="212375129455718176">"Avaekraan"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Kuva"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Heli"</string>
@@ -918,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Saadaval (kirjutuskaitstud)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Kogu ruum"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Arvutamine ..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Rakendused (rakenduse andmed ja meediasisu)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Rakendused ja rakenduste andmed"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Meedium"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Allalaadimised"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Pildid, videod"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Heli (muusika, helinad, Interneti-saated jne)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Muu"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Muud failid"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Vahemälus olevad andmed"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Lahuta jagatud mälu"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Lahutage SD-kaart"</string>
@@ -956,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Eemaldamine pooleli"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Talletusruum saab täis"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Mõned süsteemifunktsioonid, nt sünkroonimine, ei pruugi õigesti toimida. Proovige vabastada ruumi, kustutades üksusi, nt rakendusi või meediasisu, või eemaldades neid."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Ümbernimetamine"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Ühendamine"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Eemaldamine"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Kustutamine ja vormindamine"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Kustut. ja vormind. sisem. salvestusr."</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB-arvutiühendus"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-arvutiühendus"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Ühenda kui"</string>
@@ -966,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Võimaldab MIDI toega rakendustel teie arvutis oleva MIDI-tarkvara abil töötada USB kaudu."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Teised kasutajad"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Seadme salvestusruum"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Irdmälu"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> on vaba (kokku <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Üksus <xliff:g id="NAME">%1$s</xliff:g> ühendati"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Üksust <xliff:g id="NAME">%1$s</xliff:g> ei saanud ühendada"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"Üksus <xliff:g id="NAME">%1$s</xliff:g> eemaldati ohutult"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Üksust <xliff:g id="NAME">%1$s</xliff:g> ei saanud ohutult eemaldada"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"Üksus <xliff:g id="NAME">%1$s</xliff:g> vormindati"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Üksust <xliff:g id="NAME">%1$s</xliff:g> ei saanud vormindada"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Salvestusruumi ümbernimetamine"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Pärast vormindamist saate üksust <xliff:g id="NAME_0">^1</xliff:g> kasutada teistes seadmetes. \n\nKõik üksuses <xliff:g id="NAME_1">^1</xliff:g> olevad andmed kustutatakse. Kaaluge esmalt nende varundamist. \n\n"<b>"Fotode ja muu meedia varundamine"</b>" \nTeisaldage oma meediafailid selle seadme teise salvestusruumi või kandke need USB-kaabli abil üle arvutisse. \n\n"<b>"Rakenduste varundamine"</b>" \nKõik üksusesse <xliff:g id="NAME_6">^1</xliff:g> salvestatud rakendused desinstallitakse ja nende andmed kustutatakse. Nende rakenduste säilitamiseks teisaldage need selle seadme teise salvestusruumi."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Kui üksuse <xliff:g id="NAME_0">^1</xliff:g> eemaldate, lõpetavad sellesse salvestatud rakendused töö ja selles olevad meediafailid pole saadaval, kuni selle uuesti sisestate."</b>" \n\nÜksus <xliff:g id="NAME_1">^1</xliff:g> on vormindatud ainult selles seadmes töötamiseks. See ei tööta teistes seadmetes."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Seadista üksus <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Kasuta kaasaskantava salvestusruumina"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Fotode ja muu meedia teisaldamiseks seadmete vahel."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Kasuta sisemise salvestusruumina"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Üksuste (sh rakendused ja fotod) ainult sellesse seadmesse salvestamiseks. Vajalik on vormindamine, mis takistab selle töötamist teistes seadmetes."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Vorminda sisem. salvestusruumina"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Üksuse <xliff:g id="NAME_0">^1</xliff:g> turvaliseks muutmiseks tuleb see vormindada. \n\nPärast vormindamist töötab üksus <xliff:g id="NAME_1">^1</xliff:g> ainult selles seadmes. \n\n"<b>"Vormindamisel kustutatakse kõik praegu üksusesse <xliff:g id="NAME_2">^1</xliff:g> salvestatud andmed."</b>" Andmete kaotamise vältimiseks kaaluge nende varundamist."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Kustuta ja vorminda"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Üksuse <xliff:g id="NAME">^1</xliff:g> vormindamine …"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Ärge eemaldage üksust <xliff:g id="NAME">^1</xliff:g> vormindamise ajal."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Teis. andmed uude salvestusruumi"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Saate fotod, failid ja rakenduste andmed teisaldada uude üksusesse <xliff:g id="NAME">^1</xliff:g>. \n\nTeisaldamine võtab umbes <xliff:g id="TIME">^2</xliff:g> ja vabastab sisemises salvestusruumis <xliff:g id="SIZE">^3</xliff:g>. Selle toimingu ajal mõned rakendused ei tööta."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Teisalda kohe"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Teisalda hiljem"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Teisalda andmed kohe"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Teisaldamine võtab umbes <xliff:g id="TIME">^1</xliff:g>. See vabastab sisemises salvestusruumis <xliff:g id="SIZE">^2</xliff:g>."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Teisalda"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Andmete teisaldamine …"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Teisaldamise ajal: \n• ärge eemaldage üksust <xliff:g id="NAME">^1</xliff:g>; \n• ei tööta mõned rakendused korralikult; \n• hoidke seadet laetuna."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"Üksus <xliff:g id="NAME">^1</xliff:g> on valmis"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Üksus <xliff:g id="NAME">^1</xliff:g> on valmis fotode ja muu meediaga kasutamiseks."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Uus üksus <xliff:g id="NAME">^1</xliff:g> töötab. \n\nFotode, failide ja rakenduse andmete teisaldamiseks seadmesse avage menüü Seaded &gt; Salvestusruum."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Teisalda rakendus <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Rakenduse <xliff:g id="APP">^1</xliff:g> ja selle andmete teisaldamine üksusesse <xliff:g id="NAME_0">^2</xliff:g> võtab vaid mõne hetke. Te ei saa rakendust kasutada enne, kui teisaldamine on lõpetatud. \n\nTeisaldamise ajal ärge eemaldage üksust <xliff:g id="NAME_1">^2</xliff:g>."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Rakenduse <xliff:g id="APP">^1</xliff:g> teisaldamine …"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Ärge eemaldage teisaldamise ajal üksust <xliff:g id="NAME">^1</xliff:g>. \n\nRakendus <xliff:g id="APP">^2</xliff:g> pole seadmes saadaval enne, kui teisaldamine on lõpetatud."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Tühista teisaldamine"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Aku olek"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Aku tase"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Pääsupunktinimed"</string>
@@ -1010,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Lähtesta vaikeseadetele"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN-i vaikeseadete lähtestamine on lõpule viidud."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Võrguseadete lähtestamine"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"See lähtestab kõik võrguühendusega seotud seaded tehase vaikeseadetele, sh:\n\n"<li>"WiFi"</li>\n<li>"mobiilne andmeside"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"See lähtestab kõik võrguseaded, sh:\n\n"<li>"WiFi"</li>\n<li>"mobiilne andmeside"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Lähtesta seaded"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Kas lähtestada kõik võrguseaded? Seda toimingut ei saa tagasi võtta."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Kas lähtestada kõik võrguseaded? Seda toimingut ei saa tagasi võtta."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Lähtesta seaded"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Võrguseadete lähtestamise kinnitamiseks peate joonistama avamismustri."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Kas lähtestada?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Võrguseadete lähtestamine"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Võrguseaded lähtestati"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Lähtesta seade"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Tehaseandmete lähtestamine"</string>
     <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>
@@ -1032,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD-kaardilt kõigi andmete (nt muusika või fotode) kustutamine"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Lähtesta tahvelarvuti"</string>
     <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_desc" msgid="1062841478823409667">"Kas kustutada kõik teie isiklikud andmed 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_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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Tehaseseadetele lähtestamine pole selle kasutaja puhul saadaval"</string>
@@ -1051,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Seadista kõnepost, kõne edastamine, ootel kõne, helistaja ID"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB jagamine"</string>
@@ -1084,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Abi"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobiilsidevõrgud"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobiilipakett"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"SMS-i vaikerakendus"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS-i rakendus"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Kas muuta SMS-i rakendust?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Kas kasutada SMS-i rakendusena rakenduse <xliff:g id="NEW_APP">%1$s</xliff:g> asemel rakendust <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Kas kasutada SMS-i rakendusena rakendust <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
@@ -1115,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Kasutage asukoha määramiseks GPS-i"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Skannimine"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skannimine"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"WiFi skannimine"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Parandab asukoha täpsust, lubades rakendustel ja teenustel skannida WiFi-võrke, isegi kui WiFi on välja lülitatud"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetoothi skannimine"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Parandab asukoha täpsust, lubades süsteemiteenustel skannida Bluetoothi seadmeid, isegi kui Bluetooth on välja lülitatud"</string>
     <string name="location_network_based" msgid="6010456018401296590">"WiFi/mobiilsidevõrgu asukoht"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Lubage rakendustel kasutada Google\'i asukohateenust, et asukohta kiiremini määrata. Kogutud anonüümsed asukohaandmed saadetakse Google\'ile."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"WiFi järgi määratud asukoht"</string>
@@ -1160,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Parool on määratud"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-kood on määratud"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Muster on määratud"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Jätkamiseks kasutage seadme mustrit."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Jätkamiseks sisestage seadme PIN-kood."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Jätkamiseks sisestage seadme parool."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Vale PIN-kood"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Vale parool"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Vale muster"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Seadme turvalisus"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Muuda avamismustrit"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Muuda avamise PIN-koodi"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Kinnitage salvestatud muster"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Proovige uuesti:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Joonistage avamismuster"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Abi saamiseks vajutage valikut Menüü."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Kui olete valmis, siis tõstke sõrm"</string>
@@ -1186,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Määra avamismuster"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Muuda avamismustrit"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Kuidas joonistada avamismustrit"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Liiga palju valesid katseid."</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Proovige uuesti <xliff:g id="NUMBER">%d</xliff:g> sekundi pärast."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Liiga palju valesid katseid. Proovige uuesti <xliff:g id="NUMBER">%d</xliff:g> sekundi pärast."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Rakendus pole teie telefoni installitud."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Halda rakendusi"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Installitud rakenduste haldamine ja eemaldamine"</string>
@@ -1238,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sordi suuruse järgi"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Kuva töötavad teenused"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Kuva vahemällu salvestatud protsessid"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Hädaabirakendus"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Läht. rakend. eelistused"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Läht. rakend. eelistused?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"See lähtestab kõik järgmised eelistused:\n\n "<li>"Keelatud rakendused"</li>\n" "<li>"Keelatud rakenduse märguanded"</li>\n" "<li>"Toimingute vaikerakendused"</li>\n" "<li>"Rakenduste taustaandmete piirangud"</li>\n" "<li>"Igasugused lubade piirangud"</li>\n\n" Rakenduse andmed säilivad."</string>
@@ -1443,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Hõiva kõik faili Bluetoothi HCI paketid"</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="select_logd_size_title" msgid="7433137108348553508">"Logija puhvri suurused"</string>
@@ -1745,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 tundi"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 päev"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Süsteemi kuvamine"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Süsteemi peitmine"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"USS-i kasutamine"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistika tüüp"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Taust"</string>
@@ -1841,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Kehtiv parool:"</string>
@@ -2216,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Kasutaja"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Piiratud profiil"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Kas lisada uus kasutaja?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Võite jagada seadet teiste kasutajatega, luues uusi kasutajaid. Igal kasutajal on oma ruum, mida saab kohandada rakenduste, taustapildi ja muuga. Kasutajad saavad kohandada ka seadme seadeid, näiteks WiFi-valikuid, mis mõjutavad kõiki kasutajaid.\n\nKui lisate uue kasutaja, siis peab ta seadistama oma ruumi.\n\nIga kasutaja saab värskendada rakendusi kõigi kasutajate jaoks."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Võite jagada seadet teiste inimestega, luues uusi kasutajaid. Igal kasutajal on oma ruum, mida saab kohandada rakenduste, taustapildi ja muuga. Kasutajad saavad kohandada ka seadme seadeid, näiteks WiFi-valikuid, mis mõjutavad kõiki kasutajaid.\n\nKui lisate uue kasutaja, siis peab ta seadistama oma ruumi.\n\nIga kasutaja saab värskendada rakendusi kõigi kasutajate jaoks."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Kui lisate uue kasutaja, siis peab ta seadistama oma ruumi.\n\nIga kasutaja saab värskendada rakendusi kõigi kasutajate jaoks."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Kas seadistada nüüd kasutaja?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Veenduge, et isik saaks seadet kasutada ja oma ruumi seadistada"</string>
@@ -2396,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"piirang piira piiratud"</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_reset_apps" msgid="6420313678620788457">"lähtestamine eelistused vaikeseade"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"hädaabi ICE rakendus vaikimisi"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"rakendused allalaadimine rakendus süsteem"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"rakendused load turvalisus"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"rakendused vaikimisi"</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>
@@ -2414,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmi helitugevus"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Helina helitugevus"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Märguande helitugevus"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Katkestuste blokeerimine"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioriteetne lubab ainult"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automaatsed reeglid"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Kõnede ja 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_alarms" msgid="7380265858042606857">"Luba ainult alarmid"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ära katkesta"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Ainult prioriteetsed"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Ainult alarmid"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Katkestusi pole"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefoni helin"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Märguande vaikehelin"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibreeri ka kõnede puhul"</string>
@@ -2454,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Märguannete kuulamisteenuseid pole installitud."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Kas lubada <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Teenus <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> suudab lugeda kõiki süsteemi või installitud rakenduse postitatud märguandeid. Sinna hulka võivad kuuluda ka isiklikud andmed, nagu kontaktide nimed ja teile saadetud sõnumite tekst. See võib nendest märguannetest ka loobuda või nendes olevaid toimingunuppe puudutada."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Tingimuste esitajad"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ükski rakendus ei esita tingimusi"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d rakendust esitavad tingimusi</item>
-      <item quantity="one">%d rakendus esitab tingimusi</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Ühtki tingimuste esitajat ei ole installitud."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Kas luban teenuse <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> võib režiimile Mitte segada väljumistingimusi lisada."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Rakenduste laadimine ..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokeeri kõik"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ära kuva kunagi selle rakenduse märguandeid"</string>
@@ -2476,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioriteet"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Tundlik"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Reegli nimi"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Reegli lisamine"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Reegli kustutamine"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Kas kustutada reegel „<xliff:g id="RULE">%1$s</xliff:g>”?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Kustuta"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Reegli tüüp"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Teadmata"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Reegli seadistamine"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Ajakava reegel"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Reeglit ei leitud."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Päevad"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Puudub"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Iga päev"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Mitte kunagi"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> kuni <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2496,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmid"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Meeldetuletused"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Sündmused"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Valitud helistajad"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Korduvad helistajad"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Kui sama inimene helistab <xliff:g id="MINUTES">%d</xliff:g> minuti jooksul teist korda, siis see lubatakse"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Autom. sisselülitus"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Mitte kunagi"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Igal õhtul"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> järgmisel päeval"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Millal soovite, et teid katkestatakse?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Kui kauaks?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Määramata ajaks"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutit</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minut</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tundi</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> tund</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Muudetakse määramata ajaks valikule Ainult prioriteetsed märguanded"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Muudetakse valikule Ainult prioriteetsed märguanded <xliff:g id="DURATION">%1$d</xliff:g> minutiks kellani <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Muudetakse valikule Ainult prioriteetsed märguanded üheks minutiks kellani <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Muudetakse valikule Ainult prioriteetsed märguanded <xliff:g id="DURATION">%1$d</xliff:g> tunniks (kellani <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Muudetakse valikule Ainult prioriteetsed märguanded üheks tunniks kellani <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Muudetakse määramata ajaks valikule Ainult alarmid"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Muudetakse valikule Ainult alarmid <xliff:g id="DURATION">%1$d</xliff:g> minutiks (kellani <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Muudetakse valikule Ainult alarmid üheks minutiks kellani <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Muudetakse valikule Ainult alarmid <xliff:g id="DURATION">%1$d</xliff:g> tunniks kellani <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Muudetakse valikule Ainult alarmid üheks tunniks kellani <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Muudetakse määramata ajaks valikule Ära katkesta"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Muudetakse valikule Ära katkesta <xliff:g id="DURATION">%1$d</xliff:g> minutiks (kellani <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Muudetakse valikule Ära katkesta üheks minutiks kellani <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Muudetakse valikule Ära katkesta <xliff:g id="DURATION">%1$d</xliff:g> tunniks kellani <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Muudetakse valikule Ära katkesta üheks tunniks kellani <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Muudetakse valikule Katkesta alati"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"igavesti"</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>
@@ -2569,7 +2659,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> luba on antud</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> luba on antud</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g>/<xliff:g id="COUNT_3">%d</xliff:g> loast on antud</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g> loast on antud</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Määratud on mõned vaikevalikud"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Ühtegi vaikevalikut pole määratud"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Kõik rakendused"</string>
@@ -2580,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioriteetne"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Tundlik"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Domeeni URL-idega"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Kõikide rakenduste eelistuste lähtestamine vaikeseadetele"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"Installiti <xliff:g id="COUNT">%d</xliff:g> rakendust, sh süsteemi- ja allalaaditud rakendused"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Administraator on keelanud"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Täpsemad"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Tundmatu rakendus"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Profiili valimine"</string>
@@ -2596,4 +2688,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> rakendust saavad avada oma domeeni URL-id</item>
       <item quantity="one">Üks rakendus saab avada oma domeeni URL-id</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Ei tuvastatud"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Vaikerakendused"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Brauserirakendus"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Vaikebrauserit pole"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Vaikeseade)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-eu-rES/arrays.xml b/res/values-eu-rES/arrays.xml
index 2f3fa97..9a5d048 100644
--- a/res/values-eu-rES/arrays.xml
+++ b/res/values-eu-rES/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Sakatu botoia"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"Multimedia-edukia"</item>
     <item msgid="7924928667052300589">"Gailua"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"gutxi gorabeherako kokapena"</item>
+    <item msgid="5789673140227507995">"kokapen zehatza"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"dardara"</item>
+    <item msgid="3434165993711230924">"irakurri kontaktuak"</item>
+    <item msgid="616161687718081936">"aldatu kontaktuak"</item>
+    <item msgid="7638002295329050091">"irakurri deien erregistroa"</item>
+    <item msgid="6546959730920410907">"aldatu deien erregistroa"</item>
+    <item msgid="446877710771379667">"irakurri egutegia"</item>
+    <item msgid="7674458294386319722">"aldatu egutegia"</item>
+    <item msgid="8281201165558093009">"Wi-Fi sareak bilatzea"</item>
+    <item msgid="8694611243479480497">"jakinarazpena"</item>
+    <item msgid="7776439107987345446">"sare mugikorrak bilatzea"</item>
+    <item msgid="514615766544675057">"deitu telefonora"</item>
+    <item msgid="8181415497109310680">"irakurri SMS mezuak"</item>
+    <item msgid="6816551144382117307">"idatzi SMS mezuak"</item>
+    <item msgid="4600463921908905030">"jaso SMS mezuak"</item>
+    <item msgid="5958926493289432745">"jaso larrialdiko SMS mezuak"</item>
+    <item msgid="4945269495221089540">"jaso MMS mezuak"</item>
+    <item msgid="5570472453573929087">"jaso WAP push-jakinarazpenak"</item>
+    <item msgid="7125408150230860501">"bidali SMS mezuak"</item>
+    <item msgid="7080337936612188061">"irakurri ICC SMS mezuak"</item>
+    <item msgid="587124103118495063">"idatzi ICC SMS mezuak"</item>
+    <item msgid="2320577158869025503">"aldatu ezarpenak"</item>
+    <item msgid="1545733463471924009">"marraztu gainean"</item>
+    <item msgid="3609046903962454582">"atzitu jakinarazpenak"</item>
+    <item msgid="4671646036128214513">"kamera"</item>
+    <item msgid="1097324338692486211">"grabatu audioa"</item>
+    <item msgid="5031552983987798163">"erreproduzitu audioa"</item>
+    <item msgid="8374996688066472414">"irakurri arbela"</item>
+    <item msgid="3045529469061083747">"aldatu arbela"</item>
+    <item msgid="5124443975763747838">"multimedia-botoiak"</item>
+    <item msgid="4547883971364273343">"audio-fokatzea"</item>
+    <item msgid="2603878814882344450">"bolumen nagusia"</item>
+    <item msgid="7136963238377062018">"ahotsaren bolumena"</item>
+    <item msgid="4270236897655923007">"tonuaren bolumena"</item>
+    <item msgid="6325739889222559394">"multimedia-elementuen bolumena"</item>
+    <item msgid="5762123934816216821">"alarmaren bolumena"</item>
+    <item msgid="785049718065337473">"jakinarazpenen bolumena"</item>
+    <item msgid="6700305533746877052">"Bluetootharen bolumena"</item>
+    <item msgid="2029227495214047094">"eduki aktibo"</item>
+    <item msgid="26109888160231211">"kontrolatu kokapena"</item>
+    <item msgid="5753382310468855812">"egin potentzia handiko kokapen-kontrola"</item>
+    <item msgid="3356591542543137332">"lortu erabilera-estatistikak"</item>
+    <item msgid="3073734345226842233">"aktibatu edo desaktibatu mikrofonoa"</item>
+    <item msgid="1148142988678569310">"proiektatu multimedia-edukia"</item>
+    <item msgid="9130014005474445273">"aktibatu VPN konexioa"</item>
+    <item msgid="1165192162975045562">"idatzi horma-paperean"</item>
+    <item msgid="7129487923652967258">"lagundu egiturarekin"</item>
+    <item msgid="1069023208100114540">"lagundu pantaila-argazkiarekin"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Kokapena"</item>
+    <item msgid="8677040780775113033">"Kokapena"</item>
+    <item msgid="1660743989948992916">"Kokapena"</item>
+    <item msgid="8791172739860195290">"Dardara"</item>
+    <item msgid="383413555642128046">"Irakurri kontaktuak"</item>
+    <item msgid="3654594895269697313">"Aldatu kontaktuak"</item>
+    <item msgid="7928393476362362538">"Irakurri deien erregistroa"</item>
+    <item msgid="6248591205254641116">"Aldatu deien erregistroa"</item>
+    <item msgid="6093344633066170692">"Irakurri egutegia"</item>
+    <item msgid="1334886368750347692">"Aldatu egutegia"</item>
+    <item msgid="1638204101698708656">"Kokapena"</item>
+    <item msgid="2154671955760380322">"Bidali jakinarazpena"</item>
+    <item msgid="4282477730595931828">"Kokapena"</item>
+    <item msgid="4891423912898525905">"Deitu telefonora"</item>
+    <item msgid="2623604824935968113">"Irakurri SMS/MMS mezuak"</item>
+    <item msgid="4420177125221176306">"Idatzi SMS/MMS mezuak"</item>
+    <item msgid="3986142739951490025">"Jaso SMS/MMS mezuak"</item>
+    <item msgid="3984213795861739778">"Jaso SMS/MMS mezuak"</item>
+    <item msgid="3656243523752472788">"Jaso SMS/MMS mezuak"</item>
+    <item msgid="8105802370238551510">"Jaso SMS/MMS mezuak"</item>
+    <item msgid="1407766984645388488">"Bidali SMS/MMS mezuak"</item>
+    <item msgid="3527273606643794973">"Irakurri SMS/MMS mezuak"</item>
+    <item msgid="4370895547001583812">"Idatzi SMS/MMS mezuak"</item>
+    <item msgid="4218544235221631789">"Aldatu ezarpenak"</item>
+    <item msgid="736541391767350377">"Marraztu gainean"</item>
+    <item msgid="5530815681721654194">"Atzitu jakinarazpenak"</item>
+    <item msgid="781213371706962767">"Kamera"</item>
+    <item msgid="1720492593061838172">"Grabatu audioa"</item>
+    <item msgid="3493046322001257041">"Erreproduzitu audioa"</item>
+    <item msgid="136815868796597058">"Irakurri arbela"</item>
+    <item msgid="5238692940326972503">"Aldatu arbela"</item>
+    <item msgid="5753789168376302997">"Multimedia-botoiak"</item>
+    <item msgid="3265262911688671938">"Audio-fokatzea"</item>
+    <item msgid="2098976479485046797">"Bolumen nagusia"</item>
+    <item msgid="5660213838861789350">"Ahotsaren bolumena"</item>
+    <item msgid="7983336752371254444">"Tonuaren bolumena"</item>
+    <item msgid="7878027809189330917">"Multimedia-elementuen bolumena"</item>
+    <item msgid="7260546305036218513">"Alarmaren bolumena"</item>
+    <item msgid="9103719301075748925">"Jakinarazpenen bolumena"</item>
+    <item msgid="7025966722295861512">"Bluetootharen bolumena"</item>
+    <item msgid="4665183401128289653">"Mantendu aktibo"</item>
+    <item msgid="8584357129746649222">"Kokapena"</item>
+    <item msgid="7669257279311110599">"Kokapena"</item>
+    <item msgid="3459320345690097795">"Lortu erabilera-estatistikak"</item>
+    <item msgid="1312534577834048535">"Aktibatu edo desaktibatu mikrofonoa"</item>
+    <item msgid="5906017727368097853">"Proiektatu multimedia-edukia"</item>
+    <item msgid="2486614710846178542">"Aktibatu VPN konexioa"</item>
+    <item msgid="5586547561693629602">"Idatzi horma-paperean"</item>
+    <item msgid="32794179825485062">"Lagundu egiturarekin"</item>
+    <item msgid="7872852746938272552">"Lagundu pantaila-argazkiarekin"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Laburra"</item>
     <item msgid="2560532955514699713">"Ertaina"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"gutxi"</item>
     <item msgid="4212263919458209842">"oso gutxi"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Desaktibatuta"</item>
-    <item msgid="5656544177755411222">"Etenaldi mugatuak"</item>
-    <item msgid="8735337502532332056">"Etenaldirik ez"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normala"</item>
     <item msgid="866544120205026771">"Ertaina"</item>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 107f2b5..fa45fac 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD txartela"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy-ezarpenak"</string>
     <string name="cancel" msgid="6859253417269739139">"Utzi"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"UTZI"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"JARRAITU"</string>
     <string name="okay" msgid="1997666393121016642">"Ados"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"BAI"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"EZ"</string>
-    <string name="forget" msgid="7267115980248732932">"AHAZTU"</string>
+    <string name="forget" msgid="1400428660472591263">"Ahaztu"</string>
+    <string name="save" msgid="879993180139353333">"Gorde"</string>
+    <string name="done" msgid="6942539184162713160">"Eginda"</string>
     <string name="settings_label" msgid="1626402585530130914">"Ezarpenak"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Ezarpenak"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Ezarpenen lasterbidea"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Entxufatu kargagailua eta saiatu berriro."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Pantaila blokeatuaren PIN edo pasahitzik ez"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Enkriptatzen hasi aurretik, pantaila blokeatzeko PIN kode edo pasahitz bat zehaztu behar duzu."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Gailua enkriptatu nahi duzula berresteko, desblokeatzeko eredua marraztu behar duzu."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Enkriptatu nahi duzu?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Enkriptatze-eragiketa atzeraezina da eta eteten baduzu, datuak galduko dituzu. Enkriptatzeko ordubete edo gehiago behar izaten da eta, prozesuak dirauen bitartean, tableta hainbat aldiz berrabiaraziko da."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Enkriptatze-eragiketa atzeraezina da eta eteten baduzu, datuak galduko dituzu. Enkriptatzeko ordubete edo gehiago behar izaten da eta, prozesuak dirauen bitartean, telefonoa hainbat aldiz berrabiaraziko da."</string>
@@ -419,8 +416,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Eredua"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN kodea"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Pasahitza"</string>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Pantaila blokeatzeko aukera ezarri ondoren, hatz-marka konfigura dezakezu Ezarpenak &gt; Segurtasuna atalean."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desakt. pant.-blokeoa"</string>
     <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>
@@ -522,8 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Ezarpen aurreratuak"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth ezarpen aurreratuak"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetootha gaituta dagoenean, inguruko Bluetooth gailuekin komunika daiteke gailua."</string>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Kokapenaren zehaztasuna hobetzeko, aplikazioek eta zerbitzuek Bluetooth gailuak bilatuko dituzte, baita Bluetooth konexioa desaktibatuta dagoenean ere. Aukera hori aldatu nahi baduzu, zoaz <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>bilaketen ezarpenetara<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Konektatu hona…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> deskonektatuko da euskarriaren audiotik."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> deskonektatuko da esku libreko audiotik."</string>
@@ -589,8 +584,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Kokapenaren zehaztasuna hobetzeko, aplikazioek eta zerbitzuek Wi-Fi sareak bilatuko dituzte, baita Wi-Fi konexioa desaktibatuta dagoenean ere. Aukera hori aldatu nahi baduzu, zoaz <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>bilaketen ezarpenetara<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ez erakutsi berriro"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Izan Wi-Fia aktibatuta egoera inaktiboan"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi aktibatuta inaktibo moduan"</string>
@@ -607,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Bilatu"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Ezarpen aurreratuak"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Erakutsi aplikazioak"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Erakutsi Wi-Fi seinalea"</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>
@@ -666,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Saioa hasi nahi duzu konektatzeko?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak saioa hastea eskatzen du konektatu ahal izateko."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"KONEKTATU"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Sare honek ezin du Internet atzitu. Sare hau erabili nahi duzu hala ere?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Ez galdetu berriro sarea hau bada"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Konektatu"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Ezin izan da sarera konektatu"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Ahaztu"</string>
@@ -737,14 +731,12 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi sarea hobetsia"</item>
     <item msgid="5267397515594230396">"Sare mugikorra hobetsia"</item>
-    <item msgid="3132912693346866895">"Wi-Fi sarea soilik"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wi-Fi bidezko deiak aktibatuta daudenean, telefonoak deiak Wi-Fi sareen bidez edo operadorearen sarearen bidez bidera ditzake, zure hobespenen eta seinalearen sendotasunaren arabera. Eginbide hau aktibatu aurretik, eskatu tarifak eta bestelako informazioa operadoreari."</string>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wi-Fi bidezko deiak aktibatuta daudenean, telefonoak Wi-Fi sareen bidez edo operadorearen sarearen bidez bidera ditzake deiak, zure hobespenen eta seinalearen sendotasunaren arabera. Eginbide hau aktibatu aurretik, eskatu tarifak eta bestelako informazioa operadoreari."</string>
     <string name="home_settings" msgid="212375129455718176">"Hasiera"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Bistaratzea"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Soinua"</string>
@@ -916,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Erabilgarri (irakurtzeko soilik)"</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_apps_usage" msgid="5128673488173839077">"Aplikazioak eta aplikazioen datuak"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Multimedia-edukia"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Deskargak"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Irudiak, bideoak"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audioa (musika, tonuak, podcastak eta abar)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Askotarikoak"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Beste fitxategi batzuk"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Cachean gordetako datuak"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desmuntatu partekatutako memoria"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desmuntatu SD txartela"</string>
@@ -954,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desmuntatzea abian da"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Memoria agortzen ari da"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Baliteke sistemaren funtzio batzuk behar bezala ez funtzionatzea, esaterako, sinkronizazioa. Saiatu memorian tokia egiten elementu batzuk ezabatuta edo desainguratuta, adibidez, aplikazioak edo multimedia-edukia."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Aldatu izena"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Muntatu"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Atera"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Ezabatu edukia eta formateatu"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Ezabatu eta formateatu memoria"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB ordenagailu-konexioa"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-ordenagailu konexioa"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Konektatu honela"</string>
@@ -964,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"MIDI gaitasuna duten aplikazioei ordenagailuko MIDI softwarearekin USB bidez lan egitea baimentzen die."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Beste erabiltzaileak"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Gailuaren memoria"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Memoria aldagarria"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> libre (<xliff:g id="TOTAL">%2$s</xliff:g> guztira)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Muntatu da <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Ezin izan da muntatu <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"Atera da segurtasunez <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Ezin izan da atera segurtasunez <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"Formateatu da <xliff:g id="NAME">%1$s</xliff:g> memoria-unitatea"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Ezin izan da formateatu <xliff:g id="NAME">%1$s</xliff:g> memoria-unitatea"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Aldatu memoriaren izena"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Formateatu ondoren, beste gailu batzuetan erabili ahal izango duzu <xliff:g id="NAME_0">^1</xliff:g>. \n\n<xliff:g id="NAME_1">^1</xliff:g> memoriako datu guztiak ezabatu egingo dira; beraz, aurretik babeskopia bat egitea gomendatzen dizugu. \n\n"<b>"Egin argazkien eta bestelako multimedia-fitxategien babeskopia"</b>\n"Eraman multimedia-fitxategiak gailu honetako beste memoria batzuetara, edo transferitu ordenagailu batera USB kable baten bidez. \n\n"<b>"Egin aplikazioen babeskopia"</b>\n"<xliff:g id="NAME_6">^1</xliff:g> memorian gordeta dauden aplikazio guztiak desinstalatu egingo dira eta horien datuak ezabatu egingo dira. Aplikazioak gordetzeko, eraman gailu honetako beste memoria batera."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"<xliff:g id="NAME_0">^1</xliff:g> memoria ateratzen duzunean, han gordetako aplikazioek funtzionatzeari utziko diote eta gordetako multimedia-fitxategiak ez dira erabilgarri egongo memoria berriro sartzen duzun arte."</b>\n\n"<xliff:g id="NAME_1">^1</xliff:g> memoria gailu honetan soilik funtzionatzeko formateatuta dago, eta ez du beste inon funtzionatuko."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Konfiguratu <xliff:g id="NAME">^1</xliff:g> memoria"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Erabili biltegiratze-gailu eramangarri gisa"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Argazkiak eta bestelako multimedia-fitxategiak gailu batetik bestera eramateko."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Erabili barneko memoria gisa"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Edozein gauza gailu honetan soilik gordetzeko, aplikazioak eta argazkiak barne. Erabilera hau emateko, beste gailu batzuetan funtzionatzea galarazten duen formateatze bat egin behar da memorian."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formateatu barneko memoria gisa"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"<xliff:g id="NAME_0">^1</xliff:g> formateatu egin behar da segurua izan dadin. \n\nFormateatu ostean, <xliff:g id="NAME_1">^1</xliff:g> memoriak gailu honetan bakarrik funtzionatuko du. \n\n"<b>"Formateatzean, unean <xliff:g id="NAME_2">^1</xliff:g> memorian gordetako datu guztiak ezabatzen dira."</b>" Daturik ez galtzeko, babeskopia bat egitea gomendatzen dizugu."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Ezabatu eta formateatu"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> formateatzen…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Formateatzen ari den bitartean, ez kendu <xliff:g id="NAME">^1</xliff:g>."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Eraman datuak memoria berrira"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Argazkiak, fitxategiak eta aplikazioen datuak <xliff:g id="NAME">^1</xliff:g> memoria berri honetara ekar ditzakezu. \n\nTransferentzia-prozesuak <xliff:g id="TIME">^2</xliff:g> irauten du gutxi gorabehera, eta <xliff:g id="SIZE">^3</xliff:g> askatuko ditu barneko memoriatik. Aplikazio batzuek ez dute funtzionatuko transferentzia egiten ari den bitartean."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Mugitu orain"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Mugitu geroago"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Mugitu datuak"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Transferentzia-prozesuak <xliff:g id="TIME">^1</xliff:g> irauten du gutxi gorabehera, eta <xliff:g id="SIZE">^2</xliff:g> askatuko ditu barneko memoriatik."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Mugitu"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Datuak mugitzen…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Transferentzia egiten den bitartean: \n• Ez kendu <xliff:g id="NAME">^1</xliff:g> memoria. \n• Aplikazio batzuek ez dute ongi funtzionatuko. \n• Gailuak kargatuta egon behar du."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> prest dago"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> argazkiekin eta bestelako multimedia-fitxategiekin erabiltzeko behar bezala konfiguratu da."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> memoria berria abian da. \n\nArgazkiak, fitxategiak eta aplikazioaren datuak gailu honetara ekartzeko, zoaz Ezarpenak &gt; Memoria atalera."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Mugitu <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<xliff:g id="APP">^1</xliff:g> aplikazioa eta bere datuak <xliff:g id="NAME_0">^2</xliff:g> memoriara eramateak denboratxo bat behar du. Ezin izango duzu aplikazioa erabili transferentzia osatzen den arte. \n\n Ez kendu <xliff:g id="NAME_1">^2</xliff:g> transferentzia egiten den bitartean."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> mugitzen…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Ez kendu <xliff:g id="NAME">^1</xliff:g> transferentzia egiten den bitartean. \n\nGailuko <xliff:g id="APP">^2</xliff:g> aplikazioa ez da erabilgarri egongo transferentzia osatzen den arte."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Utzi transferentzia"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Bateriaren egoera"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Bateria-maila"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNak"</string>
@@ -1008,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Berrezarri balio lehenetsiak"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN ezarpen lehenetsiak berrezarri dira."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Sareko ezarpenak berrezarri dira"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Sarearekin erlazionatutako ezarpen guztiak fabrikako ezarpen lehenetsietara berrezarriko dira, hauek barne:\n\n"<li>"Wi-Fi konexioa"</li>\n<li>"Mugikorreko datuak"</li>\n<li>"Bluetooth konexioa"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Sareko ezarpen guztiak berrezarriko dira, besteak beste:\n\n"<li>"Wi‑Fi konexioa"</li>\n<li>"Mugikorreko datuak"</li>\n<li>"Bluetooth konexioa"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Berrezarri ezarpenak"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Sareko ezarpen guztiak berrezarri nahi dituzu? Ezin duzu ekintza hori desegin."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Sareko ezarpen guztiak berrezarri nahi dituzu? Ekintza hori ezin da desegin."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Berrezarri ezarpenak"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Sareko ezarpenak berrezarri nahi dituzula berresteko, desblokeatzeko eredua marraztu behar duzu."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Berrezarri?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Sareko ezarpenak berrezarri dira"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Berrezarri dira sareko ezarpenak"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Berrezarri gailua"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Berrezarri jatorrizko datuak"</string>
     <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>
@@ -1030,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Ezabatu SD txarteleko datu guztiak, besteak beste, musika edo argazkiak."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Berrezarri tableta"</string>
     <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_desc" msgid="1062841478823409667">"Informazio pertsonal guztia eta deskargatutako aplikazioak ezabatu nahi dituzu? Ekintza hori ezin da desegin."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Ezabatu guztia"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Erabiltzaileak ez du jatorrizko datuak berrezartzeko baimenik"</string>
@@ -1049,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Konfiguratu erantzungailua, dei-desbideratzea, deia zain uzteko eginbidea, deien identifikazio-zerbitzua."</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Konexioa partekatzea (USB)"</string>
@@ -1082,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Laguntza"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Sare mugikorrak"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mugikorraren plana"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"SMSetarako aplikazio lehenetsia"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMSetarako aplikazioa"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS mezuetarako aplikazioa aldatu?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"<xliff:g id="NEW_APP">%1$s</xliff:g> aplikazioaren ordez, <xliff:g id="CURRENT_APP">%2$s</xliff:g> aplikazioa erabili SMS mezuetarako?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Erabili <xliff:g id="NEW_APP">%s</xliff:g> SMS mezuetarako aplikazio gisa?"</string>
@@ -1113,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Erabili GPS sistema kokapena zehazteko"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Bilatzea"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Bilatzea"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi sareak bilatzea"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Hobetu kokapenaren zehaztasuna aplikazioei eta zerbitzuei Wi-Fi sareak bilatzea baimenduta, baita Wi-Fi konexioa desaktibatuta dagoenean ere"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth gailuak bilatzea"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Hobetu kokapenaren zehaztasuna sistemaren zerbitzuei Bluetooth gailuak bilatzea baimenduta, baita Bluetooth konexioa desaktibatuta dagoenean ere"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi eta sare mugikor bidezko kokapena"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Utzi aplikazioei zure kokapena bizkorrago zehazteko Google-ren kokapen-zerbitzua erabiltzen. Kokapen-datu anonimoak bildu eta Google-ra bidaliko dira."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Kokapena Wi-Fi bidez zehaztuta"</string>
@@ -1158,11 +1194,15 @@
     <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>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Jarraitzeko, marraztu gailuaren eredua."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Jarraitzeko, idatzi gailuaren PIN kodea."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Jarraitzeko, idatzi gailuaren pasahitza."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN kodea ez da zuzena"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Pasahitza ez da zuzena"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Eredua ez da zuzena"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Gailuaren segurtasuna"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Aldatu desblokeatzeko eredua"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Aldatu desblokeatzeko PINa"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Berretsi gordetako eredua"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Saiatu berriro:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Marraztu desblokeatzeko eredua"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Laguntza lortzeko, sakatu Menua."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Bukatutakoan, jaso hatza"</string>
@@ -1184,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Ezarri desblokeatzeko eredua"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Aldatu desblokeatzeko eredua"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Desblokeatzeko eredua nola marraztu"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Saiakera oker gehiegi egin dituzu!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Saiatu berriro <xliff:g id="NUMBER">%d</xliff:g> segundo barru."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Saiakera oker gehiegi egin dituzu. Saiatu berriro <xliff:g id="NUMBER">%d</xliff:g> segundo barru."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Ez duzu aplikazioa telefonoan instalatu."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Kudeatu aplikazioak"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Kudeatu eta kendu instalatutako aplikazioak"</string>
@@ -1236,7 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Ordenatu tamainaren arabera"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Abian diren zerbitzuak"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Erakutsi cachean gordetako prozesuak"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"Larrialdietarako aplikazio lehenetsia"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Larrialdietarako aplikazioa"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Berrezarri aplikazioaren hobespenak"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Aplikazioaren hobespenak berrezarri nahi dituzu?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Honen hobespen guztiak berrezarriko dira:\n\n"<li>"Desgaitutako aplikazioak"</li>\n<li>"Desgaitutako aplikazio-jakinarazpenak"</li>\n<li>"Ekintza jakinetarako aplikazio lehenetsiak"</li>\n<li>"Atzeko planoko datuen murrizketak aplikazioetarako"</li>\n<li>"Edozein baimen-murrizketa"</li>\n\n"Ez dituzu aplikazioen datuak galduko."</string>
@@ -1440,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Bildu Bluetooth HCI pakete guztiak fitxategi batean"</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="select_logd_size_title" msgid="7433137108348553508">"Erregistroen buffer-tamainak"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 ordu"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 egun"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Erakutsi sistema"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Ezkutatu sistema"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Erabili USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Estatistika mota"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Atzeko planoa"</string>
@@ -1838,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Uneko pasahitza:"</string>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Erabiltzailea"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil murriztua"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Beste erabiltzaile bat gehitu nahi duzu?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Gailu hau beste pertsona batzuekin parteka dezakezu, erabiltzaile osagarriak sortuta. Erabiltzaile bakoitzak bere eremua izango du eta, bertan, aplikazioak, horma-papera eta antzekoak pertsonaliza ditzakete. Horrez gain, erabiltzaile guztiei eragin diezaieketen ezarpen batzuk ere doi ditzakete, adibidez, Wi-Fi konexioarena.\n\nErabiltzaile bat gehitzen duzunean, erabiltzaile horrek bere eremua konfiguratu beharko du.\n\nEdozein erabiltzailek egunera ditzake beste erabiltzaile guztien aplikazioak."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Gailu hau beste pertsona batzuekin parteka dezakezu, erabiltzaile gehiago sortuta. Erabiltzaile bakoitzak bere eremua izango du eta, bertan, aplikazioak, horma-papera eta antzekoak pertsonalizatu ahal izango dituzte. Horrez gain, erabiltzaile guztiei eragin diezaieketen ezarpen batzuk ere doitu ahal izango dituzte, adibidez, Wi-Fi konexioarena.\n\nErabiltzaile bat gehitzen duzunean, erabiltzaileak berak konfiguratu beharko du bere eremua.\n\nEdozein erabiltzailek egunera ditzake beste erabiltzaile guztien aplikazioak."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Erabiltzaile bat gehitzen duzunean, erabiltzaile horrek bere eremua konfiguratu beharko du.\n\nEdozein erabiltzailek egunera ditzake beste erabiltzaile guztien aplikazioak."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Erabiltzailea konfiguratu?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Ziurtatu pertsona horrek gailua hartu eta bere eremua konfigura dezakeela"</string>
@@ -2396,6 +2433,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"larrialdietarako aplikazio lehenetsia"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"aplikazioak deskargatu aplikazioa sistema"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"aplikazioak baimenak segurtasuna"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"aplikazio lehenetsi"</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>
@@ -2410,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmaren bolumena"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Tonuaren bolumena"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Jakinarazpenen bolumena"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Blokeatu etenaldiak"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Lehentasunezkoak soilik"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Arau automatikoak"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Deiak eta 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_alarms" msgid="7380265858042606857">"Onartu alarmak soilik"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ez eten"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Lehentasunezkoak"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarmak soilik"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Etenaldirik gabe"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <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">"Egin dar-dar deietan ere"</string>
@@ -2450,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Ez da jakinarazpen-entzulerik instalatu."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> gaitu?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> eginbidea sistemak edo instalatutako aplikazioek bidaltzen dituzten jakinarazpen guztiak irakurtzeko gai izango da, informazio pertsonala barne; adibidez, kontaktuen izenak eta jaso dituzun testu-mezuak. Gainera, jakinarazpen horiek baztertu edo horien barruko ekintza-botoiak sakatu ahal izango ditu."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Baldintza-hornitzaileak"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ez dago baldintzak hornitzen dituen aplikaziorik"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d aplikaziok baldintzak hornitzen dituzte</item>
-      <item quantity="one">%d aplikaziok baldintzak hornitzen ditu</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Ez dago baldintza-hornitzailerik instalatuta."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> gaitu nahi duzu?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> hornitzaileak irteteko baldintzak gehitu ahal izango ditu Ez molestatu moduan."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Aplikazioak kargatzen…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokeatu guztiak"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ez erakutsi inoiz aplikazio honen jakinarazpenak"</string>
@@ -2472,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Lehentasuna"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Isilpekoa"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Arauaren izena"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Gehitu araua"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Ezabatu araua"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<xliff:g id="RULE">%1$s</xliff:g>\" araua ezabatu nahi duzu?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Ezabatu"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Arau mota"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Ezezaguna"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Konfiguratu araua"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Antolatu araua"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Ez da aurkitu araua."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Egunak"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Bat ere ez"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Egunero"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Inoiz ez"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Deiak"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mezuak"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Honen deiak/mezuak"</string>
@@ -2492,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmak"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Abisuak"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Gertaerak"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Hautatutako deitzaileak"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Berriro deitu dutenak"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Pertsona berak berriro deitzen badu <xliff:g id="MINUTES">%d</xliff:g> minutuko epean, onartu deia"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"Hurrengo eguneko <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Noiz nahi duzu etetea?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Zenbat denboran?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Mugagabea"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutu</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minutu</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ordu</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ordu</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Aldatu \"Lehentasunezkoak soilik\" modura besterik esan arte"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Aldatu \"Lehentasunezkoak soilik\" modura <xliff:g id="DURATION">%1$d</xliff:g> minutuz, <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> arte</item>
+      <item quantity="one">Aldatu \"Lehentasunezkoak soilik\" modura minutu batez, <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> arte</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Aldatu \"Lehentasunezkoak soilik\" modura <xliff:g id="DURATION">%1$d</xliff:g> orduz, <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> arte</item>
+      <item quantity="one">Aldatu \"Lehentasunezkoak soilik\" modura ordubetez, <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> arte</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Aldatu \"Alarmak soilik\" modura besterik esan arte"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Aldatu \"Alarmak soilik\" modura <xliff:g id="DURATION">%1$d</xliff:g> minutuz, <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> arte</item>
+      <item quantity="one">Aldatu \"Alarmak soilik\" modura minutu batez, <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> arte</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Aldatu \"Alarmak soilik\" modura <xliff:g id="DURATION">%1$d</xliff:g> orduz, <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> arte</item>
+      <item quantity="one">Aldatu \"Alarmak soilik\" modura ordubetez, <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> arte</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Aldatu \"Ez eten\" modura besterik esan arte"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Aldatu \"Ez eten\" modura <xliff:g id="DURATION">%1$d</xliff:g> minutuz, <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> arte</item>
+      <item quantity="one">Aldatu \"Ez eten\" modura minutu batez, <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> arte</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Aldatu \"Ez eten\" modura <xliff:g id="DURATION">%1$d</xliff:g> orduz, <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> arte</item>
+      <item quantity="one">Aldatu \"Ez eten\" modura ordubetez, <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> arte</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Aldatu \"Eten beti\" modura"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"betiko"</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>
@@ -2565,7 +2659,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> baimen eman dira</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> baimen eman da</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g>/<xliff:g id="COUNT_3">%d</xliff:g> baimen eman dira</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g> baimen eman da</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Hobespen lehenetsi batzuk ezarrita daude"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Ez dago hobespen lehenetsirik ezarrita"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Aplikazio guztiak"</string>
@@ -2576,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Lehentasunezkoak"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Isilpekoak"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Domeinuaren URLekin"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Berrezarri aplikazio guztien hobespenak balio lehenetsietara"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> aplikazio instalatu dira, sistemakoak eta deskargatutakoak barne"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Administratzaileak desgaitu du"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Ezarpen aurreratuak"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplikazio ezezaguna"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Aukeratu profila"</string>
@@ -2592,4 +2688,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikaziok euren domeinuaren URLak ireki ditzakete</item>
       <item quantity="one">Aplikazio batek bere domeinuaren URLak ireki ditzake</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Ez da ezagutzen"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Aplikazio lehenetsiak"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Arakatzailearen aplikazioa"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Ez dago arakatzailerik lehenetsita"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Lehenetsia)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index bf5b20a..17b04d0 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"فشار دکمه"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"کم"</item>
     <item msgid="4212263919458209842">"بحرانی"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"خاموش"</item>
-    <item msgid="5656544177755411222">"وقفه‌های محدود"</item>
-    <item msgid="8735337502532332056">"بدون وقفه"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"عادی"</item>
     <item msgid="866544120205026771">"متوسط"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index d19ae2b..825e400 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"‏کارت SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"تنظیمات پروکسی"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"بله"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"خیر"</string>
-    <string name="forget" msgid="7267115980248732932">"فراموش شود"</string>
+    <string name="forget" msgid="1400428660472591263">"فراموش کردن"</string>
+    <string name="save" msgid="879993180139353333">"ذخیره‌"</string>
+    <string name="done" msgid="6942539184162713160">"انجام شد"</string>
     <string name="settings_label" msgid="1626402585530130914">"تنظیمات"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"تنظیمات"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"میانبر تنظیمات"</string>
@@ -374,7 +372,6 @@
     <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_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>
@@ -521,7 +518,7 @@
     <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="ble_scan_notify_text" msgid="9019985398053764737">"‏برای بهبود دقت مکان، حتی زمانی که بلوتوث خاموش است، سرویس‌های Google دستگاه‌های بلوتوث را اسکن می‌کنند. می‌توانید این را در LINK_BEGINتنظیمات اسکنLINK_END تغییر دهید."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"برای بهبود دقت مکان، حتی وقتی بلوتوث خاموش است، سرویس‌ها و برنامه‌ها، دستگاه‌های بلوتوث را اسکن می‌کنند. می‌توانید این مورد را در <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>تنظیمات اسکن<xliff:g id="LINK_END_1">LINK_END</xliff:g> تغییر دهید."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"اتصال به..."</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>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"‏برای بهبود دقت مکان، حتی زمانی که Wi‑Fi خاموش است، سرویس‌های Google شبکه‌های Wi‑Fi را اسکن می‌کنند. می‌توانید این را در LINK_BEGINتنظیمات اسکنLINK_END تغییر دهید."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"‏برای بهبود دقت مکان، حتی وقتی Wi-Fi خاموش است، برنامه‌ها و سرویس‌ها، دستگاه‌های Wi-Fi را اسکن می‌کنند. می‌توانید این مورد را در <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>تنظیمات اسکن<xliff:g id="LINK_END_1">LINK_END</xliff:g> تغییر دهید."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"دوباره نشان داده نشود"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"‏هنگام خواب، Wi-Fi را روشن بگذارید"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"‏روشن بودن Wi-Fi در هنگام خواب"</string>
@@ -604,8 +601,6 @@
     <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_apps" msgid="6003687912727859577">"نمایش برنامه‌ها"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"‏نمایش قدرت WiFi"</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>
@@ -663,6 +658,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"اتصال"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"این شبکه فاقد دسترسی اینترنت است. با این وجود از این شبکه استفاده می‌کنید؟"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"دیگر درباره این شبکه سؤال نشود"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"اتصال"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"اتصال به شبکه برقرار نشد"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"فراموش کردن"</string>
@@ -734,12 +731,10 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"‏Wi-Fi ترجیحی"</item>
     <item msgid="5267397515594230396">"شبکه همراه ترجیحی"</item>
-    <item msgid="3132912693346866895">"‏فقط Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"۲"</item>
     <item msgid="1171822231056612021">"۱"</item>
-    <item msgid="3194458950573886239">"۰"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"‏وقتی تماس Wi-Fi روشن است، تلفن شما می‌تواند بنابر تنظیمات ترجیحی‌تان و اینکه چه سیگنالی قدرتمندتر است، تماس‌ها را از طریق شبکه‌های Wi-Fi یا شبکه شرکت مخابراتی‌تان هدایت کند. قبل از روشن کردن این قابلیت، هزینه‌ها و سایر جزئیات را با شرکت مخابراتی‌تان بررسی کنید."</string>
     <string name="home_settings" msgid="212375129455718176">"صفحه اصلی"</string>
@@ -913,12 +908,12 @@
     <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="5128673488173839077">"برنامه‌ها و داده‌های برنامه"</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_media_misc_usage" msgid="235452944021647124">"متفرقه"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"سایر فایل‌ها"</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>
@@ -951,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"جدا کردن در حال انجام است"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"فضای ذخیره‌سازی رو به اتمام است"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"برخی از عملکردهای سیستم مانند همگام‌سازی ممکن است به نحوه صحیح کار نکنند. با حذف یا لغو پین کردن مواردی همچون برنامه‌ها یا محتوای رسانه، سعی کنید فضا را خالی کنید."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"تغییر نام"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"قرار دادن"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"خارج کردن"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"پاک‌سازی و قالب‌بندی"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"پاک‌سازی و قالب‌بندی حافظه‌‌داخلی"</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>
@@ -961,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"‏به برنامه‌های دارای MIDI اجازه می‌دهد از طریق USB با نرم‌افزار MIDI موجود در رایانه شما کار کنند."</string>
     <string name="storage_other_users" msgid="808708845102611856">"کاربران دیگر"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"دستگاه ذخیره‌سازی"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"حافظه جداشدنی"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> آزاد (کل فضا <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> قرار داده شد"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g> قرار داده نشد"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> به صورت امن خارج شد"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g> به صورت امن خارج نشد"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> قالب‌بندی شد"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> قالب‌بندی نشد"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"تغییرنام حافظه"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"‏بعد از قالب‌بندی، می‌توانید از این <xliff:g id="NAME_0">^1</xliff:g> در دستگاه‌های دیگر استفاده کنید. \n\nهمه اطلاعات در این <xliff:g id="NAME_1">^1</xliff:g> پاک می‌شود. پشتیبان گرفتن از اطلاعات را قبل از شروع کار در نظر بگیرید. \n\n"<b>"از عکس‌ها و رسانه‌های دیگر پشتیبان بگیرید"</b>" \nفایل‌های رسانه‌تان را به فضای ذخیره‌سازی دیگری در این دستگاه منتقل کنید یا با استفاده از کابل USB آنها را به رایانه منتقل کنید.\n\n"<b>"از برنامه‌ها پشتیبان بگیرید"</b>" \nهمه برنامه‌های ذخیره شده در این <xliff:g id="NAME_6">^1</xliff:g> حذف نصب می‌شوند و اطلاعات آنها پاک می‌شود. برای حفظ این برنامه‌ها، آنها را به فضای ذخیره‌سازی دیگری در دستگاه منتقل کنید."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"وقتی این <xliff:g id="NAME_0">^1</xliff:g> را جدا می‌کنید، عملکرد برنامه‌های ذخیره شده در آن متوقف می‌شود و فایل‌های رسانه ذخیره شده در آن تا وقتی دوباره جاگذاری نشود، در دسترس نخواهند بود."</b>" \n\nاین <xliff:g id="NAME_1">^1</xliff:g> فقط برای کار در این دستگاه قالب‌بندی شده است و در دستگاه‌های دیگر کار نمی‌کند."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> خود را راه‌اندازی کنید"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"استفاده به عنوان فضای ذخیره‌سازی قابل حمل"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"برای انتقال عکس‌ها و رسانه‌های دیگر بین دستگاه‌ها"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"استفاده به عنوان حافظه داخلی"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"برای ذخیره کردن هر چیز فقط در این دستگاه، از جمله برنامه‌ها و عکس‌ها. به قالب‌بندی نیاز دارد که مانع از کار کردن آن با دستگاه‌های دیگر می‌شود."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"قالب‌بندی به عنوان حافظه داخلی"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"انجام قالب‌بندی <xliff:g id="NAME_0">^1</xliff:g> برای ایمن کردن آن لازم است. \n\nبعد از قالب‌بندی، این <xliff:g id="NAME_1">^1</xliff:g> فقط در این دستگاه کار می‌کند. \n\n"<b>"قالب‌بندی همه اطلاعاتی را که در حال حاضر در <xliff:g id="NAME_2">^1</xliff:g> ذخیره شده است، پاک می‌کند."</b>"برای جلوگیری از از دست رفتن اطلاعات، پشتیبان گرفتن از آنها را در نظر بگیرید."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"پاک کردن و قالب‌بندی"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"در حال قالب‌بندی <xliff:g id="NAME">^1</xliff:g>..."</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"در طول قالب‌بندی، <xliff:g id="NAME">^1</xliff:g> را جدا نکنید."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"انتقال اطلاعات به حافظه جدید"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"می‌توانید عکس‌ها، فیلم‌ها و اطلاعات برنامه را به این <xliff:g id="NAME">^1</xliff:g> جدید منتقل کنید. \n\nانتقال حدود <xliff:g id="TIME">^2</xliff:g> طول می‌کشد و <xliff:g id="SIZE">^3</xliff:g> از حافظه داخلی را آزاد می‌کند. در طول انتقال بعضی از برنامه‌ها کار نمی‌کنند."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"انتقال در این لحظه"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"انتقال در زمانی دیگر"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"انتقال اطلاعات در این لحظه"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"انتقال حدود <xliff:g id="TIME">^1</xliff:g> طول می‌کشد. این کار <xliff:g id="SIZE">^2</xliff:g> از حافظه داخلی را آزاد می‌کند."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"انتقال"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"در حال انتقال اطلاعات..."</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"در طول انتقال: \n• ‏<xliff:g id="NAME">^1</xliff:g> را جدا نکنید. \n• ‏بعضی از برنامه‌ها درست کار نمی‌کنند. \n• ‏دستگاه را شارژ نگه دارید."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> آماده است"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> شما برای استفاده با عکس‌ها و سایر رسانه‌ها آماده است."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"‏<xliff:g id="NAME">^1</xliff:g> جدید شما در حال کار کردن است.\n\nبرای انتقال عکس‌ها، فایل‌ها و اطلاعات برنامه به این دستگاه، به «تنظیمات &gt; فضای ذخیره‌سازی» بروید."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"انتقال <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"انتقال <xliff:g id="APP">^1</xliff:g> و اطلاعات آن به <xliff:g id="NAME_0">^2</xliff:g> فقط چند لحظه طول می‌کشد. تا وقتی انتقال تکمیل نشود، نمی‌توانید از برنامه استفاده کنید. \n\nدر طول انتقال، <xliff:g id="NAME_1">^2</xliff:g> را جدا نکنید."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"در حال انتقال <xliff:g id="APP">^1</xliff:g>..."</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"در طول انتقال، <xliff:g id="NAME">^1</xliff:g> را جدا نکنید. \n\nتا وقتی انتقال تکمیل نشود، برنامه <xliff:g id="APP">^2</xliff:g> در این دستگاه در دسترس نیست."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"لغو انتقال"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"وضعیت باتری"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"مقدار شارژ باتری"</string>
     <string name="apn_settings" msgid="3743170484827528406">"‏APNها"</string>
@@ -1005,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"بازنشانی به موارد پیش‌فرض"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"‏بازنشانی تنظیمات APN پیش‌فرض انجام شد."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"بازنشانی تنظیمات شبکه"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"‏این کار همه تنظیمات مرتبط با شبکه را به پیش‌فرض کارخانه بازنشانی می‌کند، از جمله:\n\n"<li>"Wifi"</li>\n<li>"داده همراه"</li>\n<li>"بلوتوث"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"‏با این کار همه تنظیمات شبکه بازنشانی می‌شود، از جمله:\n\n"<li>"Wi‑Fi"</li>\n<li>"داده‌های شبکه همراه"</li>\n<li>"بلوتوث"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"بازنشانی تنظیمات"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"همه تنظیمات شبکه بازنشانی شود؟ این اقدام قابل بازگشت نیست!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"همه تنظیمات شبکه بازنشانی شود؟ این اقدام دیگر قابل واگرد نیست!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"بازنشانی تنظیمات"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"برای تأیید بازنشانی تنظیمات شبکه، باید الگوی بازگشایی را بکشید."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"بازنشانی شود؟"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"بازنشانی تنظیمات شبکه"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"تنظیمات شبکه بازنشانی شد"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"بازنشانی دستگاه"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"بازنشانی به داده‌های کارخانه"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"‏با این کار همه داده‌های "<b>"حافظهٔ داخلی"</b>" رایانهٔ لوحی شما پاک می‌شود، از جمله:\n\n"<li>"حساب Google شما"<li>\n</li>"داده‌ها و تنظیمات برنامه و سیستم"<li>\n</li>"برنامه‌های دانلود شده"</li></string>
@@ -1027,9 +1065,8 @@
     <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="1062841478823409667">"همه اطلاعات شخصی و برنامه‌های دانلودشده پاک شود؟ این اقدام دیگر قابل واگرد نیست!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"پاک کردن همهٔ موارد"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"بازنشانی به تنظیمات کارخانه برای این کاربر در دسترس نیست"</string>
@@ -1046,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"تنظیم پست صوتی، هدایت تماس، انتظار تماس، شناسه تماس گیرنده"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"‏اتصال داده با سیم USB"</string>
@@ -1079,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"راهنمایی"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"شبکه‌های تلفن همراه"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"طرح تلفن همراه"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"برنامه پیامک پیش‌فرض"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"برنامه پیامک"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"برنامه پیامک تغییر داده شود؟"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"از <xliff:g id="NEW_APP">%1$s</xliff:g> به‌جای <xliff:g id="CURRENT_APP">%2$s</xliff:g> به‌عنوان برنامه پیامک‌تان استفاده می‌کنید؟"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"از <xliff:g id="NEW_APP">%s</xliff:g> به‌جای برنامه پبامک‌تان استفاده می‌کنید؟"</string>
@@ -1110,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"‏استفاده از GPS برای تعیین موقعیت مکانی"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"اسکن کردن"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"اسکن کردن"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"‏اسکن کردن Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"‏بهبود مکان با امکان دادن به برنامه‌ها و سرویس‌ها برای اسکن شبکه‌های Wi‑Fi، حتی وقتی Wi‑Fi خاموش است"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"اسکن کردن بلوتوث"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"بهبود مکان با امکان دادن به سرویس‌های سیستم برای اسکن دستگاه‌های بلوتوث، حتی وقتی بلوتوث خاموش است"</string>
     <string name="location_network_based" msgid="6010456018401296590">"‏مکان شبکه تلفن همراه و Wi-Fi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"‏به برنامه‌ها اجازه داده شود با استفاده از خدمات مکانی Google مکان شما را سریع‌تر تخمین بزنند. داده‌های مکان به‌طور ناشناس جمع‌آوری شده و به Google ارسال خواهد شد."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"‏موقعیت مکانی تعیین شده توسط Wi-Fi"</string>
@@ -1155,11 +1194,15 @@
     <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="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"برای ادامه، از الگوی دستگاهتان استفاده کنید."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"برای ادامه، کد پین دستگاهتان را وارد کنید."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"برای ادامه گذرواژه دستگاهتان را وارد کنید."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"پین اشتباه"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"گذرواژه اشتباه"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"الگوی اشتباه"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"امنیت دستگاه"</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>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"برای دریافت راهنمایی روی منو فشار دهید."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"پس از اتمام، انگشت را رها کنید"</string>
@@ -1181,8 +1224,7 @@
     <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" msgid="6909161623701848863">"تلاش‌های نادرست بسیاری انجام شده است. پس از <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>
@@ -1233,7 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"بر اساس اندازه مرتب شود"</string>
     <string name="show_running_services" msgid="5736278767975544570">"نمایش سرویس‌های در حال اجرا"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"فرآیندهای ذخیره شده در حافظهٔ پنهان"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"برنامه اضطراری پیش‌فرض"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"برنامه اضطراری"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"بازنشانی تنظیمات برگزیده برنامه"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"تنظیمات برگزیده برنامه بازنشانی شوند؟"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"با این کار تمام تنظیمات برگزیده برای این موارد بازنشانی می‌شود:\n\n "<li>"برنامه‌های غیرفعال شده"</li>\n" "<li>"اعلان‌های برنامه غیرفعال شده"</li>\n" "<li>"برنامه‌های پیش‌فرض برای عملکردها"</li>\n" "<li>"محدودیت‌های داده پس‌زمینه برای برنامه‌ها"</li>\n" "<li>"هرگونه محدودیت‌های مجوز"</li>\n\n" هیچ داده برنامه‌ای را از دست نخواهید داد."</string>
@@ -1437,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"‏ذخیره تمامی بسته‌های HCI بلوتوث در یک فایل"</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="select_logd_size_title" msgid="7433137108348553508">"اندازه‌های حافظه موقت ثبت‌کننده"</string>
@@ -1739,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"۱۲ ساعت"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"۱ روز"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"نمایش سیستم"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"پنهان کردن سیستم"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"‏استفاده از Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"نوع آمار"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"پس‌زمینه"</string>
@@ -1835,7 +1876,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_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>
@@ -2210,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"کاربر"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"نمایه محدود شده"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"کاربر جدیدی اضافه می‌کنید؟"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"‏با ایجاد کاربران دیگر می‌توانید این دستگاه را با دیگران اشتراک‌گذاری کنید. هر کاربر فضای خاص خودش را دارد که می‌تواند با کاغذدیواری، برنامه‌های خودش و موارد دیگر سفارشی کند. همچنین کاربران می‌توانند تنظیمات دستگاه را انجام دهند مانند تنظیمات Wi-Fi که بر تنظیمات بقیه اثر دارد.\n\nوقتی کاربر جدیدی را اضافه می‌کنید آن شخص باید فضای خودش را تنظیم کند.\n\nهر کاربری می‌تواند برنامه‌ها را برای همه کاربران دیگر به‌روزرسانی کند."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"‏با ایجاد کاربران دیگر می‌توانید این دستگاه را با دیگران به اشتراک بگذارید. هر کاربر فضای خاص خودش را دارد که می‌تواند آن را با کاغذدیواری، برنامه‌‌ها و موارد دیگر سفارشی کند. همچنین کاربران می‌توانند تنظیمات دستگاه را انجام دهند مانند تنظیمات Wi-Fi که بر تنظیمات بقیه اثر دارد.\n\nوقتی کاربر جدیدی را اضافه می‌کنید آن شخص باید فضای خودش را تنظیم کند.\n\nهر کاربری می‌تواند برنامه‌ها را برای همه کاربران دیگر به‌روزرسانی کند."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"وقتی کاربر جدیدی را اضافه می‌کنید آن فرد باید فضای خودش را تنظیم کند.\n\nهر کاربری می‌تواند برنامه‌ها را برای همه کاربران دیگر به‌روزرسانی کند."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"هم اکنون کاربر تنظیم شود؟"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"مطمئن شوید شخص در دسترس است تا دستگاه را بگیرد و فضایش را تنظیم کند"</string>
@@ -2393,6 +2433,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"پیش‌فرض برنامه اضطراری در موارد اضطراری"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"برنامه‌ها دانلود برنامه‌ها سیستم"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"امنیت مجوزهای برنامه‌ها"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"پیش‌فرض برنامه‌ها"</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>
@@ -2407,14 +2448,12 @@
     <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="6948120138640252732">"مسدود کردن وقفه‌ها"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"فقط اولویت‌دار مجاز است"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"قوانین خودکار"</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_alarms" msgid="7380265858042606857">"اجازه فقط به هشدارها"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"وقفه نداشته باشد"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"فقط اولویت‌دار"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"فقط زنگ‌های هشدار"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"بدون وقفه"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: ‏<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"آهنگ زنگ تلفن"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"آهنگ زنگ پیش‌فرض اعلان"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"برای تماس‌ هم لرزش داشته باشد"</string>
@@ -2447,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"هیچ شنونده اعلانی نصب نشده است."</string>
     <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">"هیچ برنامه‌ای ارائه‌دهنده شرایط نیست"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="one">‏%d برنامه ارائه‌دهنده شرایط است</item>
-      <item quantity="other">‏%d برنامه ارائه‌دهنده شرایط هستند</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="loading_notification_apps" msgid="5031818677010335895">"در حال بارگیری برنامه..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"مسدود کردن همه"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"هرگز از این برنامه اعلان نشان داده نمی‌شود"</string>
@@ -2469,17 +2499,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"نام قانون"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"افزودن قانون"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"حذف قانون"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"قانون «<xliff:g id="RULE">%1$s</xliff:g>» حذف شود؟"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"حذف"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"نوع قانون"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"نامشخص"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"پیکربندی قانون"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"قانون زمان‌بندی"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"قانون پیدا نشد."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"روزها"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"هیچ‌کدام"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"هر روز"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">"، "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"هرگز"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> ‏- <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> تا <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"تماس‌ها"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"پیام‌ها"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"تماس‌ها/پیام‌ها از"</string>
@@ -2489,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"هشدارها"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"یادآوری‌ها"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"رویدادها"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"تماس‌گیرنده‌های انتخاب شده"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"تکرار تماس‌گیرنده‌ها"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"اگر همان شخص در طول یک دوره <xliff:g id="MINUTES">%d</xliff:g> دقیقه‌ای، برای بار دوم تماس بگیرد، به آن اجازه داده شود"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> روز بعد"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"چه موقع می‌خواهید وقفه ایجاد شود؟"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"برای چه مدت؟"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"نامحدود"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> دقیقه</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> دقیقه</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ساعت</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ساعت</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"تغییر در اعلان‌های اولویت‌دار تنها به مدت نامحدود"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">تغییر در اعلان‌های اولویت‌دار تنها به مدت <xliff:g id="DURATION">%1$d</xliff:g> دقیقه تا <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">تغییر در اعلان‌های اولویت‌دار تنها به مدت <xliff:g id="DURATION">%1$d</xliff:g> دقیقه تا <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">تغییر در اعلان‌های اولویت‌دار تنها به مدت <xliff:g id="DURATION">%1$d</xliff:g> ساعت (تا <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">تغییر در اعلان‌های اولویت‌دار تنها به مدت <xliff:g id="DURATION">%1$d</xliff:g> ساعت (تا <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"تغییر در هشدارها به طور نامحدود"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">تغییر در هشدارها تنها به مدت <xliff:g id="DURATION">%1$d</xliff:g> دقیقه (تا <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">تغییر در هشدارها تنها به مدت <xliff:g id="DURATION">%1$d</xliff:g> دقیقه (تا <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="one">تغییر در هشدارها تنها به مدت <xliff:g id="DURATION">%1$d</xliff:g> ساعت تا <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">تغییر در هشدارها تنها به مدت <xliff:g id="DURATION">%1$d</xliff:g> ساعت تا <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"تغییر در «وقفه نداشته باشد» به صورت نامحدود"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">تغییر در «وقفه نداشته باشد» به مدت <xliff:g id="DURATION">%1$d</xliff:g> دقیقه (تا <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">تغییر در «وقفه نداشته باشد» به مدت <xliff:g id="DURATION">%1$d</xliff:g> دقیقه (تا <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">تغییر در «وقفه نداشته باشد» به مدت <xliff:g id="DURATION">%1$d</xliff:g> ساعت تا <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">تغییر در «وقفه نداشته باشد» به مدت <xliff:g id="DURATION">%1$d</xliff:g> ساعت تا <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"تغییر در «همیشه وقفه»"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"همیشه"</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>
@@ -2562,7 +2659,10 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> مجوز اعطا شده</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> مجوز اعطا شده</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one">‏<xliff:g id="COUNT_2">%d</xliff:g> از <xliff:g id="COUNT_3">%d</xliff:g> اجازه اعطا شد</item>
+      <item quantity="other">‏<xliff:g id="COUNT_2">%d</xliff:g> از <xliff:g id="COUNT_3">%d</xliff:g> اجازه اعطا شد</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"برخی پیش‌تنظیم‌ها تنظیم شدند"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"هیچ پیش‌فرضی تنظیم نشده است"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"همه برنامه‌ها"</string>
@@ -2573,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"اولویت‌دار"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"حساس"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"با نشانی‌های اینترنتی دامنه"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"تنظیمات ترجیحی در همه برنامه‌ها به پیش‌فرض، بازنشانی می‌شود"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> برنامه نصب شده است، از جمله برنامه‌های سیستم و دانلود شده"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"توسط سرپرست سیستم غیرفعال شد"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"پیشرفته"</string>
     <string name="unknown_app" msgid="5275921288718717656">"برنامه ناشناخته"</string>
     <string name="choose_profile" msgid="8229363046053568878">"انتخاب نمایه"</string>
@@ -2589,4 +2688,11 @@
       <item quantity="one">‏<xliff:g id="COUNT">%d</xliff:g> برنامه می‌تواند نشانی‌های اینترنتی دامنه‌اش را باز کند</item>
       <item quantity="other">‏<xliff:g id="COUNT">%d</xliff:g> برنامه می‌توانند نشانی‌های اینترنتی دامنه‌شان را باز کنند</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"شناخته نشد"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"برنامه‌های پیش‌فرض"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"برنامه مرورگر"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"بدون مرورگر پیش‌فرض"</string>
+    <string name="default_app" msgid="6864503001385843060">"(پیش‌فرض)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index a91da5c..de2a112 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Paina painiketta"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"matala"</item>
     <item msgid="4212263919458209842">"kriittinen"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Ei käytössä"</item>
-    <item msgid="5656544177755411222">"Mahdollisimman vähän häiriöitä"</item>
-    <item msgid="8735337502532332056">"Ei häiriöitä"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normaali"</item>
     <item msgid="866544120205026771">"Keskitaso"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 74d2f35..79924b4 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kortti"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Välityspalvelimen asetukset"</string>
     <string name="cancel" msgid="6859253417269739139">"Peruuta"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"PERUUTA"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"JATKA"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"KYLLÄ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"EI"</string>
-    <string name="forget" msgid="7267115980248732932">"UNOHDA"</string>
+    <string name="forget" msgid="1400428660472591263">"Unohda"</string>
+    <string name="save" msgid="879993180139353333">"Tallenna"</string>
+    <string name="done" msgid="6942539184162713160">"Valmis"</string>
     <string name="settings_label" msgid="1626402585530130914">"Asetukset"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Asetukset"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Asetukset-pikakuvake"</string>
@@ -374,7 +372,6 @@
     <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 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 tabletti käynnistyy uudelleen useita kertoja."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Salausta ei voi peruuttaa, ja jos keskeytät sen, menetät tietoja. Salaus kestää vähintään tunnin, ja sen aikana puhelin käynnistyy uudelleen useita kertoja."</string>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Lisäasetukset"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth-lisäasetukset"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Kun Bluetooth on käytössä, laite voi viestiä lähiympäristön Bluetooth-laitteiden kanssa."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"Parantaakseen sijainnin tarkkuutta Google-palvelut voivat etsiä Bluetooth-laitteita myös silloin, kun Bluetooth ei ole käytössä. Voit muuttaa tätä LINK_BEGINetsintäasetuksissaLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Parantaakseen sijainnin tarkkuutta sovellukset ja palvelut voivat etsiä Bluetooth-laitteita myös silloin, kun Bluetooth ei ole käytössä. Voit muuttaa tätä <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>etsintäasetuksissa<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Yhdistä profiiliin..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> irrotetaan median äänentoistosta."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> irrotetaan handsfree-äänentoistosta."</string>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"Parantaakseen sijainnin tarkkuutta Google-palvelut voivat etsiä Wi-Fi-verkkoja myös silloin, kun Wi-Fi ei ole käytössä. Voit muuttaa tätä LINK_BEGINetsintäasetuksissaLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Parantaakseen sijainnin tarkkuutta sovellukset ja palvelut voivat etsiä Wi-Fi-verkkoja myös silloin, kun Wi-Fi ei ole käytössä. Voit muuttaa tätä <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>etsintäasetuksissa<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</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ä 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>
@@ -604,8 +601,6 @@
     <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_apps" msgid="6003687912727859577">"Näytä sovellukset"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Näytä Wi-Fi-signaali"</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>
@@ -663,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Kirjaudutaanko sisään yhteyttä varten?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> edellyttää kirjautumista online-tilassa ennen verkkoon yhdistämistä."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"YHDISTÄ"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Tässä verkossa ei ole internetyhteyttä. Käytetäänkö tätä verkkoa silti?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Älä kysy uudelleen tässä verkossa"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Yhdistä"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Yhteyden muodostaminen verkkoon epäonnistui."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unohda"</string>
@@ -729,21 +726,17 @@
     <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="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi-puhelut"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Puheluasetus"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi-puhelutila"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi ensisijainen"</item>
     <item msgid="5267397515594230396">"Matkapuhelinverkko ensisijainen"</item>
-    <item msgid="3132912693346866895">"Vain Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Kun Wi-Fi-puhelut on käytössä, puhelimesi voi ohjata puhelut Wi-Fi-verkkojen tai operaattorisi verkon kautta, riippuen asetuksistasi ja siitä, kummassa on voimakkaampi signaali. Ennen kuin otat tämän ominaisuuden käyttöön, tarkista maksut ja muut tiedot operaattoriltasi."</string>
     <string name="home_settings" msgid="212375129455718176">"Etusivu"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Näyttö"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ääni"</string>
@@ -915,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Saatavilla (vain luku)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Tallennustilaa yhteensä"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Lasketaan…"</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Sovellukset (sovellusten tiedot ja mediasisältö)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Sovellukset ja sovellustiedot"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Lataukset"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Kuvat, videot"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Ääni (musiikki, soittoäänet, podcastit jne.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Muut"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Muut tiedostot"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Välimuistitiedot"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Poista jaettu tila käyt."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Poista SD-kortti käytöstä"</string>
@@ -953,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Poistetaan käytöstä"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Tallennustila on loppumassa"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Jotkin järjestelmän toiminnot, kuten synkronointi, eivät välttämättä toimi oikein. Vapauta tilaa poistamalla tai irrottamalla kohteita kuten sovelluksia tai mediasisältöä."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Nimeä uudelleen"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Ota käyttöön"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Poista"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Poista tiedot ja alusta"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Tyhjennä ja alusta sis. tallennustilana"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB-tietokoneyhteys"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-tietokoneyhteys"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Yhdistä tyyppinä"</string>
@@ -963,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Antaa MIDI-yhteensopivien sovellusten toimia USB:n kautta MIDI-ohjelmiston sisältävässä tietokoneessa."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Muut käyttäjät"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Laitteen tallennustila"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Siirrettävä tallennustila"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> vapaana (yhteensä <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> on otettu käyttöön."</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Käyttöönotto epäonnistui: <xliff:g id="NAME">%1$s</xliff:g>."</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> on poistettu turvallisesti."</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Turvallinen poistaminen epäonnistui: <xliff:g id="NAME">%1$s</xliff:g>."</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> on alustettu."</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Alustaminen epäonnistui: <xliff:g id="NAME">%1$s</xliff:g>."</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Nimeä tallennustila uudelleen"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Alustuksen jälkeen tämä <xliff:g id="NAME_0">^1</xliff:g> on käytettävissä muissa laitteissa. \n\nKaikki kohteen <xliff:g id="NAME_1">^1</xliff:g> tiedot poistetaan. Suosittelemme, että varmuuskopioit tiedot ensin. \n\n"<b>"Valokuvien ja muiden mediatiedostojen varmuuskopiointi"</b>" \nSiirrä mediatiedostosi toiseen tässä laitteessa olevaan tallennustilaan, tai siirrä ne tietokoneelle USB-johdon avulla. \n\n"<b>"Sovellusten varmuuskopiointi"</b>" \nKaikki kohteeseen <xliff:g id="NAME_6">^1</xliff:g> tallennetut sovellukset poistetaan ja niiden tiedot tyhjennetään. Jos haluat säilyttää nämä sovellukset, siirrä ne toiseen tämän laitteen tallennustilaan."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Kun tämä <xliff:g id="NAME_0">^1</xliff:g> poistetaan, siihen tallennetut sovellukset lakkaavat toimimasta eivätkä mediatiedostot ole käytettävissä, ennen kuin se asetetaan takaisin paikalleen."</b>" \n\nTämä <xliff:g id="NAME_1">^1</xliff:g> on alustettu niin, että se toimii vain tässä laitteessa, ei muissa."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Määritä <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Käytä kannettavana tallennustilana"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Kuvien ja muiden mediatiedostojen siirtämiseen laitteiden välillä"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Käytä sisäisenä tallennustilana"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Jos haluat tallentaa kaiken, mukaan lukien sovellukset ja kuvat, vain tälle laitteelle. Vaatii alustuksen, joka estää sen toimimisen muissa laitteissa."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Alusta sisäisenä tallennustilana"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Jotta <xliff:g id="NAME_0">^1</xliff:g> olisi turvallinen, se on alustettava. \n\nAlustamisen jälkeen tämä <xliff:g id="NAME_1">^1</xliff:g> toimii vain tässä laitteessa. \n\n"<b>"Alustaminen tyhjentää kaikki kohteeseen <xliff:g id="NAME_2">^1</xliff:g> tallennetut tiedot."</b>" Suosittelemme sen varmuuskopiointia, jotta et menetä kyseisiä tietoja."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Poista tiedot ja alusta"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Alustetaan kohdetta <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Älä poista kohdetta <xliff:g id="NAME">^1</xliff:g> alustuksen aikana."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Siirrä tiedot uuteen paikkaan"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Uusi <xliff:g id="NAME">^1</xliff:g> on nyt käytettävissä, ja voit siirtää kuvasi, tiedostosi ja sovellustietosi siihen. \n\nSiirto vie noin <xliff:g id="TIME">^2</xliff:g> ja vapauttaa <xliff:g id="SIZE">^3</xliff:g> sisäistä tallennustilaa. Jotkin sovellukset eivät toimi siirron aikana."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Siirrä nyt"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Siirrä myöhemmin"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Siirrä tiedot nyt"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Siirto vie noin <xliff:g id="TIME">^1</xliff:g>. Se vapauttaa <xliff:g id="SIZE">^2</xliff:g> sisäistä tallennustilaa."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Siirrä"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Siirretään tietoja…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Siirron aikana: \n• Jätä <xliff:g id="NAME">^1</xliff:g> paikoilleen. \n• Kaikki sovellukset eivät toimi oikein. \n• Pidä laite ladattuna."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> on valmis"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> on valmis kuvien ja muiden mediatiedostojen tallennukseen."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Uusi <xliff:g id="NAME">^1</xliff:g> toimii oikein. \n\nJos haluat siirtää kuvia, tiedostoja ja sovellustietoja tähän laitteeseen, siirry kohtaan Asetukset &gt; Tallennustila."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Siirrä <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Sovelluksen <xliff:g id="APP">^1</xliff:g> ja sen tietojen siirtäminen kohteeseen <xliff:g id="NAME_0">^2</xliff:g> vie vain hetken. Et voi käyttää sovellusta, ennen kuin siirto on valmis. \n\nJätä <xliff:g id="NAME_1">^2</xliff:g> paikalleen siirron ajaksi."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Siirretään <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Jätä <xliff:g id="NAME">^1</xliff:g> paikalleen siirron ajaksi. \n\nTämän laitteen <xliff:g id="APP">^2</xliff:g>-sovellus ei ole käytettävissä, ennen kuin siirto on valmis."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Peruuta siirto"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Akun tila"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Akun taso"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN:t"</string>
@@ -1007,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Palauta oletukset"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN-oletusasetuksien palauttaminen valmis."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Verkkoasetusten nollaus"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Tämä palauttaa kaikkien verkkoon liittyvien asetusten tehdasasetukset, mukaan lukien seuraavat: \n\n"<li>"Wi-Fi"</li>\n<li>"mobiilitiedonsiirto"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Tämä nollaa kaikki verkkoasetukset, mukaan lukien seuraavat:\n\n"<li>"Wi‑Fi"</li>\n<li>"mobiilitiedonsiirto"</li>\n<li>"Bluetooth"</li>"."</string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Nollaa asetukset"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Nollataanko kaikki verkkoasetukset? Tätä toimintoa ei voi peruuttaa."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Nollataanko kaikki verkkoasetukset? Toimintoa ei voi peruuttaa."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Nollaa asetukset"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Vahvista verkkoasetusten nollaus piirtämällä lukituksenpoistokuviosi."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Nollataanko?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Verkkoasetusten nollaus"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Verkkoasetuksesi on nollattu."</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Palauta tehdasasetukset"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Tehdasasetuksien palauttaminen"</string>
     <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>
@@ -1029,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Poista kaikki SD-kortin tiedot, kuten musiikki tai valokuvat."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Palauta tablet-laitteen tehdasasetukset"</string>
     <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_desc" msgid="1062841478823409667">"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_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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Tämä käyttäjä ei voi palauttaa tehdasasetuksia"</string>
@@ -1048,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Ota käyttöön puhelinvastaaja, soitonsiirrot, koputuspalvelu, soittajan tunnus"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Jaettu yhteys USB:n kautta"</string>
@@ -1081,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ohje"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Matkapuhelinverkot"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobiilisopimus"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Oletusarvoinen tekstiviestisovellus"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Tekstiviestisovellus"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vaihdetaanko tekstiviestisovellus?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Haluatko, että oletussovellus on <xliff:g id="NEW_APP">%1$s</xliff:g> eikä enää <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Käytetäänkö tekstiviestisovellusta <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
@@ -1112,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Paikanna sijaintisi GPS:n avulla"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Analysoidaan"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Analysoidaan"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi-haku"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Paranna sijaintipalveluita antamalla sovellusten ja palveluiden etsiä verkkoja myös silloin, kun Wi‑Fi ei ole käytössä."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth-haku"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Paranna sijainnin tarkkuutta sallimalla järjestelmäpalveluiden etsiä Bluetooth-laitteita myös silloin, kun Bluetooth ei ole käytössä."</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 Wi-Fi-yhteyden perusteella"</string>
@@ -1157,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Salasana on asetettu"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-koodi asetettu"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Kuvio on asetettu"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Jatka antamalla laitteesi kuvio."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Jatka antamalla laitteesi PIN-koodi."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Jatka antamalla laitteesi salasana."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Väärä PIN-koodi"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Väärä salasana"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Väärä kuvio"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Laitteen suojaus"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Vaihda lukituksenpoistokuvio"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Muuta lukituksen poistoon tarvittava PIN-koodi"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Vahvista tallennettu kuvio"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Yritä uudelleen:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Piirrä lukituksenpoistokuvio"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Saat ohjeita painamalla Valikko-painiketta."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Nosta sormi, kun olet valmis"</string>
@@ -1183,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Aseta lukituksenpoistokuvio"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Vaihda lukituksenpoistokuvio."</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Lukituksenpoistokuvion piirtäminen"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Liikaa virheellisiä yrityksiä!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Yritä uudelleen <xliff:g id="NUMBER">%d</xliff:g> sekunnin kuluttua."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Liian monta virheellistä yritystä. Yritä uudelleen <xliff:g id="NUMBER">%d</xliff:g> sekunnin kuluttua."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Sovellusta ei ole asennettu puhelimeesi."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Hallinnoi sovelluksia"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Hallinnoi ja poista asennettuja sovelluksia"</string>
@@ -1235,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Lajittelu koon mukaan"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Käynnissä olevat palvelut"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Näytä välimuistiprosessit"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Hätäsovellus"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Nollaa sovellusasetukset"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Nollaa sovellusasetukset?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Tämä palauttaa kaikki asetukset seuraaville:\n\n "<li>"Käytöstä poistetut sovellukset"</li>\n" "<li>"Käytöstä poistetut sovellusilmoitukset"</li>\n" "<li>"Toimintojen oletussovellukset"</li>\n" "<li>"Sovellusten taustatietorajoitukset"</li>\n" "<li>"Kaikki oikeuksien rajoitukset"</li>\n\n" Et menetä mitään sovellustietoja."</string>
@@ -1440,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Tallenna kaikki Bluetoothin HCl-paketit tiedostoon"</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="select_logd_size_title" msgid="7433137108348553508">"Lokipuskurien koot"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 tuntia"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 päivä"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Näytä järjestelmä"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Piilota järjestelmä"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Käytä USS-muistimääritystä"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tilastojen tyyppi"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Tausta"</string>
@@ -1838,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nykyinen salasana:"</string>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Käyttäjä"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Rajoitettu profiili"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Lisätäänkö uusi käyttäjä?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Voit jakaa tämän laitteen muiden kanssa luomalla lisää käyttäjiä. Kullakin käyttäjällä on oma tilansa, jota he voivat muokata esimerkiksi omilla sovelluksilla ja taustakuvilla. Käyttäjät voivat myös muokata laiteasetuksia, kuten Wi‑Fi-asetuksia, jotka vaikuttavat laitteen kaikkiin käyttäjiin.\n\nKun lisäät uuden käyttäjän, hänen tulee määrittää oman tilansa asetukset.\n\nKaikki käyttäjät voivat päivittää sovelluksia muille käyttäjille."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Voit jakaa tämän laitteen muiden kanssa luomalla lisää käyttäjiä. Kullakin käyttäjällä on oma tilansa, jota he voivat muokata esimerkiksi omilla sovelluksilla ja taustakuvilla. Käyttäjät voivat myös muokata laiteasetuksia, kuten Wi‑Fi-asetuksia, jotka vaikuttavat laitteen kaikkiin käyttäjiin.\n\nKun lisäät uuden käyttäjän, hänen tulee määrittää oman tilansa asetukset.\n\nKaikki käyttäjät voivat päivittää sovelluksia muille käyttäjille."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Kun lisäät uuden käyttäjän, hänen tulee määrittää oman tilansa asetukset.\n\nKaikki käyttäjät voivat päivittää sovelluksia muille käyttäjille."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Määritetäänkö käyttäjän asetukset nyt?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Varmista, että käyttäjä voi vastaanottaa laitteen ja määrittää oman tilansa"</string>
@@ -2393,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"rajoitus rajoittaa rajoitettu"</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_reset_apps" msgid="6420313678620788457">"nollaa asetukset oletus"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"hätätilanne ice sovellus oletus"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"sovellukset lataus järjestelmä"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"sovellusten käyttöoikeuksien suojaus"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"oletussovellukset"</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-tagi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Kirjoita"</string>
@@ -2411,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Hälytyksen voimakkuus"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Soittoäänen voimakkuus"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Ilmoituksen äänenvoimakkuus"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Estä keskeytykset"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Sallittavat tärkeät ilmoitukset"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automaattiset säännöt"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Kun puheluita ja 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_alarms" msgid="7380265858042606857">"Salli vain herätykset"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Älä häiritse"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Vain tärkeät"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Vain herätykset"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Ei keskeytyksiä"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Puhelimen soittoääni"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Ilmoitusten oletussoittoääni"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Värinä myös puheluille"</string>
@@ -2451,15 +2486,6 @@
     <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>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> pystyy lukemaan kaikki järjestelmän tai asennetun sovelluksen julkaisemat ilmoitukset, joihin voi sisältyä henkilökohtaisia tietoja, kuten kontaktien nimiä ja sinulle lähetettyjen viestien tekstiä. Se voi myös ohittaa nämä ilmoitukset tai niiden toimintopainikkeet."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Ehtojen toimituspalvelut"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ei ehtojen toimituspalveluja"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d sovellusta toimii ehtojen toimituspalveluna.</item>
-      <item quantity="one">%d sovellus toimii ehtojen toimituspalveluna.</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Ehtojen toimituspalveluja ei ole asennettu."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Otetaanko <xliff:g id="SERVICE">%1$s</xliff:g> käyttöön?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> voi lisätä lopetusehtoja Älä häiritse -tilaan."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ladataan sovelluksia…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Estä kaikki"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Älä koskaan näytä ilmoituksia tästä sovelluksesta"</string>
@@ -2473,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Tärkeät"</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_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="zen_mode_rule_name" msgid="5149068059383837549">"Säännön nimi"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Lisää sääntö"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Poista sääntö"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Poistetaanko sääntö <xliff:g id="RULE">%1$s</xliff:g>?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Poista"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Säännön tyyppi"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Tuntematon"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Määritä sääntö"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Aikataulusääntö"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Sääntöä ei löydy."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Päivät"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Ei mitään"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Joka päivä"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Ei koskaan"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Puhelut"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Viestit"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Saapuneet puhelut/viestit:"</string>
@@ -2493,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Herätykset"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Muistutukset"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Tapahtumat"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Valitut soittajat"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Toistuvat soitot"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Salli, jos sama henkilö soittaa uudelleen <xliff:g id="MINUTES">%d</xliff:g> minuutin kuluessa."</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Ota autom. käyttöön"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Ei koskaan"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Joka yö"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> seuraavana päivänä"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Milloin sallit keskeytykset?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Kuinka kauan?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Toistaiseksi"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minuuttia</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuutti</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tuntia</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> tunti</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Ota vain tärkeät ilmoitukset käyttöön toistaiseksi."</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Ota vain tärkeät ilmoitukset käyttöön <xliff:g id="DURATION">%1$d</xliff:g> minuutiksi <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> asti.</item>
+      <item quantity="one">Ota vain tärkeät ilmoitukset käyttöön yhdeksi minuutiksi <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> asti.</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Ota vain tärkeät ilmoitukset käyttöön <xliff:g id="DURATION">%1$d</xliff:g> tunniksi <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> asti.</item>
+      <item quantity="one">Ota vain tärkeät ilmoitukset käyttöön yhdeksi tunniksi <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> asti.</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Ota vain herätykset käyttöön toistaiseksi."</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Ota vain herätykset käyttöön <xliff:g id="DURATION">%1$d</xliff:g> minuutiksi <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> asti.</item>
+      <item quantity="one">Ota vain herätykset käyttöön yhdeksi minuutiksi <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> asti.</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Ota vain herätykset käyttöön <xliff:g id="DURATION">%1$d</xliff:g> yhdeksi tunniksi <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> asti.</item>
+      <item quantity="one">Ota vain herätykset käyttöön yhdeksi tunniksi <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> asti.</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Ota älä häiritse -tila käyttöön toistaiseksi."</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Ota älä häiritse -tila käyttöön <xliff:g id="DURATION">%1$d</xliff:g> minuutiksi <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> asti.</item>
+      <item quantity="one">Ota älä häiritse -tila käyttöön yhdeksi minuutiksi <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> asti.</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Ota älä häiritse -tila käyttöön <xliff:g id="DURATION">%1$d</xliff:g> tunniksi <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> asti.</item>
+      <item quantity="one">Ota älä häiritse -tila käyttöön yhdeksi tunniksi <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> asti.</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Salli keskeytykset aina."</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ikuisesti"</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>
@@ -2566,7 +2659,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> käyttöoikeutta myönnetty</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> käyttöoikeus myönnetty</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g>/<xliff:g id="COUNT_3">%d</xliff:g> lupaa myönnetty.</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g> lupaa myönnetty.</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Joitakin oletuksia on asetettu."</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Oletuksia ei asetettu."</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Kaikki sovellukset"</string>
@@ -2577,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Tärkeät"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Yksityisluontoiset"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Sis. verkkotun. URL-osoitteita"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Palauta kaikkien sovellusten asetusten oletusarvot"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> sovellusta asennettu, mukaan lukien järjestelmäsovelluksia ja ladattuja sovelluksia."</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Järjestelmänvalvojan käytöstä poistama"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Lisäasetukset"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Tuntematon sovellus"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Valitse profiili"</string>
@@ -2593,4 +2688,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> sovellusta voi avata verkkotunnuksensa URL-osoitteita</item>
       <item quantity="one">Yksi sovellus voi avata verkkotunnuksensa URL-osoitteita</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Ei tunnistettu"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Oletussovellukset"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Selainsovellus"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Ei oletusselain"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Oletus)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index 041216b..65ddcf4 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Bouton de commande"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"faible"</item>
     <item msgid="4212263919458209842">"critique"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Désactivé"</item>
-    <item msgid="5656544177755411222">"Interruptions limitées"</item>
-    <item msgid="8735337502532332056">"Aucune interruption"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normale"</item>
     <item msgid="866544120205026771">"Modérée"</item>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 38914af..1f81b5c 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Carte SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Paramètres du serveur mandataire"</string>
     <string name="cancel" msgid="6859253417269739139">"Annuler"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ANNULER"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUER"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"OUI"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NON"</string>
-    <string name="forget" msgid="7267115980248732932">"SUPPRIMER"</string>
+    <string name="forget" msgid="1400428660472591263">"Supprimer"</string>
+    <string name="save" msgid="879993180139353333">"Enregistrer"</string>
+    <string name="done" msgid="6942539184162713160">"Terminé"</string>
     <string name="settings_label" msgid="1626402585530130914">"Paramètres"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Paramètres"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Raccourci vers les paramètres"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Veuillez brancher votre chargeur, puis réessayer."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Aucun NIP ni mot de passe saisi pour le verrouillage de l\'écran"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Vous devez définir un NIP ou un mot de passe pour le verrouillage de l\'écran avant de lancer le chiffrement."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Vous devez dessiner votre schéma de déverrouillage pour confirmer le chiffrement de votre appareil."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Chiffrer?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Le chiffrement est irréversible, et toute interruption du processus peut entraîner la perte de données. L\'opération peut prendre une heure, voire plus, au cours de laquelle la tablette sera redémarrée à plusieurs reprises."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Le chiffrement est irréversible, et toute interruption du processus peut entraîner la perte de données. L\'opération peut prendre une heure, voire plus, au cours de laquelle le téléphone sera redémarré à plusieurs reprises."</string>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Options avancées"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Paramètres Bluetooth avancés"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Si Bluetooth activé, appareil peut communiquer avec autres appareils Bluetooth à proximité."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"Pour améliorer la précision de la localisation, les services Google rechercheront les appareils Bluetooth à proximité, même si Bluetooth est désactivé. Vous pouvez modifier cette option dans les LINK_BEGINparamètres de rechercheLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Pour améliorer la précision de la localisation, les application et les services rechercheront les appareils Bluetooth à proximité, même si Bluetooth est désactivé. Vous pouvez modifier cette option dans les <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>paramètres de recherche<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Se connecter à…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté de l\'audio du support."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté de l\'audio en mains libres."</string>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"Pour améliorer la précision de la localisation, les services Google rechercheront les réseaux Wi-Fi à proximité, même si le Wi-Fi est désactivé. Vous pouvez modifier cette option dans les LINK_BEGINparamètres de rechercheLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Pour améliorer la précision de la localisation, les application et les services rechercheront les réseaux Wi-Fi, même si le Wi-Fi est désactivé. Vous pouvez modifier cette option dans les <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>paramètres de recherche<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ne plus afficher"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi actif en veille"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi activé pendant la veille"</string>
@@ -604,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scanner"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Options avancées"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Affich. applications"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Aff. intensité Wi-Fi"</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>
@@ -663,6 +658,8 @@
     <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 connexion pour autoriser l\'accès réseau."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONNEXION"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Ce réseau ne dispose d\'aucun accès à Internet. Voulez-vous quand même l\'utiliser?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Ne plus me demander pour ce réseau"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connexion"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Échec de la connexion au réseau."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Supprimer"</string>
@@ -729,21 +726,17 @@
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Point d\'accès Wi-Fi mobile <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="wifi_calling_settings_title" msgid="4102921303993404577">"Appels Wi-Fi"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Préférences d\'appel"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Mode d\'appel Wi-Fi"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Réseau Wi-Fi de préférence"</item>
     <item msgid="5267397515594230396">"Réseau cellulaire de préférence"</item>
-    <item msgid="3132912693346866895">"Wi-Fi seulement"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Lorsque les appels Wi-Fi sont activés, votre téléphone peut transférer les appels par réseau Wi-Fi ou le réseau de votre fournisseur de services, en fonction de votre préférence et du signal le plus puissant. Avant d\'activer cette fonctionnalité, renseignez-vous auprès de votre fournisseur pour en savoir plus sur les frais et d\'autres détails."</string>
     <string name="home_settings" msgid="212375129455718176">"Accueil"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Affichage"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
@@ -915,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Disponible (en lecture seule)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espace total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calcul en cours"</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Applis (données des applis et contenu multimédia)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Applications et données des applications"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Médias"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"téléchargements"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Images, vidéos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (musique, sonneries, podcasts, etc.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Divers"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Autres fichiers"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Données mises en cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Démonter le stockage partagé"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Désinstaller la carte SD"</string>
@@ -953,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Désinstallation en cours"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Espace de stockage bientôt saturé"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Il est possible que certaines fonctionnalités du système, comme la synchronisation, ne soient pas opérationnelles. Libérez de l\'espace en supprimant certains éléments (applications ou contenu multimédia, par exemple) ou en annulant leur épinglage."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Renommer"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Monter"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Éjecter"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Effacer et formater"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Eff. et format. comme mém. int."</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Connexion USB à l\'ordinateur"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Connexion USB à l\'ordinateur"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Connecter en tant que"</string>
@@ -963,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Permettre aux applications compatibles avec le protocole MIDI de fonctionner par USB avec des logiciels MIDI sur votre ordinateur"</string>
     <string name="storage_other_users" msgid="808708845102611856">"Autres utilisateurs"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Mémoire interne de l\'appareil"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Stockage amovible"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> libre (total : <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> est monté"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Impossible de monter <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> a été éjecté en toute sécurité"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Impossible d\'éjecter <xliff:g id="NAME">%1$s</xliff:g> en toute sécurité"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> n\'est pas formaté"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Impossible de formater <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Renommer le stockage"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Après le formatage, vous pouvez utiliser la mémoire de stockage « <xliff:g id="NAME_0">^1</xliff:g> » avec d\'autres appareils. \n\nToutes les données enregistrées sur « <xliff:g id="NAME_1">^1</xliff:g> » seront effacées. Nous vous conseillons de sauvegarder vos données avant de continuer. \n\n"<b>"Sauvegardez vos photos et vos autres fichiers"</b>\n"Déplacez vos fichiers multimédias vers une autre mémoire de stockage sur cet appareil, ou transférez-les sur un ordinateur à l\'aide d\'un câble USB. \n\n"<b>"Sauvegardez vos applications"</b>\n"Toutes les applications enregistrées sur « <xliff:g id="NAME_6">^1</xliff:g> » seront désinstallées, et les données correspondantes seront effacées. Pour conserver ces applications, déplacez-les vers une autre mémoire de stockage sur cet appareil."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Lorsque vous éjectez la mémoire de stockage « <xliff:g id="NAME_0">^1</xliff:g> », les applications qui y sont enregistrées cessent de fonctionner, et les fichiers qu\'elle contient ne sont plus accessibles jusqu\'à ce que vous la réinsériez de nouveau."</b>\n\n"La mémoire de stockage « <xliff:g id="NAME_1">^1</xliff:g> » a été configurée pour ne fonctionner que sur cet appareil. Vous ne pouvez pas l\'utiliser sur d\'autres appareils."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurez votre <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utiliser en tant que mémoire de stockage externe"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Pour déplacer des photos et d\'autres fichiers entre différents appareils"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Utiliser comme mémoire de stockage interne"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Pour enregistrer tout type de contenus, y compris des applications et des photos, sur cet appareil uniquement. Cette option nécessite de formater la mémoire de stockage pour l\'empêcher de fonctionner avec d\'autres appareils."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formater comme mémoire interne"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Cette option nécessite de formater la mémoire de stockage « <xliff:g id="NAME_0">^1</xliff:g> » pour qu\'elle soit sécurisée. \n\nAprès le formatage, « <xliff:g id="NAME_1">^1</xliff:g> » ne fonctionnera que sur cet appareil. \n\n"<b>"Le formatage entraîne la suppression de toutes les données enregistrées sur « <xliff:g id="NAME_2">^1</xliff:g> »."</b>" Pour ne pas risquer de perdre vos données, nous vous conseillons de les sauvegarder."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Effacer et formater"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatage de <xliff:g id="NAME">^1</xliff:g> en cours..."</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Ne retirez pas <xliff:g id="NAME">^1</xliff:g> durant le formatage."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Déplacer vers une autre mémoire"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Vous pouvez déplacer vos photos, vos fichiers et les données de vos applications vers la nouvelle mémoire de stockage « <xliff:g id="NAME">^1</xliff:g> ». \n\nCette opération prend environ <xliff:g id="TIME">^2</xliff:g> et permet de libérer <xliff:g id="SIZE">^3</xliff:g> sur la mémoire de stockage interne. Certaines applications ne fonctionneront pas pendant l\'opération."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Déplacer maintenant"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Déplacer plus tard"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Déplacer les données maintenant"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Le déplacement des données dure <xliff:g id="TIME">^1</xliff:g> environ et permet de libérer <xliff:g id="SIZE">^2</xliff:g> sur la mémoire de stockage interne."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Déplacer"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Déplacement des données..."</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Pendant le déplacement des données : \n• Ne retirez pas la mémoire de stockage « <xliff:g id="NAME">^1</xliff:g> ». \n• Certaines applications ne fonctionneront pas correctement. \n• Assurez-vous que l\'appareil reste chargé."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> est prêt à utiliser"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Votre mémoire de stockage « <xliff:g id="NAME">^1</xliff:g> » est maintenant configurée pour que vous puissiez y enregistrer des photos et d\'autres fichiers."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Votre nouvelle mémoire de stockage « <xliff:g id="NAME">^1</xliff:g> » fonctionne correctement. \n\nPour déplacer des photos, des fichiers et des données d\'application sur cet appareil, sélectionnez Paramètres &gt; Stockage."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Déplacer <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Le déplacement de l\'application « <xliff:g id="APP">^1</xliff:g> » et des données correspondantes vers « <xliff:g id="NAME_0">^2</xliff:g> » ne prend que quelques minutes. Vous ne pourrez pas utiliser l\'application jusqu\'à la fin de l\'opération. \n\nNe retirez pas la mémoire de stockage « <xliff:g id="NAME_1">^2</xliff:g> » pendant le déplacement."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Déplacement de <xliff:g id="APP">^1</xliff:g> en cours..."</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Ne retirez pas la mémoire de stockage « <xliff:g id="NAME">^1</xliff:g> » pendant le déplacement. \n\nL\'application « <xliff:g id="APP">^2</xliff:g> » ne sera pas disponible jusqu\'à la fin de l\'opération."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Annuler le déplacement"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"État de la batterie"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Niveau de la batterie"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Rétablir les valeurs par défaut"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"La réinitialisation des paramètres APN par défaut est terminée."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Réinitialisation des paramètres réseau"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Cette action permet de réinitialiser tous les paramètres réseau à leurs valeurs par défaut : \n\n"<li>"Connexions Wi-Fi"</li>\n<li>"Données cellulaires"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Cette action permet de réinitialiser tous les paramètres réseau, y compris : \n\n"<li>"Wi-Fi"</li>\n<li>"Données cellulaires"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Réinitialiser les paramètres"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Réinitialiser tous les paramètres réseau? Cette action est irréversible."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Réinitialiser tous les paramètres réseau? Cette action est irréversible."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Réinitialiser les paramètres"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Vous devez dessiner votre schéma de déverrouillage pour confirmer la réinitialisation des paramètres réseau."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Réinitialiser?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Réinitialiser les paramètres réseau"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Les paramètres réseau ont été réinitialisés"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Réinitialiser l\'appareil"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Rétablir configuration d\'usine"</string>
     <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>
@@ -1029,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Effacer toutes les données de la carte SD, telles que la musique ou les photos"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Réinitialiser la tablette"</string>
     <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_desc" msgid="1062841478823409667">"Effacer toutes vos données 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_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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Le rétablissement de la configuration d\'usine n\'est pas possible pour cet utilisateur"</string>
@@ -1048,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configurer la messagerie vocale, le transfert d\'appel, la mise en attente d\'appels, le numéro de l\'appelant"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Partage de connexion par USB"</string>
@@ -1081,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Aide"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Réseaux cellulaires"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Forfait de données cellulaires"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Application de texto par défaut"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Application de messagerie texte"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Modifier l\'application de messagerie texte?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Utiliser <xliff:g id="NEW_APP">%1$s</xliff:g> au lieu de <xliff:g id="CURRENT_APP">%2$s</xliff:g> comme application de messagerie texte?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Utiliser <xliff:g id="NEW_APP">%s</xliff:g> comme application de messagerie texte?"</string>
@@ -1112,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utiliser le GPS pour déterminer la position"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Analyse en cours…"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Analyse en cours…"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Recherche de réseaux Wi-Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Améliorez la précision de la localisation en permettant aux applications et aux services de rechercher des réseaux Wi-Fi, même lorsque le Wi-Fi est désactivé"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Recherche d\'appareils Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Améliorez la précision de la localisation en permettant aux services système de rechercher les appareils Bluetooth, même lorsque Bluetooth est désactivé"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Local. par Wi-Fi et rés. cell."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Autoriser applis à utiliser localisation Google pour estimer position plus rapidement. Infos localisation anonymes envoyées à Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Position déterminée par le Wi-Fi"</string>
@@ -1157,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Le mot de passe a été défini."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Le NIP a été défini."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Le schéma a été défini."</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Entrez le schéma de l\'appareil pour continuer."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Entrez le NIP de l\'appareil pour continuer."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Entrez le mot de passe de l\'appareil pour continuer."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"NIP erroné"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Mot de passe incorrect"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Schéma erroné"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Sécurité de l\'appareil"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Modifier le schéma"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Modifier le NIP de déverrouillage"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmer le schéma enregistré"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Réessayer :"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Dessiner un schéma de déverrouillage"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Appuyez sur Menu pour obtenir de l\'aide."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Retirez le doigt lorsque vous avez terminé."</string>
@@ -1183,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Créer un schéma"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Modifier le schéma"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Comment dessiner un schéma de déverrouillage :"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Trop de tentatives échouées!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Veuillez réessayer dans <xliff:g id="NUMBER">%d</xliff:g> secondes."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Trop de tentatives incorrectes. Réessayez dans <xliff:g id="NUMBER">%d</xliff:g> secondes."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"L\'application n\'est pas installée sur votre téléphone."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gérer les applications"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gérer et supprimer les applications installées"</string>
@@ -1235,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Trier par taille"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Afficher les services en cours"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Afficher processus en cache"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Application d\'urgence"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Réinitialiser préf. applis"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Réinitialiser préférences?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Cette opération a pour effet de réinitialiser toutes les préférences relatives aux éléments suivants :\n\n "<li>"Applications désactivées"</li>\n" "<li>"Notifications associées aux applications désactivées"</li>\n" "<li>"Applications par défaut pour les actions"</li>\n" "<li>"Restrictions de données en arrière-plan pour les applications"</li>\n" "<li>"Toutes les restrictions d\'autorisations"</li>\n\n" Vous ne perdrez aucune donnée liée aux applications."</string>
@@ -1440,8 +1479,6 @@
     <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="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="select_logd_size_title" msgid="7433137108348553508">"Tailles des mémoires tampons d\'enregistreur"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 heures"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 jour"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Afficher le système"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Masquer le système"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Utiliser USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Type de statistiques"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Arrière-plan"</string>
@@ -1838,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Mot de passe actuel :"</string>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Utilisateur"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil limité"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Ajouter un utilisateur?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Vous pouvez partager cet appareil avec d\'autres personnes en ajoutant des utilisateurs. Chaque utilisateur dispose de son propre espace, où il peut personnaliser, entre autres, ses applications et son fond d\'écran. Chacun peut également modifier les paramètres de l\'appareil, comme les réseaux Wi-Fi, qui touchent tous les utilisateurs.\n\nLorsque vous ajoutez un utilisateur, celui-ci doit configurer son espace.\n\nN\'importe quel utilisateur peut mettre à jour les applications pour tous les autres utilisateurs."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Vous pouvez partager cet appareil avec d\'autres personnes en ajoutant des utilisateurs. Chaque utilisateur dispose de son propre espace, où il peut personnaliser, entre autres, ses applications et son fond d\'écran. Chacun peut également modifier les paramètres de l\'appareil, comme les réseaux Wi-Fi, qui touchent tous les utilisateurs.\n\nLorsque vous ajoutez un utilisateur, celui-ci doit configurer son espace.\n\nN\'importe quel utilisateur peut mettre à jour les applications pour tous les autres utilisateurs."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Lorsque vous ajoutez un utilisateur, celui-ci doit configurer son espace.\n\nN\'importe quel utilisateur peut mettre à jour les applications pour tous les autres utilisateurs."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurer l\'utilisateur?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Assurez-vous que la personne est disponible, et qu\'elle peut utiliser l\'appareil pour configurer son espace."</string>
@@ -2393,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"limitation limiter limité"</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_reset_apps" msgid="6420313678620788457">"réinitialiser préférences par défaut"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"application par défaut en cas d\'urgence"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"applis télécharger applications système"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"applications autorisations sécurité"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"applications par défaut"</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>
@@ -2411,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume de l\'alarme"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume de la sonnerie"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume des notifications"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Bloquer les interruptions"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Priorités seulement"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Règles automatiques"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"À la réception d\'appels et 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_alarms" msgid="7380265858042606857">"Autoriser uniquement les alarmes"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ne pas interrompre"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Priorités seulement"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarmes uniquement"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Aucune interruption"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g> : <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Sonnerie du téléphone"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Sonnerie de notification par défaut"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibreur aussi pour les appels"</string>
@@ -2451,15 +2486,6 @@
     <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="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" formatted="false" msgid="1398308139164964218">
-      <item quantity="one">%d application fournit des conditions</item>
-      <item quantity="other">%d applications fournissent des conditions</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Aucun fournisseur de conditions n\'est installé."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Activer <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> pourra ajouter des conditions de sortie au mode Ne pas déranger."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Chargement des applications en cours..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Tout bloquer"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ne jamais afficher les notifications de cette application"</string>
@@ -2473,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priorité"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensible"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Nom de la règle"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Ajouter une règle"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Supprimer la règle"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Supprimer la règle « <xliff:g id="RULE">%1$s</xliff:g> »?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Supprimer"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Type de règle"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Inconnue"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configurer la règle"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Programmer la règle"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Règle non trouvée."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Jours"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Aucun"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Tous les jours"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Jamais"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> à <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"De <xliff:g id="START">%1$s</xliff:g> à <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2493,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Rappels"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Événements"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Appelants sélectionnés"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Appelants fréquents"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Si la même personne appelle deux fois en <xliff:g id="MINUTES">%d</xliff:g> minute(s), autoriser le deuxième appel"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activation auto"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Jamais"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Tous les soirs"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> le lendemain"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Quand voulez-vous recevoir les interruptions?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Pendant combien de temps?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Indéfiniment"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutes</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> heure</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> heures</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Activer indéfiniment le mode Notifications prioritaires seulement"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Notifications prioritaires seulement pendant <xliff:g id="DURATION">%1$d</xliff:g> minute, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Notifications prioritaires seulement pendant <xliff:g id="DURATION">%1$d</xliff:g> minutes, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Notifications prioritaires seulement pendant <xliff:g id="DURATION">%1$d</xliff:g> heure, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Notifications prioritaires seulement pendant <xliff:g id="DURATION">%1$d</xliff:g> heures, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Activer indéfiniment le mode Alarmes uniquement"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">Alarmes seulement pendant <xliff:g id="DURATION">%1$d</xliff:g> minute, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Alarmes seulement pendant <xliff:g id="DURATION">%1$d</xliff:g> minutes, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="one">Alarmes seulement pendant <xliff:g id="DURATION">%1$d</xliff:g> heure, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Alarmes seulement pendant <xliff:g id="DURATION">%1$d</xliff:g> heures, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Activer le mode Ne pas interrompre indéfiniment"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Aucune interruption pendant <xliff:g id="DURATION">%1$d</xliff:g> minute, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Aucune interruption pendant <xliff:g id="DURATION">%1$d</xliff:g> minutes, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Aucune interruption pendant <xliff:g id="DURATION">%1$d</xliff:g> heure, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Aucune interruption pendant <xliff:g id="DURATION">%1$d</xliff:g> heures, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Activer le mode Toujours interrompre"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"à perpétuité"</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>
@@ -2566,7 +2659,10 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> autorisations accordées</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorisations accordées</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> autorisation accordée sur <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> autorisations accordées sur <xliff:g id="COUNT_3">%d</xliff:g></item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Certaines préférences par défaut définies"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Aucune préférence par défaut définie"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Toutes les applications"</string>
@@ -2577,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Priorité"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensible"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Avec les URL de domaine"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Réinitialiser les préférences par défaut dans toutes les applications"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> applications installées, y compris les applications système et les applications téléchargées"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Désactivé par l\'administrateur"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Paramètres avancés"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Application inconnue"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Sélectionnez un profil"</string>
@@ -2593,4 +2688,11 @@
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> application peut ouvrir ses URL de domaine</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> applications peuvent ouvrir leurs URL de domaine</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Doigt non reconnu"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Applications par défaut"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Application de navigateur"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Aucun navigateur par défaut"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Par défaut)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index ac3693b..628917e 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Appuyer sur le bouton"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"Multimédia"</item>
     <item msgid="7924928667052300589">"Appareil"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"position approximative"</item>
+    <item msgid="5789673140227507995">"position précise"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibreur"</item>
+    <item msgid="3434165993711230924">"accéder aux contacts"</item>
+    <item msgid="616161687718081936">"modifier les contacts"</item>
+    <item msgid="7638002295329050091">"lire le journal d\'appels"</item>
+    <item msgid="6546959730920410907">"modifier le journal d\'appels"</item>
+    <item msgid="446877710771379667">"accéder à l\'agenda"</item>
+    <item msgid="7674458294386319722">"modifier l\'agenda"</item>
+    <item msgid="8281201165558093009">"détection du Wi-Fi"</item>
+    <item msgid="8694611243479480497">"notification"</item>
+    <item msgid="7776439107987345446">"détection du réseau mobile"</item>
+    <item msgid="514615766544675057">"appeler"</item>
+    <item msgid="8181415497109310680">"lire les SMS"</item>
+    <item msgid="6816551144382117307">"écrire des SMS"</item>
+    <item msgid="4600463921908905030">"recevoir des SMS"</item>
+    <item msgid="5958926493289432745">"recevoir des SMS d\'urgence"</item>
+    <item msgid="4945269495221089540">"recevoir des MMS"</item>
+    <item msgid="5570472453573929087">"recevoir des messages push WAP"</item>
+    <item msgid="7125408150230860501">"envoyer des SMS"</item>
+    <item msgid="7080337936612188061">"lire les SMS ICC"</item>
+    <item msgid="587124103118495063">"écrire des SMS ICC"</item>
+    <item msgid="2320577158869025503">"modifier les paramètres"</item>
+    <item msgid="1545733463471924009">"dessiner par dessus"</item>
+    <item msgid="3609046903962454582">"accéder aux notifications"</item>
+    <item msgid="4671646036128214513">"caméra"</item>
+    <item msgid="1097324338692486211">"enregistrer fichier audio"</item>
+    <item msgid="5031552983987798163">"lire le fichier audio"</item>
+    <item msgid="8374996688066472414">"lire le Presse-papiers"</item>
+    <item msgid="3045529469061083747">"modifier le Presse-papiers"</item>
+    <item msgid="5124443975763747838">"boutons pour contenus multimédias"</item>
+    <item msgid="4547883971364273343">"priorité audio"</item>
+    <item msgid="2603878814882344450">"volume général"</item>
+    <item msgid="7136963238377062018">"volume de la voix"</item>
+    <item msgid="4270236897655923007">"volume des sonneries"</item>
+    <item msgid="6325739889222559394">"volume des contenus multimédias"</item>
+    <item msgid="5762123934816216821">"volume des alarmes"</item>
+    <item msgid="785049718065337473">"volume des notifications"</item>
+    <item msgid="6700305533746877052">"volume Bluetooth"</item>
+    <item msgid="2029227495214047094">"maintenir activé"</item>
+    <item msgid="26109888160231211">"suivre la position"</item>
+    <item msgid="5753382310468855812">"surveiller les requêtes de localisation qui nécessitent une quantité d\'énergie importante"</item>
+    <item msgid="3356591542543137332">"obtenir des statistiques d\'utilisation"</item>
+    <item msgid="3073734345226842233">"activer/désactiver le micro"</item>
+    <item msgid="1148142988678569310">"projeter des contenus multimédias"</item>
+    <item msgid="9130014005474445273">"activer le VPN"</item>
+    <item msgid="1165192162975045562">"modifier le fond d\'écran"</item>
+    <item msgid="7129487923652967258">"soutien structurel"</item>
+    <item msgid="1069023208100114540">"aide à la capture d\'écran"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Position"</item>
+    <item msgid="8677040780775113033">"Position"</item>
+    <item msgid="1660743989948992916">"Position"</item>
+    <item msgid="8791172739860195290">"Vibreur"</item>
+    <item msgid="383413555642128046">"Accéder aux contacts"</item>
+    <item msgid="3654594895269697313">"Modifier les contacts"</item>
+    <item msgid="7928393476362362538">"Lire le journal d\'appels"</item>
+    <item msgid="6248591205254641116">"Modifier le journal d\'appels"</item>
+    <item msgid="6093344633066170692">"Accéder à l\'agenda"</item>
+    <item msgid="1334886368750347692">"Modifier l\'agenda"</item>
+    <item msgid="1638204101698708656">"Position"</item>
+    <item msgid="2154671955760380322">"Publier des notifications"</item>
+    <item msgid="4282477730595931828">"Position"</item>
+    <item msgid="4891423912898525905">"Appeler"</item>
+    <item msgid="2623604824935968113">"Lire des SMS ou des MMS"</item>
+    <item msgid="4420177125221176306">"Écrire des SMS ou des MMS"</item>
+    <item msgid="3986142739951490025">"Recevoir des SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Recevoir des SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Recevoir des SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Recevoir des SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Envoyer des SMS/MMS"</item>
+    <item msgid="3527273606643794973">"Lire des SMS ou des MMS"</item>
+    <item msgid="4370895547001583812">"Écrire des SMS ou des MMS"</item>
+    <item msgid="4218544235221631789">"Modifier les paramètres"</item>
+    <item msgid="736541391767350377">"Dessiner par dessus"</item>
+    <item msgid="5530815681721654194">"Accéder aux notifications"</item>
+    <item msgid="781213371706962767">"Caméra"</item>
+    <item msgid="1720492593061838172">"Enregistrer fichier audio"</item>
+    <item msgid="3493046322001257041">"Lire le fichier audio"</item>
+    <item msgid="136815868796597058">"Lire le Presse-papiers"</item>
+    <item msgid="5238692940326972503">"Modifier le Presse-papiers"</item>
+    <item msgid="5753789168376302997">"Boutons multimédias"</item>
+    <item msgid="3265262911688671938">"Priorité audio"</item>
+    <item msgid="2098976479485046797">"Volume général"</item>
+    <item msgid="5660213838861789350">"Volume de la voix"</item>
+    <item msgid="7983336752371254444">"Volume de la sonnerie"</item>
+    <item msgid="7878027809189330917">"Volume des contenus multimédias"</item>
+    <item msgid="7260546305036218513">"Volume de l\'alarme"</item>
+    <item msgid="9103719301075748925">"Volume des notifications"</item>
+    <item msgid="7025966722295861512">"Volume Bluetooth"</item>
+    <item msgid="4665183401128289653">"Maintenir activé"</item>
+    <item msgid="8584357129746649222">"Localisation"</item>
+    <item msgid="7669257279311110599">"Localisation"</item>
+    <item msgid="3459320345690097795">"Obtenir des statistiques d\'utilisation"</item>
+    <item msgid="1312534577834048535">"Activer/Désactiver le micro"</item>
+    <item msgid="5906017727368097853">"Projeter des contenus multimédias"</item>
+    <item msgid="2486614710846178542">"Activer le VPN"</item>
+    <item msgid="5586547561693629602">"Modifier le fond d\'écran"</item>
+    <item msgid="32794179825485062">"Soutien structurel"</item>
+    <item msgid="7872852746938272552">"Aide à la capture d\'écran"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Court"</item>
     <item msgid="2560532955514699713">"Moyen"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"faible"</item>
     <item msgid="4212263919458209842">"critique"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Désactivé"</item>
-    <item msgid="5656544177755411222">"Sonneries limitées"</item>
-    <item msgid="8735337502532332056">"Aucune sonnerie"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normale"</item>
     <item msgid="866544120205026771">"Moyenne"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 1eb966c..b26d384 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Carte SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Paramètres proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Annuler"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ANNULER"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUER"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"OUI"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NON"</string>
-    <string name="forget" msgid="7267115980248732932">"SUPPRIMER"</string>
+    <string name="forget" msgid="1400428660472591263">"Supprimer"</string>
+    <string name="save" msgid="879993180139353333">"Enregistrer"</string>
+    <string name="done" msgid="6942539184162713160">"OK"</string>
     <string name="settings_label" msgid="1626402585530130914">"Paramètres"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Paramètres"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Raccourci vers les paramètres"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Veuillez brancher votre chargeur, puis réessayer."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Aucun code PIN ni mot de passe saisi pour le verrouillage de l\'écran"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Vous devez définir un code PIN ou un mot de passe pour le verrouillage de l\'écran avant de lancer le chiffrement."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Vous devez dessiner votre schéma de déverrouillage pour confirmer le chiffrement de votre appareil."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Chiffrer ?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Le chiffrement est irréversible, et toute interruption du processus peut entraîner la perte de données. L\'opération peut prendre une heure, voire plus, au cours de laquelle la tablette sera redémarrée à plusieurs reprises."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Le chiffrement est irréversible, et toute interruption du processus peut entraîner la perte de données. L\'opération peut prendre une heure, voire plus, au cours de laquelle le téléphone sera redémarré à plusieurs reprises."</string>
@@ -419,8 +416,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Schéma"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Code PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Mot de passe"</string>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Une fois que vous avez configuré un verrouillage de l\'écran, vous pouvez également configurer votre empreinte numérique dans Paramètres &gt; Sécurité."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Désactiver le verrouillage de l\'écran"</string>
     <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>
@@ -522,8 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Paramètres avancés"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Paramètres Bluetooth avancés"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"L\'activation du Bluetooth permet à votre appareil de communiquer avec les appareils Bluetooth à proximité."</string>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Pour améliorer la précision de la localisation, les applications et les services recherchent les appareils Bluetooth, même lorsque le Bluetooth est désactivé. Vous pouvez modifier ce paramètre dans les <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>paramètres de recherche<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Se connecter à…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté de l\'audio du support."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté de l\'audio en mains libres."</string>
@@ -589,8 +584,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Pour améliorer la précision de la localisation, les applications et les services recherchent les réseaux Wi-Fi, même si le Wi-Fi est désactivé. Vous pouvez modifier ce paramètre dans les <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>paramètres de recherche<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ne plus afficher"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi actif en veille"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi activé pendant la veille"</string>
@@ -607,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Rechercher"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Options avancées"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Afficher les applis"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Aff. force Wi-Fi"</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>
@@ -666,6 +658,8 @@
     <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">"SE CONNECTER"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Ce réseau ne dispose d\'aucun accès à Internet. Voulez-vous quand même l\'utiliser ?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Ne plus demander pour ce réseau"</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>
@@ -732,21 +726,17 @@
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Point d\'accès Wi-Fi mobile <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="wifi_calling_settings_title" msgid="4102921303993404577">"Appels Wi-Fi"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Préférence d\'appel"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Mode d\'appel Wi-Fi"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi préféré"</item>
     <item msgid="5267397515594230396">"Mobile préféré"</item>
-    <item msgid="3132912693346866895">"Wi-Fi uniquement"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Lorsque les appels Wi-Fi sont activés, votre téléphone peut transférer les appels via les réseaux Wi-Fi ou le réseau de votre opérateur, en fonction de votre préférence et du signal le plus puissant. Avant d\'activer cette fonctionnalité, renseignez-vous auprès de votre opérateur pour en savoir plus sur les frais et d\'autres détails."</string>
     <string name="home_settings" msgid="212375129455718176">"Accueil"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Affichage"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
@@ -918,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Disponible (en lecture seule)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espace total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calcul en cours"</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Applis (données des applis et contenu multimédia)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Applications et données associées"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Support"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Téléchargements"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Images, vidéos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (musique, sonneries, podcasts, etc.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Divers"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Autres fichiers"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Données mises en cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Désinstal. mémoire partagée"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Désinstaller la carte SD"</string>
@@ -956,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Désinstallation en cours"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Espace de stockage bientôt saturé"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Il est possible que certaines fonctionnalités du système, comme la synchronisation, ne soient pas opérationnelles. Libérez de l\'espace en supprimant certains éléments (applications ou contenu multimédia, par exemple) ou en annulant leur épinglage."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Renommer"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Installer"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Éjecter"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Effacer et formater"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Effacer et formater mém. stock. interne"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Connexion USB à l\'ordinateur"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Connexion USB à l\'ordinateur"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Connecter en tant que"</string>
@@ -966,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Permettre aux applications compatibles avec le protocole MIDI de fonctionner via USB avec des logiciels MIDI sur votre ordinateur"</string>
     <string name="storage_other_users" msgid="808708845102611856">"Autres utilisateurs"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Mémoire de l\'appareil"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Périphérique stockage amovible"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"Espace libre : <xliff:g id="FREE">%1$s</xliff:g> (espace total : <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"La mémoire de stockage \"<xliff:g id="NAME">%1$s</xliff:g>\" a bien été installée."</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Impossible d\'installer la mémoire de stockage \"<xliff:g id="NAME">%1$s</xliff:g>\"."</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"La mémoire de stockage \"<xliff:g id="NAME">%1$s</xliff:g>\" a bien été éjectée de manière sécurisée."</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Impossible d\'éjecter la mémoire de stockage \"<xliff:g id="NAME">%1$s</xliff:g>\" de manière sécurisée."</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"La mémoire de stockage \"<xliff:g id="NAME">%1$s</xliff:g>\" a bien été formatée."</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Impossible de formater la mémoire de stockage \"<xliff:g id="NAME">%1$s</xliff:g>\"."</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Renommer la mémoire de stockage"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Après le formatage, vous pouvez utiliser la mémoire de stockage \"<xliff:g id="NAME_0">^1</xliff:g>\" avec d\'autres appareils. \n\nToutes les données enregistrées sur \"<xliff:g id="NAME_1">^1</xliff:g>\" vont être effacées. Nous vous conseillons de sauvegarder vos contenus avant de continuer. \n\n"<b>"Sauvegardez vos photos et vos autres fichiers"</b>" \nDéplacez vos fichiers multimédias vers une autre mémoire de stockage sur cet appareil, ou transférez-les sur un ordinateur à l\'aide d\'un câble USB. \n\n"<b>"Sauvegardez vos applications"</b>" \nToutes les applications enregistrées sur \"<xliff:g id="NAME_6">^1</xliff:g>\" vont être désinstallées, et les données correspondantes vont être effacées. Pour conserver ces applications, déplacez-les vers une autre mémoire de stockage sur cet appareil."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Lorsque vous éjectez la mémoire de stockage \"<xliff:g id="NAME_0">^1</xliff:g>\", les applications qui y sont enregistrées cessent de fonctionner, et les fichiers qu\'elle contient ne sont plus disponibles jusqu\'à ce que vous la réinsériez de nouveau."</b>" \n\nLa mémoire de stockage \"<xliff:g id="NAME_1">^1</xliff:g>\" a été configurée pour ne fonctionner que sur cet appareil. Vous ne pouvez pas l\'utiliser sur d\'autres appareils."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurer la mémoire \"<xliff:g id="NAME">^1</xliff:g>\""</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utiliser en tant que mémoire de stockage externe"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Pour déplacer des photos et d\'autres fichiers entre différents appareils"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Utiliser en tant que mémoire de stockage interne"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Pour enregistrer tout type de contenus, y compris des applications et des photos, sur cet appareil uniquement. Cette option nécessite de formater la mémoire de stockage pour l\'empêcher de fonctionner avec d\'autres appareils."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formater mémoire stockage interne"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Cette option nécessite de formater la mémoire de stockage \"<xliff:g id="NAME_0">^1</xliff:g>\" pour qu\'elle soit sécurisée. \n\nAprès le formatage, \"<xliff:g id="NAME_1">^1</xliff:g>\" ne fonctionnera que sur cet appareil. \n\n"<b>"Le formatage entraîne la suppression de toutes les données enregistrées sur \"<xliff:g id="NAME_2">^1</xliff:g>\"."</b>" Pour ne pas risquer de perdre vos données, nous vous conseillons de les sauvegarder."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Effacer et formater"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatage de mémoire \"<xliff:g id="NAME">^1</xliff:g>\" en cours"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Ne retirez pas \"<xliff:g id="NAME">^1</xliff:g>\" pendant le formatage."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Déplacer vers une autre mémoire"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Vous pouvez déplacer vos photos, vos fichiers et les données de vos applications vers la nouvelle mémoire de stockage \"<xliff:g id="NAME">^1</xliff:g>\". \n\nCette opération prend environ <xliff:g id="TIME">^2</xliff:g> et permet de libérer <xliff:g id="SIZE">^3</xliff:g> sur la mémoire de stockage interne. Certaines applications ne fonctionneront pas pendant l\'opération."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Déplacer les données maintenant"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Déplacer les données plus tard"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Déplacer les données maintenant"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Le déplacement des données dure <xliff:g id="TIME">^1</xliff:g> environ et permet de libérer <xliff:g id="SIZE">^2</xliff:g> sur la mémoire de stockage interne."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Déplacer"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Déplacement des données en cours"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Pendant le déplacement des données : \n• Ne retirez pas la mémoire de stockage \"<xliff:g id="NAME">^1</xliff:g>\". \n• Certaines applications ne fonctionneront pas correctement. \n• Assurez-vous que l\'appareil reste chargé."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"La mémoire \"<xliff:g id="NAME">^1</xliff:g>\" est prête"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Votre mémoire de stockage \"<xliff:g id="NAME">^1</xliff:g>\" est désormais configurée pour que vous puissiez y enregistrer des photos et d\'autres fichiers."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Votre nouvelle mémoire de stockage \"<xliff:g id="NAME">^1</xliff:g>\" fonctionne correctement. \n\nPour déplacer des photos, des fichiers et des données d\'application sur cet appareil, sélectionnez Paramètres &gt; Stockage."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Déplacer <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Le déplacement de l\'application \"<xliff:g id="APP">^1</xliff:g>\" et des données correspondantes vers \"<xliff:g id="NAME_0">^2</xliff:g>\" ne prend que quelques minutes. Vous ne pourrez pas utiliser l\'application jusqu\'à la fin de l\'opération. \n\nNe retirez pas la mémoire de stockage \"<xliff:g id="NAME_1">^2</xliff:g>\" pendant le déplacement."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Déplacement de l\'appli \"<xliff:g id="APP">^1</xliff:g>\" en cours"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Ne retirez pas la mémoire de stockage \"<xliff:g id="NAME">^1</xliff:g>\" pendant le déplacement. \n\nL\'application \"<xliff:g id="APP">^2</xliff:g>\" ne sera pas disponible jusqu\'à la fin de l\'opération."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Annuler le déplacement"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"État de la batterie"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Niveau de la batterie"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1010,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Rétablir param. par défaut"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"La réinitialisation des paramètres APN par défaut est terminée."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Réinitialisation des paramètres des réseaux"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"La configuration d\'usine sera rétablie pour tous les paramètres associés aux réseaux, y compris pour les suivants :\n\n"<li>"Wi-Fi"</li>\n<li>"Données mobiles"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Tous les paramètres des réseaux seront réinitialisés, y compris les suivants :\n\n"<li>"Wi‑Fi"</li>\n<li>"Données mobiles"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Réinitialiser les paramètres"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Réinitialiser tous les paramètres des réseaux ? Cette action est irréversible."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Réinitialiser tous les paramètres des réseaux ? Cette action est irréversible."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Réinitialiser les paramètres"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Vous devez dessiner votre schéma de déverrouillage pour confirmer la réinitialisation des paramètres des réseaux."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Réinitialiser ?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Les paramètres des réseaux ont bien été réinitialisés."</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Les paramètres des réseaux ont bien été réinitialisés."</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Réinitialiser l\'appareil"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Rétablir la configuration d\'usine"</string>
     <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>
@@ -1032,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Effacer toutes les données de la carte SD, telles que la musique ou les photos"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Réinitialiser la tablette"</string>
     <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_desc" msgid="1062841478823409667">"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_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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Le rétablissement de la configuration d\'usine n\'est pas disponible pour cet utilisateur."</string>
@@ -1051,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Messagerie vocale, transferts d\'appel, mise en attente, numéro de l\'appelant"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Partage connexion Bluetooth par USB"</string>
@@ -1084,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Aide"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Réseaux mobiles"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Forfait mobile"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Application SMS par défaut"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Application de SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Changer d\'application pour les SMS ?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Utiliser <xliff:g id="NEW_APP">%1$s</xliff:g> au lieu de <xliff:g id="CURRENT_APP">%2$s</xliff:g> comme application SMS ?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Utiliser <xliff:g id="NEW_APP">%s</xliff:g> comme application SMS ?"</string>
@@ -1115,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utiliser le GPS pour déterminer la position"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Recherche"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Recherche"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Recherche Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Améliorez la précision de la localisation en autorisant les applications et les services à rechercher des réseaux Wi-Fi même si le Wi-Fi est désactivé."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Recherche Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Améliorez la précision de la localisation en autorisant les services système à rechercher les appareils Bluetooth, même lorsque le Bluetooth est désactivé."</string>
     <string name="location_network_based" msgid="6010456018401296590">"Localisation via Wi-Fi et réseau mob."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Autoriser applis à utiliser localisation Google pour estimer position plus rapidement. Infos localisation anonymes envoyées à Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Position déterminée par le Wi-Fi"</string>
@@ -1160,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Le mot de passe a été défini."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Le code PIN a été défini."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Le schéma a été défini."</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Utilisez le motif de l\'appareil pour continuer."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Saisissez le code d\'accès de l\'appareil pour continuer."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Saisissez le mot de passe de l\'appareil pour continuer."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Code d\'accès incorrect."</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Mot de passe incorrect."</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Motif incorrect."</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Sécurité de l\'appareil"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Modifier le schéma"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Modifier le code PIN de déverrouillage"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmer le schéma enregistré"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Réessayer :"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Dessinez un schéma de déverrouillage :"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Appuyez sur Menu pour obtenir de l\'aide."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Relevez le doigt lorsque vous avez terminé."</string>
@@ -1186,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Créer un schéma"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Modifier le schéma de déverrouillage"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Comment dessiner un schéma de déverrouillage :"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Trop de tentatives échouées !"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Réessayer dans <xliff:g id="NUMBER">%d</xliff:g> secondes."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Trop de tentatives incorrectes. Veuillez réessayer dans <xliff:g id="NUMBER">%d</xliff:g> secondes."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"L\'application n\'est pas installée sur votre téléphone."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gérer les applications"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gérer et supprimer les applications installées"</string>
@@ -1238,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Trier par taille"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Afficher les services"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Voir processus en cache"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Application pour les urgences"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Réinitialiser préf. applis"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Réinitialiser préférences ?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Cette opération a pour effet de réinitialiser toutes les préférences relatives aux éléments suivants :\n\n "<li>"Applications désactivées"</li>\n" "<li>"Notifications associées aux applications désactivées"</li>\n" "<li>"Applications par défaut pour les actions"</li>\n" "<li>"Restrictions de données en arrière-plan pour les applications"</li>\n" "<li>"Toutes les restrictions d\'autorisations"</li>\n\n" Vous ne perdez aucune donnée liée aux applications."</string>
@@ -1443,8 +1479,6 @@
     <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="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="select_logd_size_title" msgid="7433137108348553508">"Tailles des mémoires tampons Logger"</string>
@@ -1745,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 heures"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 jour"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Afficher les processus système"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Masquer les processus système"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Utiliser l\'USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Type de statistiques"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Arrière-plan"</string>
@@ -1841,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Mot de passe actuel :"</string>
@@ -2216,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Utilisateur"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil limité"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Ajouter un utilisateur ?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Vous pouvez partager cet appareil avec d\'autres personnes en ajoutant des utilisateurs. Chaque utilisateur dispose de son propre espace, où il peut personnaliser, entre autres, ses applications et son fond d\'écran. Chacun peut également modifier les paramètres de l\'appareil, tels que le Wi-Fi, qui affectent tous les utilisateurs.\n\nLorsque vous ajoutez un utilisateur, celui-ci doit configurer son espace.\n\nN\'importe quel utilisateur peut mettre à jour les applications pour tous les autres utilisateurs."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Vous pouvez partager cet appareil avec d\'autres personnes en ajoutant des utilisateurs. Chaque utilisateur dispose de son propre espace, où il peut personnaliser, entre autres, ses applications et son fond d\'écran. Chacun peut également modifier les paramètres de l\'appareil, tels que le Wi-Fi, qui affectent tous les utilisateurs.\n\nLorsque vous ajoutez un utilisateur, celui-ci doit configurer son espace.\n\nN\'importe quel utilisateur peut mettre à jour les applications pour tous les autres utilisateurs."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Lorsque vous ajoutez un utilisateur, celui-ci doit configurer son espace.\n\nN\'importe quel utilisateur peut mettre à jour les applications pour tous les autres utilisateurs."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurer l\'utilisateur ?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Assurez-vous que la personne est disponible, et qu\'elle peut utiliser l\'appareil pour configurer son espace."</string>
@@ -2396,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"limitation limiter limité"</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_reset_apps" msgid="6420313678620788457">"réinitialiser préférences valeur par défaut"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"application par défaut en cas d\'urgence"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"applis télécharger applications système"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"sécurité des autorisations des applications"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"applications par défaut"</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>
@@ -2414,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume de l\'alarme"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume de la sonnerie"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume des notifications"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Bloquer les interruptions"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritaires uniquement"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Règles automatiques"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"À la réception d\'appels et 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_alarms" msgid="7380265858042606857">"Autoriser uniquement les alarmes"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ne pas interrompre"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Interruptions prioritaires uniquement"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarmes uniquement"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Aucune interruption"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g> : <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Sonnerie du téléphone"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Sonnerie de notification par défaut"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibreur aussi pour les appels"</string>
@@ -2454,15 +2486,6 @@
     <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 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" formatted="false" msgid="1398308139164964218">
-      <item quantity="one">%d application fournit des conditions.</item>
-      <item quantity="other">%d applications fournissent des conditions.</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Aucun fournisseur de conditions n\'est installé."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Activer <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> pourra ajouter des conditions de sortie au mode Ne pas déranger."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Chargement des applications en cours…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Tout bloquer"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ne jamais afficher les notifications de cette application"</string>
@@ -2476,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritaire"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensible"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Nom de la règle"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Ajouter une règle"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Supprimer la règle"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Supprimer la règle \"<xliff:g id="RULE">%1$s</xliff:g>\" ?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Supprimer"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Type de règle"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Inconnu"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configurer une règle"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Règle de planification"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Règle introuvable."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Jours"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Aucun"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Tous les jours"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Jamais"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"Du <xliff:g id="START">%1$s</xliff:g> au <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2496,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Rappels"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Événements"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Appelants sélectionnés"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Appelants fréquents"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Si la même personne appelle deux fois en <xliff:g id="MINUTES">%d</xliff:g> minute(s), autoriser le deuxième appel"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activation auto"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Jamais"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Tous les soirs"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> le lendemain"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Quand souhaitez-vous être interrompu ?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Pour combien de temps ?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Indéfiniment"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutes</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> heure</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> heures</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Ne recevoir que les notifications prioritaires indéfiniment"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Ne recevoir que les notifications prioritaires pendant <xliff:g id="DURATION">%1$d</xliff:g> minute jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Ne recevoir que les notifications prioritaires pendant <xliff:g id="DURATION">%1$d</xliff:g> minutes jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Ne recevoir que les notifications prioritaires pendant <xliff:g id="DURATION">%1$d</xliff:g> heure jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Ne recevoir que les notifications prioritaires pendant <xliff:g id="DURATION">%1$d</xliff:g> heures jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Ne recevoir que les alarmes sans limite de temps"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">Ne recevoir que les alarmes pendant <xliff:g id="DURATION">%1$d</xliff:g> minute jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Ne recevoir que les alarmes pendant <xliff:g id="DURATION">%1$d</xliff:g> minutes jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="one">Ne recevoir que les alarmes pendant <xliff:g id="DURATION">%1$d</xliff:g> heure jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Ne recevoir que les alarmes pendant <xliff:g id="DURATION">%1$d</xliff:g> heures jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Ne pas interrompre indéfiniment"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Ne pas interrompre pendant <xliff:g id="DURATION">%1$d</xliff:g> minute jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Ne pas interrompre pendant <xliff:g id="DURATION">%1$d</xliff:g> minutes jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Ne pas interrompre pendant <xliff:g id="DURATION">%1$d</xliff:g> heure jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Ne pas interrompre pendant <xliff:g id="DURATION">%1$d</xliff:g> heures jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Toujours interrompre"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"toujours"</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>
@@ -2569,7 +2659,10 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> autorisation accordée</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorisations accordées</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> autorisation accordée sur <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> autorisations accordées sur <xliff:g id="COUNT_3">%d</xliff:g></item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Certains paramètres par défaut définis"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Aucun paramètre par défaut défini"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Toutes les applications"</string>
@@ -2580,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritaires"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensibles"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Avec des URL de domaine"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Rétablir les valeurs par défaut pour les préférences dans toutes les applications"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> applications installées, y compris des applications système et des applications téléchargées"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Désactivé par l\'administrateur"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Paramètres avancés"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Application inconnue"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Sélectionner un profil"</string>
@@ -2596,4 +2688,11 @@
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> application peut ouvrir les URL de son domaine.</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> applications peuvent ouvrir les URL de leur domaine.</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Non reconnu"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Applications par défaut"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Application de navigateur"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Aucun navigateur par défaut"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Par défaut)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-gl-rES/arrays.xml b/res/values-gl-rES/arrays.xml
index 45cc876..5c3fbe6 100644
--- a/res/values-gl-rES/arrays.xml
+++ b/res/values-gl-rES/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Pulsar o botón"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"baixa"</item>
     <item msgid="4212263919458209842">"crítica"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Desactivado"</item>
-    <item msgid="5656544177755411222">"Interrupcións limitadas"</item>
-    <item msgid="8735337502532332056">"Ningunha interrupción"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Moderado"</item>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index c2dda3a..53cb9be 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Tarxeta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Configuración do proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancelar"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"CANCELAR"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUAR"</string>
     <string name="okay" msgid="1997666393121016642">"Aceptar"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"SI"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NON"</string>
-    <string name="forget" msgid="7267115980248732932">"BORRAR"</string>
+    <string name="forget" msgid="1400428660472591263">"Borrar"</string>
+    <string name="save" msgid="879993180139353333">"Gardar"</string>
+    <string name="done" msgid="6942539184162713160">"Feito"</string>
     <string name="settings_label" msgid="1626402585530130914">"Configuración"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Configuración"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Atallo de configuración"</string>
@@ -338,28 +336,28 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Define A miña localización, o desbloqueo da pantalla, o bloqueo da tarxeta SIM e o bloqueo do almacenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Define A miña localización, o desbloqueo da pantalla e o bloqueo do almacenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contrasinais"</string>
-    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Identificación dixital"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Impresión dixital"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Xest. identificación"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Usar identificac. para"</string>
     <string name="fingerprint_add_title" msgid="3453670509485083962">"Engadir"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"bloqueo da pantalla"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> identificacións dixitais inscritas</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> identificación dixital inscrita</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> impresións dixitais inscritas</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> impresión dixital inscrita</item>
     </plurals>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Config. identificación"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Para usar a túa impresión dixital para desbloquear a pantalla ou confirmar compras, teremos que: \n\n✓ Configurar o método de bloqueo da pantalla alternativa \n\n✓ Engadir a túa impresión dixital"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Buscar o sensor"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localiza o sensor de identificacións dixitais na parte posterior do teléfono."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localiza o sensor de impresións dixitais na parte posterior do teléfono."</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nome"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Aceptar"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Eliminar"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Comecemos"</string>
-    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Coloca o dedo no sensor de identificación dixital. Levántao despois de sentir unha vibración."</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Coloca o dedo no sensor de impresión dixital. Levántao despois de sentir unha vibración."</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Ben! Agora repite."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Coloca o mesmo dedo no sensor de identificación dixital e levántao despois de sentir unha vibración."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Coloca o mesmo dedo no sensor de impresión dixital e levántao despois de sentir unha vibración."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Identificac. engadida"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Cando vexas esta icona, podes usar a túa identificación dixital para a identificación ou para autorizar unha compra."</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Cando vexas esta icona, podes usar a túa impresión dixital para a identificación ou para autorizar unha compra."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Engadir"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Seguinte"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptación"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Conecta o cargador e téntao de novo."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Non hai ningún PIN nin contrasinal de pantalla de bloqueo"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Precisas definir un PIN ou un contrasinal para a pantalla de bloqueo para poder iniciar o encriptado."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Debes debuxar o padrón de desbloqueo para confirmar o cifrado do dispositivo."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Encriptar?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"A operación de encriptado é irreversible e, se a interrompes, perderás os datos. O encriptado tarda como mínimo unha hora en completarse e o tablet reiniciarase varias veces."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"A operación de encriptado é irreversible e, se a interrompes, perderás os datos. O encriptado tarda como mínimo unha hora en completarse e o teléfono reiniciarase varias veces."</string>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avanzada"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth avanzado"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Co Bluetooth activado, o dispositivo pode comunicarse con outros dispositivos Bluetooth próximos."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"Para mellorar a precisión da localización, os servizos de Google buscarán servizos de Bluetooth, mesmo se o Bluetooth está desactivado. Podes cambiar este axuste na LINK_BEGINconfiguración de buscaLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Para mellorar a precisión da localización, as aplicacións e os servizos buscarán dispositivos de Bluetooth, mesmo se o Bluetooth está desactivado. Podes cambiar este axuste na <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configuración de busca<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Conectar con..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> desconectarase do audio multimedia."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> desconectarase do audio do mans libres."</string>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"Para mellorar a precisión da localicación, os servizos de Google buscarán redes wifi, mesmo se a wifi está desactivada. Podes cambiar este axuste na LINK_BEGINconfiguración de buscaLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Para mellorar a precisión da localización, as aplicacións e os servizos buscarán redes wifi, mesmo se a wifi está desactivada. Podes cambiar este axuste na <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configuración de busca<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</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>
@@ -604,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Explorar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avanzada"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Mostrar aplicacións"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Intensidade wifi"</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>
@@ -663,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Queres iniciar sesión para conectarte?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> require inicio de sesión antes de conectar á rede"</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONECTAR"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Esta rede non ten acceso a Internet. Queres usar esta rede de todas formas?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Non volver preguntar por esta rede"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Erro ao conectar á rede"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Borrar"</string>
@@ -734,12 +731,10 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wifi preferida"</item>
     <item msgid="5267397515594230396">"Móbil preferido"</item>
-    <item msgid="3132912693346866895">"Só wifi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Cando están activadas as chamadas wifi, o teu teléfono pode enviar as túas chamadas a través de redes wifi ou da rede do teu operador, dependendo das túas preferencias e de cal teña o sinal máis forte. Antes de activar esta función, consulta co teu operador as tarifas e outra información."</string>
     <string name="home_settings" msgid="212375129455718176">"Inicio"</string>
@@ -913,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Dispoñible (só lectura)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espazo total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calculando..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplicacións (datos apps e contido multimedia)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Aplicacións e datos das aplicacións"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Multimedia"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Descargas"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Imaxes, vídeos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (música, tons de chamada, podcasts, etc.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Variado"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Outros ficheiros"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Datos da caché"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desactivar almacenamento"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desactivar tarxeta SD"</string>
@@ -951,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desactivación en curso"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Estase esgotando o espazo de almacenamento"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"É posible que algunhas funcións do sistema, como a sincronización, non funcionen correctamente. Tenta liberar espazo eliminando ou soltando elementos, como aplicacións ou contido multimedia."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Cambiar o nome"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Inserir"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Expulsar"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Borrar e formatar"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Borr. e form. como almac. int."</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Conexión USB do ordenador"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Conexión USB do ordenador"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Conectar como"</string>
@@ -961,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Permite que as aplicacións compatibles con MIDI utilicen software de MIDI no teu ordenador por USB."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Outros usuarios"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Almacenamento do dispositivo"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Almacenamento extraíble"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> libres (total: <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Inseriuse <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Non se puido inserir <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"Expulsouse <xliff:g id="NAME">%1$s</xliff:g> con seguridade"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Non se puido expulsar <xliff:g id="NAME">%1$s</xliff:g> con seguridade"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"Formatouse <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Non se puido formatar <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Cambiar o nome do almacenamento"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Despois de formatar, podes usar esta <xliff:g id="NAME_0">^1</xliff:g> noutros dispositivos. \n\nBorraranse todos os datos desta <xliff:g id="NAME_1">^1</xliff:g>. Primeiro considera a posibilidade de facer unha copia de seguranza. \n\n"<b>"Fai unha copia de seguranza das fotos e doutros contidos multimedia"</b>" \nMigra os teus ficheiros multimedia a un almacenamento alternativo neste dispositivo ou transfíreos a un ordenador cun cable USB. \n\n"<b>"Fai unha copia de seguranza das aplicacións"</b>" \nDesinstalaranse todas as aplicacións almacenadas nesta <xliff:g id="NAME_6">^1</xliff:g> e borraranse os seus datos. Para conservar estas aplicacións, mígraas a un almacenamento alternativo neste dispositivo."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Ao expulsar esta <xliff:g id="NAME_0">^1</xliff:g>, as aplicacións almacenadas nela deixarán de funcionar e os ficheiros multimedia almacenados non estarán dispoñibles ata que se volva inserir."</b>" \n\nEsta <xliff:g id="NAME_1">^1</xliff:g> formátase para funcionar só neste dispositivo. Non funcionará noutros."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configura a túa <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Usar como almacenamento portátil"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Para migrar fotos e outros contidos multimedia entre dispositivos."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Usar como almacenamento interno"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Para almacenar calquera cousa só neste dispositivo, incluídas as aplicacións e as fotos. É necesario formatar para evitar que funcione con outros dispositivos."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatar como almacenam. interno"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Esta acción esixe que se formate a <xliff:g id="NAME_0">^1</xliff:g> para que estea protexida. \n\nDespois de formatala, esta <xliff:g id="NAME_1">^1</xliff:g> só funcionará neste dispositivo. \n\n"<b>"Ao formatar borraranse todos os datos almacenados actualmente na <xliff:g id="NAME_2">^1</xliff:g>."</b>" Para evitar perder os datos, considera a posibilidade de facer unha copia de seguranza."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Borrar e formatar"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatando a <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Non retires a <xliff:g id="NAME">^1</xliff:g> mentres se estea formatando."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Migrar datos a almacenamento novo"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Podes migrar as túas fotos, os ficheiros e os datos das aplicacións a esta nova <xliff:g id="NAME">^1</xliff:g>. \n\nA migración tarda arredor de <xliff:g id="TIME">^2</xliff:g> e liberará <xliff:g id="SIZE">^3</xliff:g> de almacenamento interno. Algunhas aplicacións non funcionarán mentres estea en progreso."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Migrar agora"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Migrar máis tarde"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Migra os datos agora"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"A migración tarda arredor de <xliff:g id="TIME">^1</xliff:g>. Liberará <xliff:g id="SIZE">^2</xliff:g> de almacenamento interno."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Migrar"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Migrando datos…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Durante a migración: \n• Non retires a <xliff:g id="NAME">^1</xliff:g>. \n• Algunhas aplicacións non funcionarán correctamente. \n• Mantén o dispositivo cargado."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> está lista"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"A túa <xliff:g id="NAME">^1</xliff:g> está configurada para o seu uso con fotos e con outros contidos multimedia."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"A túa nova <xliff:g id="NAME">^1</xliff:g> funciona. \n\nPara migrar fotos, ficheiros e datos de aplicacións a este dispositivo, accede a Configuración &gt; Almacenamento."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Migrar <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Migrar <xliff:g id="APP">^1</xliff:g> e os seus datos á <xliff:g id="NAME_0">^2</xliff:g> só tardará un momento. Non poderás usar a aplicación ata que finalice a migración. \n\nNon retires a <xliff:g id="NAME_1">^2</xliff:g> durante a migración."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Migrando <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Non retires a <xliff:g id="NAME">^1</xliff:g> durante a migración. \n\nA aplicación <xliff:g id="APP">^2</xliff:g> deste dispositivo non estará dispoñible ata que finalice a migración."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancelar migración"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Estado da batería"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivel da batería"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1005,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Restablecer aos valores predeterminados"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Completouse o restablecemento da configuración de APN predeterminada."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Restablecemento da configuración da rede"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Esta acción restablecerá toda a configuración relacionada coas redes aos valores predeterminados de fábrica, incluído:\n\n"<li>"Wifi"</li>\n<li>"Datos móbiles"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Esta acción restablecerá toda a configuración da rede, incluído:\n\n"<li>"Wifi"</li>\n<li>"Datos móbiles"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Restablecer configuración"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Queres restablecer toda a configuración da rede? Esta acción non se pode desfacer."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Queres restablecer toda a configuración da rede? Esta acción non se pode desfacer."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Restablecer configuración"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Tes que debuxar o teu padrón de desbloqueo para confirmar un restablecemento da configuración da rede."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Restablecer?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Restablecemento da configuración da rede"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Restableceuse a configuración da rede"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Restablecer dispositivo"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Restablecemento dos datos de fábrica"</string>
     <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>
@@ -1027,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Borra todos os datos da tarxeta SD, como a música ou as fotos"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restablecer tablet"</string>
     <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_desc" msgid="1062841478823409667">"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_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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"O restablecemento de fábrica non está dispoñible para este usuario"</string>
@@ -1046,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configura o correo de voz, o desvío de chamadas, a chamada en espera e o identificador de chamada"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Ancoraxe de USB"</string>
@@ -1079,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Axuda"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Redes móbiles"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plan móbil"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Aplicación de SMS predeterminada"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplicación de SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Queres cambiar a aplicación de SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Queres utilizar <xliff:g id="NEW_APP">%1$s</xliff:g> en lugar de <xliff:g id="CURRENT_APP">%2$s</xliff:g> como a túa aplicación de SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Queres utilizar <xliff:g id="NEW_APP">%s</xliff:g> como a túa aplicación de SMS?"</string>
@@ -1110,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Usa o GPS para determinar a localización"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Analizando"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Analizando"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Busca por wifi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Mellora a localización permitindo que as aplicacións e os servizos busquen redes wifi, mesmo se a wifi está desactivada"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Busca por Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Mellora a localización permitindo que os servizos do sistema busquen dispositivos de Bluetooth, mesmo se o Bluetooth está desactivado"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Localización por wifi e rede móbil"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permite usar o servizo de localización para calcular a localización rápido. Recompilaranse datos anónimos e enviaranse a Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Localización determinada por wifi"</string>
@@ -1155,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Estableceuse o contrasinal"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Definiuse o PIN"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Definiuse o padrón"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Utiliza o padrón do dispositivo para continuar."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Introduce o PIN do dispositivo para continuar."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Introduce o contrasinal do dispositivo para continuar."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN incorrecto"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Contrasinal incorrecto"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Padrón incorrecto"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Seguranza do dispositivo"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Cambiar padrón de desbloqueo"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Cambiar PIN de desbloqueo"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirma o padrón gardado"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Téntao de novo:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Debuxa un padrón de desbloqueo"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Preme Menú para obter axuda."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Solta o dedo cando remates"</string>
@@ -1181,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Definir padrón de desbloqueo"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Cambiar deseño de desbloqueo"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Como debuxar un padrón de desbloqueo"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Demasiados intentos incorrectos"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Téntao de novo en <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Realizáronse demasiados intentos incorrectos. Téntao de novo en <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"A aplicación non está instalada no teléfono."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Xestionar aplicacións"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Xestiona e elimina as aplicacións instaladas"</string>
@@ -1233,7 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Ordenar por tamaño"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Mostrar servizos en curso"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Mostrar procesos na caché"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"Aplicación de emerxencia predeterminada"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Aplicación de emerxencia"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Restablecer as preferencias das aplicacións"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Restablecer as preferencias das aplicacións?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Con esta acción, restableceranse todas as preferencias de:\n\n "<li>"Aplicacións desactivadas"</li>\n" "<li>"Notificacións de aplicacións desactivadas"</li>\n" "<li>"Aplicacións predeterminadas para accións"</li>\n" "<li>"Restricións de datos en segundo plano para aplicacións"</li>\n" "<li>"Calquera restrición de permisos"</li>\n\n" Non perderás datos de ningunha aplicación."</string>
@@ -1437,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos os paquetes HCI Bluetooth nun ficheiro"</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="select_logd_size_title" msgid="7433137108348553508">"Tamaños de búfer de rexistrador"</string>
@@ -1739,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 horas"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 día"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Mostrar sistema"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Ocultar sistema"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Usar Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipo de estatísticas"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Segundo plano"</string>
@@ -1835,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Contrasinal actual:"</string>
@@ -2210,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Usuario"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil restrinxido"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Engadir un usuario novo?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Podes compartir este dispositivo con outras persoas a través da creación de usuarios adicionais. Cada usuario ten o seu propio espazo que pode personalizar coas súas propias aplicacións, fondos de pantalla, etc. Os usuarios tamén poden modificar as opcións de configuración do dispositivo, como a rede wifi, que afectan a todo o mundo.\n\nCando engadas un usuario novo, este deberá configurar o seu espazo.\n\nCalquera usuario pode actualizar as aplicacións para todos os demais usuarios."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Podes compartir este dispositivo con outras persoas a través da creación de usuarios adicionais. Cada usuario ten o seu propio espazo que pode personalizar coas súas propias aplicacións, fondos de pantalla, etc. Os usuarios tamén poden modificar as opcións de configuración do dispositivo, como a rede wifi, que afectan a todo o mundo.\n\nCando engadas un usuario novo, este deberá configurar o seu espazo.\n\nCalquera usuario pode actualizar as aplicacións para todos os demais usuarios."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Cando engadas un usuario novo, este deberá configurar o seu espazo.\n\nCalquera usuario pode actualizar as aplicacións para todos os demais usuarios."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurar o usuario agora?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Asegúrate de que a persoa está dispoñible para acceder ao dispositivo e configurar o seu espazo"</string>
@@ -2393,6 +2433,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"emerxencia en caso de emerxencia aplicación predeterminada"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"aplicacións descarga aplicacións sistema"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"seguranza dos permisos das aplicacións"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"aplicacións predeterminadas"</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>
@@ -2407,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume da alarma"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume do timbre"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume das notificacións"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Bloquear interrupcións"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Só permite prioridade"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Normas automáticas"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Cando se reciben chamadas e 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_alarms" msgid="7380265858042606857">"Permitir só alarmas"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Non interromper"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Só prioridade"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Só alarmas"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Sen interrupcións"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ton de chamada do teléfono"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Ton de chamada de notificación predeterminado"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrar tamén nas chamadas"</string>
@@ -2447,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Non hai ningún detector de notificacións instalado."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Activar <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> poderá ler todas as notificacións publicadas polo sistema ou calquera aplicación instalada, o cal pode incluír información persoal como nomes de contactos e o texto das mensaxes que che envían. Tamén poderá ignorar estas notificacións ou tocar os botóns de acción que conteña."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Provedores de condicións"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ningunha aplicación fornece condicións"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d aplicacións fornecen condicións</item>
-      <item quantity="one">%d aplicación fornece condicións</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Non hai ningún provedor de condicións instalado."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Queres activar <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> poderá engadir condicións de saída ao modo Non molestar."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicacións..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear todo"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Non mostrar nunca as notificacións desta aplicación"</string>
@@ -2469,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioridade"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Confidencial"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Nome da norma"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Engadir norma"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Eliminar norma"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Queres eliminar a norma \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Eliminar"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Tipo de norma"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Descoñecida"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configurar norma"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Programar norma"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Non se atopou a norma."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Días"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Ningún"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Cada día"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nunca"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"Do <xliff:g id="START">%1$s</xliff:g> ao <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"Do <xliff:g id="START">%1$s</xliff:g> ao <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2489,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmas"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Recordatorios"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Emisores da chamada seleccionados"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Repetir emisores da chamada"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Se a mesma persoa chama por segunda vez nun período de <xliff:g id="MINUTES">%d</xliff:g> minutos, permitir"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activar automaticam."</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nunca"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Todas as noites"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"Ás <xliff:g id="FORMATTED_TIME">%s</xliff:g> do día seguinte"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Cando queres que te interrompamos?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Durante canto tempo?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Indefinidamente"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutos</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuto</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> horas</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hora</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Cambia a notificacións con prioridade só indefinidamente"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Cambia a notificacións con prioridade tan só durante <xliff:g id="DURATION">%1$d</xliff:g> minutos ata as <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Cambia a notificacións con prioridade tan só durante un minuto ata as <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Cambia a notificacións con prioridade tan só durante <xliff:g id="DURATION">%1$d</xliff:g> horas (ata as <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambia a notificacións con prioridade tan só durante unha hora ata as <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Cambia a alarmas só indefinidamente"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Cambia a alarmas tan só durante <xliff:g id="DURATION">%1$d</xliff:g> minutos (ata as <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambia a alarmas tan só durante un minuto ata as <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Cambia a alarmas tan só durante <xliff:g id="DURATION">%1$d</xliff:g> horas ata as <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Cambia a alarmas tan só durante unha hora ata as <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Cambia a non interromper indefinidamente"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Cambia para non interromper durante <xliff:g id="DURATION">%1$d</xliff:g> minutos (ata as <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambia para non interromper durante un minuto ata as <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Cambia para non interromper durante <xliff:g id="DURATION">%1$d</xliff:g> horas ata as <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Cambia para non interromper durante unha hora ata as <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Cambia a interromper sempre"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"sempre"</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>
@@ -2562,7 +2659,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> permisos outorgados</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> permiso outorgado</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> de <xliff:g id="COUNT_3">%d</xliff:g> permisos outorgados</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> permiso outorgado</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Definíronse algúns valores predeterminados"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Non se definiu ningún valor predeterminado"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Todas as aplicacións"</string>
@@ -2573,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Con prioridade"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Confidenciais"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Con URL de dominio"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Restablecer valores predeterminados das preferencias en todas as aplicacións"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> aplicacións instaladas, incluídas as aplicacións descargadas e as do sistema"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Desactivado polo administrador"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avanzada"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicación descoñecida"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Seleccionar perfil"</string>
@@ -2589,4 +2688,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicacións poden abrir os seus URL de dominio</item>
       <item quantity="one">Unha aplicación pode abrir os seus URL de dominio</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Non se recoñece"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Aplicacións predeterminadas"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Aplicación do navegador"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Sen navegador predeterminado"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Predeterminada)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 858652e..676ef50 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"पुश बटन"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"मीडिया"</item>
     <item msgid="7924928667052300589">"डिवाइस"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"अस्पष्ट स्थान"</item>
+    <item msgid="5789673140227507995">"सटीक स्थान"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"कंपन"</item>
+    <item msgid="3434165993711230924">"संपर्क पढ़ें"</item>
+    <item msgid="616161687718081936">"संपर्कों को बदलें"</item>
+    <item msgid="7638002295329050091">"कॉल लॉग पढ़ें"</item>
+    <item msgid="6546959730920410907">"कॉल लॉग बदलें"</item>
+    <item msgid="446877710771379667">"कैलेंडर पढ़ें"</item>
+    <item msgid="7674458294386319722">"कैलेंडर बदलें"</item>
+    <item msgid="8281201165558093009">"वाई-फ़ाई स्कैन"</item>
+    <item msgid="8694611243479480497">"नोटिफिकेशन"</item>
+    <item msgid="7776439107987345446">"सेल स्कैन"</item>
+    <item msgid="514615766544675057">"फ़ोन पर कॉल करें"</item>
+    <item msgid="8181415497109310680">"SMS पढ़ें"</item>
+    <item msgid="6816551144382117307">"SMS लिखें"</item>
+    <item msgid="4600463921908905030">"SMS प्राप्त करें"</item>
+    <item msgid="5958926493289432745">"आपातकालीन SMS प्राप्त करें"</item>
+    <item msgid="4945269495221089540">"MMS प्राप्त करें"</item>
+    <item msgid="5570472453573929087">"WAP पुश प्राप्त करें"</item>
+    <item msgid="7125408150230860501">"SMS भेजें"</item>
+    <item msgid="7080337936612188061">"ICC SMS पढ़ें"</item>
+    <item msgid="587124103118495063">"ICC SMS लिखें"</item>
+    <item msgid="2320577158869025503">"सेटिंग बदलें"</item>
+    <item msgid="1545733463471924009">"ऊपर बनाएं"</item>
+    <item msgid="3609046903962454582">"नोटिफिकेशन को एक्सेस करें"</item>
+    <item msgid="4671646036128214513">"कैमरा"</item>
+    <item msgid="1097324338692486211">"ऑडियो रिकॉर्ड करें"</item>
+    <item msgid="5031552983987798163">"ऑडियो चलाएं"</item>
+    <item msgid="8374996688066472414">"क्लिपबोर्ड पढ़ें"</item>
+    <item msgid="3045529469061083747">"क्लिपबोर्ड बदलें"</item>
+    <item msgid="5124443975763747838">"मीडिया बटन"</item>
+    <item msgid="4547883971364273343">"ऑडियो फ़ोकस"</item>
+    <item msgid="2603878814882344450">"मास्टर आवाज़"</item>
+    <item msgid="7136963238377062018">"ध्वनि आवाज़"</item>
+    <item msgid="4270236897655923007">"रिंग आवाज़"</item>
+    <item msgid="6325739889222559394">"मीडिया वॉल्‍यूम"</item>
+    <item msgid="5762123934816216821">"अलार्म आवाज़"</item>
+    <item msgid="785049718065337473">"नोटिफिकेशन वॉल्‍यूम"</item>
+    <item msgid="6700305533746877052">"bluetooth आवाज़"</item>
+    <item msgid="2029227495214047094">"सचेत रखें"</item>
+    <item msgid="26109888160231211">"मॉनिटर का स्थान"</item>
+    <item msgid="5753382310468855812">"उच्च पावर वाले स्थान की निगरानी करें"</item>
+    <item msgid="3356591542543137332">"उपयोग के आंकड़े प्राप्त करें"</item>
+    <item msgid="3073734345226842233">"माइक्रोफ़ोन म्यूट/अनम्यूट करें"</item>
+    <item msgid="1148142988678569310">"प्रोजेक्ट मीडिया"</item>
+    <item msgid="9130014005474445273">"VPN सक्रिय करें"</item>
+    <item msgid="1165192162975045562">"वॉलपेपर पर लिखें"</item>
+    <item msgid="7129487923652967258">"सहायक संरचना"</item>
+    <item msgid="1069023208100114540">"सहायक स्क्रीनशॉट"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"स्थान"</item>
+    <item msgid="8677040780775113033">"स्थान"</item>
+    <item msgid="1660743989948992916">"स्थान"</item>
+    <item msgid="8791172739860195290">"कंपन"</item>
+    <item msgid="383413555642128046">"संपर्क पढ़ें"</item>
+    <item msgid="3654594895269697313">"संपर्कों को बदलें"</item>
+    <item msgid="7928393476362362538">"कॉल लॉग पढ़ें"</item>
+    <item msgid="6248591205254641116">"कॉल लॉग बदलें"</item>
+    <item msgid="6093344633066170692">"कैलेंडर पढ़ें"</item>
+    <item msgid="1334886368750347692">"कैलेंडर बदलें"</item>
+    <item msgid="1638204101698708656">"स्थान"</item>
+    <item msgid="2154671955760380322">"नोटिफिकेशन पोस्ट करें"</item>
+    <item msgid="4282477730595931828">"स्थान"</item>
+    <item msgid="4891423912898525905">"फ़ोन पर कॉल करें"</item>
+    <item msgid="2623604824935968113">"SMS/MMS पढ़ें"</item>
+    <item msgid="4420177125221176306">"SMS/MMS लिखें"</item>
+    <item msgid="3986142739951490025">"SMS/MMS प्राप्त करें"</item>
+    <item msgid="3984213795861739778">"SMS/MMS प्राप्त करें"</item>
+    <item msgid="3656243523752472788">"SMS/MMS प्राप्त करें"</item>
+    <item msgid="8105802370238551510">"SMS/MMS प्राप्त करें"</item>
+    <item msgid="1407766984645388488">"SMS/MMS भेजें"</item>
+    <item msgid="3527273606643794973">"SMS/MMS पढ़ें"</item>
+    <item msgid="4370895547001583812">"SMS/MMS लिखें"</item>
+    <item msgid="4218544235221631789">"सेटिंग बदलें"</item>
+    <item msgid="736541391767350377">"ऊपर बनाएं"</item>
+    <item msgid="5530815681721654194">"नोटिफिकेशन को एक्सेस करें"</item>
+    <item msgid="781213371706962767">"कैमरा"</item>
+    <item msgid="1720492593061838172">"ऑडियो रिकॉर्ड करें"</item>
+    <item msgid="3493046322001257041">"ऑडियो चलाएं"</item>
+    <item msgid="136815868796597058">"क्लिपबोर्ड पढ़ें"</item>
+    <item msgid="5238692940326972503">"क्लिपबोर्ड बदलें"</item>
+    <item msgid="5753789168376302997">"मीडिया बटन"</item>
+    <item msgid="3265262911688671938">"ऑडियो फ़ोकस"</item>
+    <item msgid="2098976479485046797">"मास्टर आवाज़"</item>
+    <item msgid="5660213838861789350">"ध्वनि आवाज़"</item>
+    <item msgid="7983336752371254444">"रिंग आवाज़"</item>
+    <item msgid="7878027809189330917">"मीडिया वॉल्‍यूम"</item>
+    <item msgid="7260546305036218513">"अलार्म आवाज़"</item>
+    <item msgid="9103719301075748925">"नोटिफिकेशन वॉल्‍यूम"</item>
+    <item msgid="7025966722295861512">"ब्लूटूथ वॉल्‍यूम"</item>
+    <item msgid="4665183401128289653">"सचेत रखें"</item>
+    <item msgid="8584357129746649222">"स्थान"</item>
+    <item msgid="7669257279311110599">"स्थान"</item>
+    <item msgid="3459320345690097795">"उपयोग के आंकड़े प्राप्त करें"</item>
+    <item msgid="1312534577834048535">"माइक्रोफ़ोन म्यूट/अनम्यूट करें"</item>
+    <item msgid="5906017727368097853">"प्रोजेक्ट मीडिया"</item>
+    <item msgid="2486614710846178542">"VPN सक्रिय करें"</item>
+    <item msgid="5586547561693629602">"वॉलपेपर पर लिखें"</item>
+    <item msgid="32794179825485062">"सहायक संरचना"</item>
+    <item msgid="7872852746938272552">"सहायक स्क्रीनशॉट"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"कम"</item>
     <item msgid="2560532955514699713">"मध्यम"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"कम"</item>
     <item msgid="4212263919458209842">"अत्यधिक"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"बंद"</item>
-    <item msgid="5656544177755411222">"कॉल और मैसेज को कभी कभी रोकें"</item>
-    <item msgid="8735337502532332056">"कॉल और मैसेज को कभी ना रोकें"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"सामान्य"</item>
     <item msgid="866544120205026771">"मध्यम"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 93d4afb..d4252a7 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD कार्ड"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"प्रॉक्सी सेटिंग"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"हां"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"नहीं"</string>
-    <string name="forget" msgid="7267115980248732932">"भूल जाएं"</string>
+    <string name="forget" msgid="1400428660472591263">"भूल जाएं"</string>
+    <string name="save" msgid="879993180139353333">"सहेजें"</string>
+    <string name="done" msgid="6942539184162713160">"हो गया"</string>
     <string name="settings_label" msgid="1626402585530130914">"सेटिंग"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"सेटिंग"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"सेटिंग शॉर्टकट"</string>
@@ -374,7 +372,6 @@
     <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_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>
@@ -419,8 +416,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"आकार"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"पिन"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"पासवर्ड"</string>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"स्‍क्रीन लॉक सेट करने के बाद, आप सेटिंग और सुरक्षा में अपनी अंगुली की छाप भी सेट कर सकते हैं."</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>
@@ -522,8 +518,7 @@
     <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>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"स्थान सटीकता को बेहतर बनाने के लिए, ऐप्‍स और सेवाएं ब्‍लूटूथ के बंद होने पर भी ब्‍लूटूथ डिवाइसों के लिए स्‍कैन करेंगी. आप इसे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्‍कैन करने की सेटिंग<xliff:g id="LINK_END_1">LINK_END</xliff:g> में बदल सकते हैं."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"इससे कनेक्‍ट करें…"</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>
@@ -589,8 +584,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"स्थान सटीकता को बेहतर बनाने के लिए, ऐप्‍स और सेवाएं वाई-फ़ाई के बंद होने पर भी वाई-फ़ाई डिवाइसों के लिए स्‍कैन करेंगी. आप इसे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्‍कैन करने की सेटिंग<xliff:g id="LINK_END_1">LINK_END</xliff:g> में बदल सकते हैं."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"फिर से न दिखाएं"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"प्रयोग में नहीं रहने के दौरान वाई-फ़ाई  चालू रखें"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"निष्क्रिय रहने पर वाई-फ़ाई चालू"</string>
@@ -607,8 +601,6 @@
     <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_apps" msgid="6003687912727859577">"ऐप्स दिखाएं"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"वाई-फाई शक्ति दिखाएं"</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>
@@ -666,6 +658,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"कनेक्ट करें"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"इस नेटवर्क में इंटरनेट ऐक्सेस नहीं है. क्या फिर भी इस नेटवर्क का उपयोग करें?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"इस नेटवर्क के लिए फिर से ना पूछें"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"जोड़ दें"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"नेटवर्क से कनेक्ट करने में विफल रहा"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"भूलें"</string>
@@ -737,12 +731,10 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"वाई-फ़ाई को प्राथमिकता"</item>
     <item msgid="5267397515594230396">"सेल्‍युलर को प्राथमिकता"</item>
-    <item msgid="3132912693346866895">"केवल वाई-फ़ाई"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"वाई-फ़ाई कॉलिंग चालू होने पर, आपका फ़ोन आपकी प्राथमिकता और अधिक सशक्त सिग्‍नल के आधार पर वाई-फ़ाई नेटवर्क या आपके वाहक के नेटवर्क के द्वारा कॉल को रूट कर सकता है. इस सुविधा को चालू करने से पहले, शुल्‍क और अन्‍य विवरणों के बारे में अपने वाहक से बात करें."</string>
     <string name="home_settings" msgid="212375129455718176">"होम"</string>
@@ -916,12 +908,12 @@
     <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="5128673488173839077">"ऐप्‍स और ऐप डेटा"</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_media_misc_usage" msgid="235452944021647124">"विविध"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"अन्‍य फ़ाइलें"</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>
@@ -954,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"अनमाउंट प्रगति में है"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"मेमोरी स्‍थान समाप्‍त हो रहा है"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"हो सकता है कुछ सिस्‍टम फ़ंक्‍शन, जैसे समन्‍वयन, ठीक से कार्य न करें. ऐप्स  या मीडिया सामग्री जैसे आइटम को हटाकर या अनपिन करके स्थान खाली करके देखें."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"नाम बदलें"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"माउंट करें"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"निकालें"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"मिटाएं और फ़ॉर्मेट करें"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"आंतरिक मेमोरी के रूप में मिटाएं व फ़ॉर्मेट करें"</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>
@@ -964,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"MIDI सक्षम ऐप्‍लिकेशन को आपके कंप्‍यूटर पर MIDI सॉफ़्टवेयर के साथ USB पर कार्य करने देती है."</string>
     <string name="storage_other_users" msgid="808708845102611856">"अन्य उपयोगकर्ता"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"डिवाइस मेमोरी"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"निकाले जाने योग्‍य मेमोरी"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> नि:शुल्‍क (कुल <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> माउंट किया गया है"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g> को माउंट नहीं किया जा सका"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> को सुरक्षित रूप से निकाला गया"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g> को सुरक्षित रूप से नहीं निकाला जा सका"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> को फ़ॉर्मेट किया गया है"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> को फ़ॉर्मेट नहीं किया जा सका"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"मेमोरी का नाम बदलें"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"फ़ॉर्मेट करने के बाद, आप इस <xliff:g id="NAME_0">^1</xliff:g> का उपयोग अन्य डिवाइस में कर सकते हैं. \n\nइस <xliff:g id="NAME_1">^1</xliff:g> में मौजूद संपूर्ण डेटा मिटा दिया जाएगा. सबसे पहले बैकअप लेने पर विचार करें. \n\n"<b>"फ़ोटो और अन्य मीडिया का बैकअप लें"</b>" \nअपनी मीडिया फ़ाइलों को इस डिवाइस की वैकल्पिक मेमोरी में ले जाएं या USB केबल का उपयोग करके उन्हें किसी कंप्यूटर में ट्रांसफर करें. \n\n"<b>"ऐप्स का बैकअप लें"</b>" \nइस <xliff:g id="NAME_6">^1</xliff:g> में संग्रहीत सभी ऐप्स को अनइंस्टॉल कर दिया जाएगा और उनका डेटा मिटा दिया जाएगा. इन ऐप्स को बनाए रखने के लिए, उन्हें इस डिवाइस की वैकल्पिक मेमोरी में ले जाएं."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"आपके द्वारा इस <xliff:g id="NAME_0">^1</xliff:g> को निकाल दिए जाने पर इसमें संग्रहीत ऐप्स काम करना बंद कर देंगे और इसमें संग्रहीत मीडिया फ़ाइलें तब तक उपलब्ध नहीं होंगी जब तक कि इसे फिर से नहीं डाल दिया जाता."</b>" \n\nइस <xliff:g id="NAME_1">^1</xliff:g> को केवल इसी डिवाइस में काम करने के लिए फ़ॉर्मेट किया गया है. यह किसी अन्य डिवाइस में कार्य नहीं करेगा."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"अपना <xliff:g id="NAME">^1</xliff:g> सेट करें"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"पोर्टेबल मेमोरी के रूप में उपयोग करें"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"फ़ोटो और अन्य मीडिया को डिवाइसों के बीच ले जाने के लिए."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"आंतरिक मेमोरी के रूप में उपयोग करें"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"ऐप्स और फ़ोटो सहित किसी भी चीज़ को केवल इसी डिवाइस में संग्रहीत करने के लिए. ऐसी फ़ॉर्मेटिंग आवश्यक है जो उसे अन्य डिवाइस के साथ काम करने से रोकती है."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"आंतरिक मेमोरी जैसे फ़ॉर्मेट करें"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"इसके लिए <xliff:g id="NAME_0">^1</xliff:g> को सुरक्षित करने हेतु उसे फ़ॉर्मेट करना आवश्यक है. \n\nफ़ॉर्मेट करने के बाद, यह <xliff:g id="NAME_1">^1</xliff:g> केवल इसी डिवाइस में काम करेगा. \n\n"<b>"फ़ॉर्मेट करने से <xliff:g id="NAME_2">^1</xliff:g> में वर्तमान में संग्रहीत संपू्र्ण डेटा मिट जाता है."</b>" डेटा खो जाने से बचाने के लिए, उसका बैकअप लेने पर विचार करें."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"मिटाएं और फ़ॉर्मेट करें"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> को फ़ॉर्मेट किया जा रहा है…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"<xliff:g id="NAME">^1</xliff:g> को फ़ॉर्मेट करते समय ना निकालें."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"डेटा को नई मेमोरी में ले जाएं"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"आप अपनी फ़ोटो, फ़ाइलों और ऐप डेटा को इस नए <xliff:g id="NAME">^1</xliff:g> में ले जा सकते हैं. \n\nले जाने में लगभग <xliff:g id="TIME">^2</xliff:g> का समय लगता है और इससे आंतरिक मेमोरी में <xliff:g id="SIZE">^3</xliff:g> स्थान खाली हो जाएगा. इस प्रक्रिया के दौरान कुछ ऐप्स काम नहीं करेंगे."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"अभी ले जाएं"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"बाद में ले जाएं"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"अभी डेटा ले जाएं"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"ले जाने में लगभग <xliff:g id="TIME">^1</xliff:g> का समय लगता है. इससे आंतरिक मेमोरी में <xliff:g id="SIZE">^2</xliff:g> स्थान रिक्त हो जाएगा."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"ले जाएं"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"डेटा ले जाया जा रहा है…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"ले जाने के दौरान: \n• <xliff:g id="NAME">^1</xliff:g> को ना निकालें. \n• कुछ ऐप्स सही ढंग से काम नहीं करेंगे. \n• डिवाइस को चार्ज करके रखें."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> तैयार है"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"आपका <xliff:g id="NAME">^1</xliff:g>, फ़ोटो और अन्य मीडिया के उपयोग के लिए पूरी तरह तैयार है."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"आपका नया <xliff:g id="NAME">^1</xliff:g> काम कर रहा है. \n\nफ़ोटो, फ़ाइलों और ऐप डेटा को इस डिवाइस में ले जाने के लिए, सेटिंग &gt; मेमोरी पर जाएं."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> को ले जाएं"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<xliff:g id="APP">^1</xliff:g> और उसके डेटा को <xliff:g id="NAME_0">^2</xliff:g> में ले जाने में कुछ ही समय लगेगा. ले जाने का काम पूर्ण होने तक आप ऐप का उपयोग नहीं कर पाएंगे. \n\nले जाने के दौरान <xliff:g id="NAME_1">^2</xliff:g> को ना निकालें."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> को ले जाया जा रहा है…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"ले जाने के दौरान <xliff:g id="NAME">^1</xliff:g> को ना निकालें. \n\nइस डिवाइस में मौजूद <xliff:g id="APP">^2</xliff:g> ले जाने का काम पूर्ण होने तक ऐप उपलब्ध नहीं रहेगा."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ले जाना रोकें"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"बैटरी स्‍थिति"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"बैटरी स्‍तर"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1008,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"डिफ़ॉल्ट पर रीसेट करें"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"डिफ़ॉल्‍ट APN सेटिंग रीसेट करना पूर्ण हुआ."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"नेटवर्क सेटिंग रीसेट कर दी गई"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"यह नेटवर्किंग से संंबंधित सभी सेटिंग को फैक्टरी डिफ़ॉल्ट में रीसेट कर देगा, इसमें निम्न शामिल हैं:\n\n"<li>"वाई-फ़ाई"</li>\n<li>"मोबाइल डेटा"</li>\n<li>"ब्लूटूथ"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"इससे सभी नेटवर्क सेटिंग रीसेट हो जाएंगी, जिनमें ये सेटिंग शामिल हैं:\n\n"<li>"वाई-फ़ाई"</li>\n<li>"सेल्‍युलर डेटा"</li>\n<li>"ब्‍लूटूथ"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"सेटिंग रीसेट करें"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"सभी नेटवर्क सेटिंग को रीसेट करना है? आप इस कार्रवाई को वापस पहले जैसा नहीं कर सकते!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"सभी नेटवर्क सेटिंग रीसेट करें? आप इस कार्रवाई को वापस नहीं ला सकते!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"सेटिंग रीसेट करें"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"आपको नेटवर्क सेटिंग रीसेट की पुष्टि करने के लिए अपने अनलॉक पैटर्न का आरेख बनाना होगा."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"रीसेट करें?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"नेटवर्क सेटिंग रीसेट कर दी गई"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"नेटवर्क सेटिंग रीसेट कर दी गई हैं"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"डिवाइस रीसेट करें"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"फ़ैक्टरी डेटा रीसेट"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"इससे आपके टेबलेट के "<b>"मोबाइल मेमोरी"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और ऐप्स डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए ऐप्स"</li></string>
@@ -1030,9 +1065,8 @@
     <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="1062841478823409667">"आपकी सभी व्यक्तिगत जानकारी और डाउनलोड किए गए ऐप्स मिटाएं? आप इस कार्रवाई को वापस नहीं ला सकते!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"सब कुछ मिटाएं"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"इस उपयोगकर्ता के लिए फ़ैक्टरी रीसेट उपलब्ध नहीं है"</string>
@@ -1049,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"वॉयस मेल, कॉल अग्रेषण, कॉल प्रतीक्षा, कॉलर आईडी सेट करें"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB टेदरिंग"</string>
@@ -1082,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"सहायता"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"सेल्युलर नेटवर्क"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"मोबाइल प्लान"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"डिफ़ॉल्ट SMS ऐप्लिकेशन"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS ऐप"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS ऐप्लिकेशन बदलें?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"क्या आप <xliff:g id="CURRENT_APP">%2$s</xliff:g> के बजाय SMS ऐप्स के रूप में <xliff:g id="NEW_APP">%1$s</xliff:g> का उपयोग करना चाहेंगे?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"आपके SMS ऐप्स के रूप में <xliff:g id="NEW_APP">%s</xliff:g> का उपयोग करें?"</string>
@@ -1113,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"स्‍थान निर्धारित करने के लिए GPS का उपयोग करें"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"स्‍कैन करना"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"स्‍कैन करना"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"वाई-फ़ाई स्‍कैन करना"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"वाई-फ़ाई के बंद होने पर भी ऐप्‍स और सेवाओं को वाई-फ़ाई नेटवर्क स्‍कैन करने की अनुमति देकर स्‍थान सटीकता को बेहतर बनाएं"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ब्‍लूटूथ स्‍कैन करना"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"सिस्‍टम सेवाओं को ब्‍लूटूथ के बंद होने पर भी ब्‍लूटूथ डिवाइस के लिए स्‍कैन करने की अनुमति देकर स्‍थान सटीकता को बेहतर बनाएं"</string>
     <string name="location_network_based" msgid="6010456018401296590">"वाई-फ़ाई और सेल्युलर नेटवर्क स्थान"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"आपके स्थान का तेज़ अनुमान लगाने के लिए, ऐप्स को Google की स्थानीय सेवा का उपयोग करने दें. अज्ञात स्थानीय डेटा एकत्रित करके Google को भेजा जाएगा."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"वाई-फ़ाई  द्वारा निर्धारित किया गया स्‍थान"</string>
@@ -1158,11 +1194,15 @@
     <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="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"जारी रखने के लिए अपने डिवाइस पैटर्न का उपयोग करें."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"जारी रखने के लिए अपना डिवाइस पिन डालें."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"जारी रखने के लिए अपना डिवाइस पासवर्ड डालें."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"गलत पिन"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"गलत पासवर्ड"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"गलत पैटर्न"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"डिवाइस सुरक्षा"</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>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"सहायता के लिए मेनू दबाएं."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"पूर्ण होने पर अंगुली हटा लें"</string>
@@ -1184,8 +1224,7 @@
     <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" msgid="6909161623701848863">"बहुत सारे गलत प्रयास. <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>
@@ -1236,7 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"आकार के अनुसार क्रमित करें"</string>
     <string name="show_running_services" msgid="5736278767975544570">"चल रही सेवाएं दिखाएं"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"कैश की गई प्रक्रियाएं दिखाएं"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"डिफ़ॉल्‍ट आपातकालीन ऐप"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"आपातकालीन ऐप"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"ऐप्स प्राथमिकताएं रीसेट करें"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"ऐप्स प्राथमिकताएं रीसेट करें?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"इससे निम्न की सभी प्राथमिकताएं रीसेट हो जाएंगी:\n\n "<li>"अक्षम ऐप्स "</li>\n" "<li>"अक्षम ऐप्स  नोटिफिकेशन"</li>\n" "<li>"कार्यवाहियों के लिए डिफ़ॉल्ट ऐप्स "</li>\n" "<li>"ऐप्स  के लिए पृष्ठभूमि डेटा प्रतिबंध"</li>\n" "<li>"अनुमति के कोई भी प्रतिबंध"</li>\n\n" आपका सभी ऐप्स  डेटा बना रहेगा."</string>
@@ -1440,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"फ़ाइल के सभी ब्लूटूथ HCI पैकेट कैप्‍चर करें"</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="select_logd_size_title" msgid="7433137108348553508">"लॉगर बफ़र आकार"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 घंटे"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 दिन"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"सिस्टम दिखाएं"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"सिस्टम छिपाएं"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss का उपयोग करें"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"आंकड़ों का प्रकार"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"पृष्ठभूमि"</string>
@@ -1838,7 +1876,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_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>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"उपयोगकर्ता"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"प्रतिबंधित प्रोफ़ाइल"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"नया उपयोगकर्ता जोड़ें?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"आप अतिरिक्त उपयोगकर्ता बनाकर इस डिवाइस को अन्य लोगों से साझा कर सकते हैं. प्रत्येक उपयोगकर्ता के पास अपना स्वयं का स्थान होता है, जिसे वह अपने स्वयं के ऐप्स, वॉलपेपर आदि से कस्टमाइज़ कर सकता है. उपयोगकर्ता वाई-फ़ाई जैसे डिवाइस की सेटिंग भी एडजस्ट कर सकते हैं जिनसे हर कोई प्रभावित होता है.\n\nजब आप कोई नया उपयोगकर्ता जोड़ते हैं, तो उस व्यक्ति को अपना स्थान सेट करना होता है.\n\nकोई भी उपयोगकर्ता अन्य सभी उपयोगकर्ताओं के लिए ऐप्स अपडेट कर सकता है."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"आप अतिरिक्त उपयोगकर्ता बनाकर इस डिवाइस को अन्य लोगों से साझा कर सकते हैं. प्रत्येक उपयोगकर्ता के पास अपना स्वयं का स्थान होता है, जिसे वह अपने स्वयं के ऐप्स, वॉलपेपर आदि से कस्टमाइज़ कर सकता है. उपयोगकर्ता वाई-फ़ाई जैसी डिवाइस सेटिंग भी एडजस्‍ट कर सकते हैं जिनसे हर कोई प्रभावित होता है.\n\nजब आप नया उपयोगकर्ता जोड़ते हैं, तो उस व्यक्ति को अपना स्थान सेट करना होता है.\n\nकोई भी उपयोगकर्ता अन्य सभी उपयोगकर्ताओं के लिए ऐप्स अपडेट कर सकता है."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"जब आप कोई नया उपयोगकर्ता जोड़ते हैं तो उस व्यक्ति को अपना स्थान सेट करना होता है.\n\nकोई भी उपयोगकर्ता अन्य सभी उपयोगकर्ताओं के लिए ऐप्स अपडेट कर सकता है."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"उपयोगकर्ता को अभी सेट करें?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"सुनिश्चित करें कि व्यक्ति डिवाइस लेने और अपना स्थान सेट करने के लिए उपलब्ध है"</string>
@@ -2396,6 +2433,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"आपातकालीन ice ऐप डिफ़ॉल्‍ट"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"ऐप्‍स डाउनलोड ऐप्‍लिकेशन सिस्‍टम"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"ऐप्स अनुमति सुरक्षा"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"ऐप्‍स डिफ़ॉल्‍ट"</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>
@@ -2410,14 +2448,12 @@
     <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="6948120138640252732">"बाधाओं को अवरुद्ध करें"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"प्राथमिकता इनकी अनुमति देती है"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"स्वचालित नियम"</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_alarms" msgid="7380265858042606857">"केवल अलार्म की अनुमति दें"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"अवरोध उत्पन्न न करें"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"केवल प्राथमिकता"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"केवल अलार्म"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"कोई बाधा नहीं"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"फ़ोन रिंगटोन"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"डिफ़ॉल्ट नोटिफिकेशन रिंगटोन"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"कॉल के लिए भी कंपन"</string>
@@ -2450,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"कोई नोटिफिकेशन श्रवणकर्ता इंस्टॉल नहीं है."</string>
     <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">"कोई भी ऐप्स स्थितियां प्रदान नहीं करता"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="one">%d ऐप्‍स शर्तें प्रदान करते हैं</item>
-      <item quantity="other">%d ऐप्‍स शर्तें प्रदान करते हैं</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="loading_notification_apps" msgid="5031818677010335895">"ऐप्स लोड हो रहे हैं..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"सभी रोक दें"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"इस ऐप्स से कभी भी नोटिफिकेशन न दिखाएं"</string>
@@ -2472,17 +2499,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"नियम का नाम"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"नियम जोड़ें"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"नियम हटाएं"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<xliff:g id="RULE">%1$s</xliff:g>\" नियम हटाएं?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"हटाएं"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"नियम का प्रकार"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"अज्ञात"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"नियम कॉन्‍फ़िगर करें"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"शेड्यूल नियम"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"नियम नहीं मिला."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"दिन"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"कोई नहीं"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"प्रत्येक दिन"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"कभी नहीं"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> से <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"कॉल"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"संदेश"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"इसकी ओर से कॉल/संदेश"</string>
@@ -2492,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"अलार्म"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"रिमाइंडर्स"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ईवेंट"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"चयनित कॉलर"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"कॉलर दोहराएं"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"यदि वही व्‍यक्‍ति <xliff:g id="MINUTES">%d</xliff:g> मिनट की अवधि के भीतर दूसरी बार कॉल करता है, तो उसे अनुमति दें"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> अगले दिन"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"आपको किस समय बाधित किया जाना उचित होगा?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"कितने समय तक?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"अनिश्चित काल तक"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> मिनट</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> मिनट</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> घंटे</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> घंटे</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"केवल अनिश्‍चित काल के लिए प्राथमिकता नोटिफिकेशन में बदलें"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> बजे तक केवल <xliff:g id="DURATION">%1$d</xliff:g> मिनट के लिए प्राथमिकता नोटिफिकेशन में बदलें</item>
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> बजे तक केवल <xliff:g id="DURATION">%1$d</xliff:g> मिनट के लिए प्राथमिकता नोटिफिकेशन में बदलें</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">केवल <xliff:g id="DURATION">%1$d</xliff:g> घंटे के लिए प्राथमिकता नोटिफिकेशन में बदलें (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> बजे तक)</item>
+      <item quantity="other">केवल <xliff:g id="DURATION">%1$d</xliff:g> घंटे के लिए प्राथमिकता नोटिफिकेशन में बदलें (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> बजे तक)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"अनिश्‍चित काल के लिए केवल अलार्म को बदलें"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">केवल <xliff:g id="DURATION">%1$d</xliff:g> मिनट के लिए अलार्म को बदलें (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> बजे तक)</item>
+      <item quantity="other">केवल <xliff:g id="DURATION">%1$d</xliff:g> मिनट के लिए अलार्म को बदलें (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> बजे तक)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> बजे तक केवल <xliff:g id="DURATION">%1$d</xliff:g> घंटे के लिए अलार्म को बदलें</item>
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> बजे तक केवल <xliff:g id="DURATION">%1$d</xliff:g> घंटे के लिए अलार्म को बदलें</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"अनिश्‍चित काल के लिए बाधित ना करें में बदलें"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one"><xliff:g id="DURATION">%1$d</xliff:g> मिनट के लिए बाधित ना करें में बदलें (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> बजे तक)</item>
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> मिनट के लिए बाधित ना करें में बदलें (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> बजे तक)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> बजे तक <xliff:g id="DURATION">%1$d</xliff:g> घंटे के लिए बाधित ना करें में बदलें</item>
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> बजे तक <xliff:g id="DURATION">%1$d</xliff:g> घंटे के लिए बाधित ना करें में बदलें</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"हमेशा बाधित करें में बदलें"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"हमेशा के लिए"</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>
@@ -2565,7 +2659,10 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> अनुमतियां दी गईं</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> अनुमतियां दी गईं</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_3">%d</xliff:g> में से <xliff:g id="COUNT_2">%d</xliff:g> अनुमतियां दी गईं</item>
+      <item quantity="other"><xliff:g id="COUNT_3">%d</xliff:g> में से <xliff:g id="COUNT_2">%d</xliff:g> अनुमतियां दी गईं</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"कुछ डिफ़ॉल्‍ट सेट हैं"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"कोई डिफ़ॉल्‍ट सेट नहीं है"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"सभी ऐप्स"</string>
@@ -2576,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"प्राथमिकता"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"संवेदनशील"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"डोमेन URL के साथ"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"सभी ऐप्‍स में प्राथमिकताओं को डिफ़ॉल्‍ट पर रीसेट करें"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"सिस्‍टम और डाउनलोड किए गए ऐप्‍स सहित, <xliff:g id="COUNT">%d</xliff:g> ऐप्‍स इंस्‍टॉल किए गए हैं"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"नियंत्रक के द्वारा अक्षम किया गया"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"अतिरिक्‍त सेटिंग"</string>
     <string name="unknown_app" msgid="5275921288718717656">"अज्ञात ऐप"</string>
     <string name="choose_profile" msgid="8229363046053568878">"प्रोफ़ाइल चुनें"</string>
@@ -2592,4 +2688,11 @@
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ऐप्स अपने डोमेन URL खोल सकते हैं</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ऐप्स अपने डोमेन URL खोल सकते हैं</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"पहचाना नहीं गया"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"डिफ़ॉल्‍ट ऐप्‍स"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"ब्राउज़र ऐप"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"कोई डिफ़ॉल्ट ब्राउज़र नहीं"</string>
+    <string name="default_app" msgid="6864503001385843060">"(डिफ़ॉल्‍ट)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 4cc1fb7..a447b99 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Gumb"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"nisko"</item>
     <item msgid="4212263919458209842">"kritično"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Isključeno"</item>
-    <item msgid="5656544177755411222">"Ograničeni prekidi"</item>
-    <item msgid="8735337502532332056">"Bez prekida"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Uobičajena"</item>
     <item msgid="866544120205026771">"Umjerena"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index e3326a9..f49d4c6 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -269,12 +269,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD kartica"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy postavke"</string>
     <string name="cancel" msgid="6859253417269739139">"Odustani"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ODUSTANI"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"NASTAVI"</string>
     <string name="okay" msgid="1997666393121016642">"U redu"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"DA"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NE"</string>
-    <string name="forget" msgid="7267115980248732932">"ZABORAVI"</string>
+    <string name="forget" msgid="1400428660472591263">"Zaboravi"</string>
+    <string name="save" msgid="879993180139353333">"Spremi"</string>
+    <string name="done" msgid="6942539184162713160">"Gotovo"</string>
     <string name="settings_label" msgid="1626402585530130914">"Postavke"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Postavke"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Prečac postavki"</string>
@@ -376,7 +374,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Uključite punjač i pokušajte ponovo."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nema PIN-a ili zaporke za zaključani zaslon"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Prije nego što ćete moći započeti enkripciju morat ćete postaviti PIN za zaključavanje zaslona ili zaporku."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Morate nacrtati uzorak za otključavanje da biste potvrdili kriptiranje uređaja."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Kriptirati?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Operacija kriptiranja nepovratna je i izgubit ćete podatke ako je prekinete. Kriptiranje traje sat vremena ili dulje, a za to vrijeme tabletno računalo nekoliko će se puta ponovo pokrenuti."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Operacija kriptiranja nepovratna je i izgubit ćete podatke ako ju prekinete. Kriptiranje traje sat vremena ili dulje, a za to vrijeme telefon će se nekoliko puta ponovo pokrenuti."</string>
@@ -529,7 +526,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Napredno"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Napredni Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Kada je Bluetooth uključen, uređaj može komunicirati s ostalim Bluetooth uređajima u blizini."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"Radi poboljšanja preciznosti lokacije Googleove usluge tražit će Bluetooth uređaje, čak i kada je Bluetooth isključen. To možete promijeniti u LINK_BEGINpostavkama traženjaLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Radi poboljšanja preciznosti lokacije, aplikacije i usluge tražit će Bluetooth uređaje, čak i kada je Bluetooth isključen. To možete promijeniti u <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>postavkama traženja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Poveži se na..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bit će isključen sa zvuka medija."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Handsfree zvuk za uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bit će isključen."</string>
@@ -595,7 +592,7 @@
     <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" msgid="8382526568324164356">"Radi poboljšanja preciznosti lokacije Googleove usluge tražit će Wi‑Fi mreže, čak i kada je Wi‑Fi isključen. To možete promijeniti u LINK_BEGINpostavkama traženjaLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Radi poboljšanja preciznosti lokacije, aplikacije i usluge tražit će Wi‑Fi mreže, čak i kada je Wi‑Fi isključen. To možete promijeniti u <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>postavkama traženja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ne prikazuj ponovno"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Zadrži Wi-Fi tijekom mirovanja"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi ostaje aktivan u mirovanju"</string>
@@ -612,8 +609,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Izravni Wi-Fi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skeniraj"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Napredno"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Pokaži aplikacije"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Pokaži snagu Wi-Fija"</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>
@@ -671,6 +666,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Želite li se prijaviti radi povezivanja?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> zahtijeva prijavu na webu za povezivanje s mrežom."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"POVEŽI"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Ta mreža nema pristup internetu. Želite li je svejedno upotrebljavati?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Više ne pitaj za tu mrežu"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Poveži"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Povezivanje s mrežom nije uspjelo"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Zaboravi"</string>
@@ -737,21 +734,17 @@
     <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> prijenosna Wi-Fi žarišna točka"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi pozivi"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Postavka poziva"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Način Wi-Fi poziva"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Prednost ima Wi-Fi mreža"</item>
     <item msgid="5267397515594230396">"Prednost ima mobilna mreža"</item>
-    <item msgid="3132912693346866895">"Samo Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Kada su Wi-Fi pozivi uključeni, telefon može usmjeravati pozive putem Wi-Fi mreža ili mreže vašeg mobilnog operatera, ovisno o vašoj želji i o tome koji je signal jači. Prije nego što uključite tu značajku, raspitajte se o naknadi i ostalim pojedinostima kod mobilnog operatera."</string>
     <string name="home_settings" msgid="212375129455718176">"Početna"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Prikaz"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
@@ -924,12 +917,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Dostupno (samo za čitanje)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Ukupno prostora"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Izračun u tijeku..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplikacije (podaci aplikacije i medijski sadržaj)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Aplikacije i podaci aplikacija"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Mediji"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Preuzimanja"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Slike, videozapisi"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (glazba, melodije zvona, podkastovi itd.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Razno"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Ostale datoteke"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Podaci iz predmemorije"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Isklj. dijeljenu pohranu"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Isključi SD karticu"</string>
@@ -962,6 +955,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Isključivanje u tijeku"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Ponestaje prostora za pohranu"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Neke funkcije sustava, kao što je sinkroniziranje, može neće ispravno funkcionirati. Pokušajte osloboditi prostor brisanjem stavki ili ih otkvačite, primjerice aplikacije ili medijski sadržaj."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Preimenuj"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Učitaj"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Izbaci"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Izbriši i formatiraj"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Izbriši/formatiraj kao internu"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Povezivanje USB-a i računala"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Povezivanje USB-a i računala"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Poveži kao"</string>
@@ -972,6 +970,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Omogućuje aplikacijama omogućenima za MIDI rad putem USB-a uz MIDI softver na računalu."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Drugi korisnici"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Pohrana na uređaju"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Prijenosna pohrana"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> slobodno (ukupno <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Učitano: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Učitavanje nije uspjelo: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"Sigurno izbacivanje uspjelo: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Sigurno izbacivanje nije uspjelo: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"Formatirano: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Formatiranje nije uspjelo: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Promjena naziva pohrane"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Nakon formatiranja možete upotrebljavati uređaj <xliff:g id="NAME_0">^1</xliff:g> na drugim uređajima. \n\nSvi podaci na uređaju <xliff:g id="NAME_1">^1</xliff:g> izbrisat će se. Preporučujemo vam da prvo napravite sigurnosnu kopiju. \n\n"<b>"Izrada sigurnosne kopije fotografija i ostalih medija"</b>" \nPremjestite medijske datoteke u neku drugu pohranu na ovom uređaju ili na računalo pomoću USB kabela. \n\n"<b>"Izrada sigurnosne kopije aplikacija"</b>" \nSve aplikacije pohranjene na uređaju <xliff:g id="NAME_6">^1</xliff:g> deinstalirat će se i njihovi će se podaci izbrisati. Da biste zadržali aplikacije, premjestite ih u neku drugu pohranu na ovom uređaju."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Kada izbacite uređaj <xliff:g id="NAME_0">^1</xliff:g>, aplikacije koje su pohranjene na njemu prestat će funkcionirati, a medijske datoteke pohranjene na njemu neće biti dostupne dok ga ponovo ne umetnete."</b>" \n\nUređaj <xliff:g id="NAME_1">^1</xliff:g> formatiran je tako da funkcionira samo na ovom uređaju. Neće funkcionirati na drugim uređajima."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Postavite uređaj <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Upotrebljavaj kao prijenosnu pohranu"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Za premještanje fotografija i ostalih medijskih datoteka s jednog uređaja na drugi."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Upotrebljavaj kao internu pohranu"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Za spremanje svega, uključujući aplikacije i fotografije, samo na ovom uređaju. Zahtijeva formatiranje koje sprječava rad ovog uređaja na drugim uređajima."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatiraj kao internu pohranu"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Potrebno je formatirati uređaj <xliff:g id="NAME_0">^1</xliff:g> radi zaštite. \n\nNakon formatiranja <xliff:g id="NAME_1">^1</xliff:g> funkcionirat će samo na ovom uređaju. \n\n"<b>"Formatiranjem se brišu svi podaci koji su trenutačno pohranjeni na <xliff:g id="NAME_2">^1</xliff:g>."</b>" Da ne biste izgubili podatke, napravite sigurnosnu kopiju."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Izbriši i formatiraj"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatiranje uređaja <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Ne uklanjajte uređaj <xliff:g id="NAME">^1</xliff:g> dok se formatira."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Preselite podatke u novu pohranu"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Možete premjestiti svoje fotografije, datoteke i podatke aplikacija na novi uređaj <xliff:g id="NAME">^1</xliff:g>. \n\nPremještanje traje otprilike <xliff:g id="TIME">^2</xliff:g> i oslobodit će <xliff:g id="SIZE">^3</xliff:g> na internoj pohrani. Neke aplikacije neće funkcionirati tijekom tog postupka."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Premjestite odmah"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Premjestite kasnije"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Premjestite datoteke odmah"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Premještanje traje otprilike <xliff:g id="TIME">^1</xliff:g>. Oslobodit će <xliff:g id="SIZE">^2</xliff:g> interne pohrane."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Premjesti"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Premještanje podataka…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Tijekom premještanja: \n• Ne uklanjajte uređaj <xliff:g id="NAME">^1</xliff:g>. \n• Neke aplikacije neće funkcionirati pravilno. \n• Ne isključujte uređaj s napajanja."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"Uređaj <xliff:g id="NAME">^1</xliff:g> je spreman"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Uređaj <xliff:g id="NAME">^1</xliff:g> spreman je za upotrebu s fotografijama i ostalim medijskim uređajima."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Novi uređaj <xliff:g id="NAME">^1</xliff:g> funkcionira. \n\nDa biste premjestili fotografije, datoteke i podatke aplikacija na taj uređaj, otvorite Postavke &gt; Pohrana."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Premjestite aplikaciju <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Premještanje aplikacije <xliff:g id="APP">^1</xliff:g> i njezinih podataka na uređaj <xliff:g id="NAME_0">^2</xliff:g> trajat će samo nekoliko trenutaka. Nećete moći upotrebljavati tu aplikaciju dok premještanje ne završi. \n\nNe uklanjajte uređaj <xliff:g id="NAME_1">^2</xliff:g> tijekom premještanja."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Premještanje aplikacije <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Ne uklanjajte uređaj <xliff:g id="NAME">^1</xliff:g> tijekom premještanja. \n\nAplikacija <xliff:g id="APP">^2</xliff:g> na ovom uređaju neće biti dostupna dok premještanje ne završi."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Otkaži premještanje"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Status baterije"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Razina baterije"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN-ovi"</string>
@@ -1016,13 +1053,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Ponovo postavi na zadano"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Poništavanje zadanih postavki APN-a dovršeno."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Poništavanje postavki mreže"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Sve postavke koje se odnose na umrežavanje vratit će se na tvorničko stanje, uključujući:\n\n"<li>"Wi-Fi"</li>\n<li>"podatkovnu vezu mobilnog uređaja"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Sve postavke mreže vratit će se na zadano, uključujući:\n\n"<li>"Wi‑Fi"</li>\n<li>"podatkovnu vezu mobilnog uređaja"</li>\n<li>"Bluetooth."</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Poništi postavke"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Želite li poništiti sve postavke mreže? Nećete ih moći vratiti!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Želite li vratiti sve postavke mreže na zadano? Tu radnju nije moguće poništiti!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Poništi postavke"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Da biste potvrdili poništavanje postavki mreže, trebate nacrtati svoj uzorak za otključavanje."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Poništiti?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Poništavanje postavki mreže"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Postavke mreže vraćene su na zadano."</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Vrati uređaj na zadano"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Vraćanje na tvorničko stanje"</string>
     <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>
@@ -1038,9 +1074,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Izbrisati sve podatke na SD kartici, na primjer, glazbu ili fotografije"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Poništi tabletni uređaj"</string>
     <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_desc" msgid="1062841478823409667">"Želite li izbrisati sve osobne podatke i preuzete aplikacije? Radnju nije moguće poništiti!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Izbriši sve"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Vraćanje na tvorničko stanje nije dostupno za ovog korisnika"</string>
@@ -1057,8 +1092,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Postavite govornu poštu, preusmjeravanje poziva, ID pozivatelja"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB dijeljenje veze"</string>
@@ -1090,7 +1123,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoć"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobilne mreže"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilni paket"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Zadana aplikacija za SMS"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS aplikacija"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Želite li promijeniti aplikaciju za SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Želite li upotrijebiti aplikaciju <xliff:g id="NEW_APP">%1$s</xliff:g> umjesto aplikacije <xliff:g id="CURRENT_APP">%2$s</xliff:g> kao svoju aplikaciju za SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Želite li upotrijebiti aplikaciju <xliff:g id="NEW_APP">%s</xliff:g> kao svoju aplikaciju za SMS?"</string>
@@ -1121,6 +1154,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Upotreba GPS-a za utvrđivanje lokacije"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Skeniranje"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skeniranje"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Traženje Wi‑Fi-ja"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Poboljšajte lokaciju tako što ćete dopustiti aplikacijama i uslugama traženje Wi‑Fi mreža, čak i kada je Wi‑Fi isključen"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Traženje Bluetootha"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Poboljšajte lokaciju tako što ćete dopustiti uslugama sustava traženje Bluetooth uređaja, čak i kada je Bluetooth isključen"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Lokacija Wi‑Fi i mobilne mreže"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Omogućite aplik. da upotrebljavaju Googleovu uslugu lokacije za brže lociranje. Anonimni podaci prikupljat će se i slati Googleu."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Lokacija utvrđena pomoću Wi-Fi-ja"</string>
@@ -1166,11 +1203,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Zaporka je postavljena"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN je postavljen"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Uzorak je postavljen"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Upotrijebite uzorak uređaja da biste nastavili."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Unesite PIN uređaja da biste nastavili."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Unesite zaporku uređaja da biste nastavili."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Pogrešan PIN"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Pogrešna zaporka"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Pogrešan uzorak"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Sigurnost uređaja"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Izmijeni uzorak za otključavanje"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Promijeni PIN za otključavanje"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potvrdi spremljeni uzorak"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Pokušajte ponovo:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Iscrtajte uzorak za otključavanje"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pritisnite Izbornik za pomoć."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Maknite prst ako ste gotovi"</string>
@@ -1192,8 +1233,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Postavi uzorak za otključavanje"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Izmijeni uzorak za otključavanje"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Kako iscrtati uzorak za otključavanje"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Previše netočnih pokušaja!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Pokušajte ponovo za <xliff:g id="NUMBER">%d</xliff:g> s."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Previše netočnih pokušaja. Pokušajte ponovo za <xliff:g id="NUMBER">%d</xliff:g> s."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Aplikacija nije instalirana na vašem telefonu."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Upravljanje aplikacijama"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Upravljanje instaliranim aplikacijama i njihovo uklanjanje"</string>
@@ -1244,8 +1284,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Poredaj po veličini"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Prikaži pokrenute usluge"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Prikaži procese iz predmemorije"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Aplikacija za hitne slučajeve"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Poništi postavke"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Poništiti postavke?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Sve postavke za sljedeće vratit će se na zadano:\n\n "<li>"onemogućene aplikacije"</li>\n" "<li>"onemogućene obavijesti aplikacija"</li>\n" "<li>"zadane aplikacije za radnje"</li>\n" "<li>"ograničenja pozadinskih podataka za aplikacije"</li>\n" "<li>"sva ograničenja dozvola."</li>\n\n" Nećete izgubiti podatke nijedne aplikacije."</string>
@@ -1449,8 +1488,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Snimi sve Bluetooth HCI pakete u datoteci"</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="select_logd_size_title" msgid="7433137108348553508">"Veličine međuspremnika zapisnika"</string>
@@ -1751,6 +1788,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 sati"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dan"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Prikaži sustav"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Sakrij sustav"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Upotrijebi USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Vrsta statističkih podataka"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Pozadina"</string>
@@ -1847,7 +1885,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Trenutačna zaporka:"</string>
@@ -2222,7 +2259,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Korisnik"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Ograničeni profil"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Dodati novog korisnika?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Za dijeljenje ovog uređaja s drugima možete izraditi dodatne korisnike. Svaki korisnik ima vlastiti prostor koji može prilagoditi pomoću vlastitih aplikacija, pozadinske slike i tako dalje. Korisnici mogu prilagoditi i postavke uređaja koje utječu na sve ostale korisnike, na primjer, Wi‑Fi.\n\nKada dodate novog korisnika, ta osoba mora postaviti svoj prostor.\n\nBilo koji korisnik može ažurirati aplikacije za sve ostale korisnike."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Za dijeljenje ovog uređaja s drugima možete napraviti dodatne korisnike. Svaki korisnik ima svoj prostor koji može prilagoditi pomoću vlastitih aplikacija, pozadinske slike i tako dalje. Korisnici mogu prilagoditi i postavke uređaja koje utječu na sve ostale korisnike, na primjer, Wi‑Fi.\n\nKada dodate novog korisnika, ta osoba mora postaviti svoj prostor.\n\nBilo koji korisnik može ažurirati aplikacije za sve ostale korisnike."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Kada dodate novog korisnika, ta osoba mora postaviti vlastiti prostor.\n\nBilo koji korisnik može ažurirati aplikacije za sve ostale korisnike."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Postaviti korisnika sada?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Provjerite može li osoba uzeti uređaj i postaviti svoj prostor"</string>
@@ -2402,10 +2439,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"ograničenje ograničiti ograničeno"</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_reset_apps" msgid="6420313678620788457">"poništavanje vraćanje na zadano postavke zadano"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"hitno u hitnom slučaju aplikacija zadano"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"aplikacije preuzimanje sustav"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"aplikacije dopuštenja sigurnost"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"aplikacije zadano"</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>
@@ -2420,14 +2457,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Glasnoća alarma"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Glasnoća zvona"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Glasnoća obavijesti"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Blokiraj prekide"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Samo prioritetno dopušta"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatska pravila"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Kada stignu pozivi i 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_alarms" msgid="7380265858042606857">"Dopusti samo alarme"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ne prekidaj"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Samo prioritetno"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Samo alarmi"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Bez prekida"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Melodija zvona telefona"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Zadana melodija zvona za obavijesti"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibracija i za pozive"</string>
@@ -2461,16 +2496,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Nema instaliranih slušatelja obavijesti."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Omogućiti uslugu <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> moći će čitati sve obavijesti koje objavi sustav ili bilo koja instalirana aplikacija, a obavijesti mogu uključivati osobne podatke, primjerice, imena kontakata i tekstove poruka koje su vam poslane. Također će moći odbaciti te obavijesti ili dodirnuti gumbe za radnju u njima."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Davatelji uvjeta"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nijedna aplikacija ne pruža uvjete"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="one">%d aplikacija pruža uvjete</item>
-      <item quantity="few">%d aplikacije pružaju uvjete</item>
-      <item quantity="other">%d aplikacija pruža uvjete</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nije instaliran nijedan davatelj uvjeta."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Želite li omogućiti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"Davatelj uvjeta <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> moći će dodati uvjete za izlaz načinu Ne ometaj."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Učitavanje aplikacija..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokiraj sve"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nikad ne prikazuj obavijesti s te aplikacije"</string>
@@ -2484,17 +2509,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritet"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Osjetljivo"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Naziv pravila"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Dodaj pravilo"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Izbriši pravilo"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Želite li izbrisati pravilo \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Izbriši"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Vrsta pravila"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Nepoznato"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Konfiguriranje pravila"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Pravilo rasporeda"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Pravilo nije pronađeno."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dani"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Ništa"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Svaki dan"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nikada"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Pozivi"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Poruke"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Pozivi/poruke od kontakta"</string>
@@ -2504,15 +2535,84 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmi"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Podsjetnici"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Događaji"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Odabrani pozivatelji"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Višestruki pozivatelji"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Ako ista osoba nazove drugi put u razdoblju od <xliff:g id="MINUTES">%d</xliff:g> min, dopusti"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automatski uključi"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nikada"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Svake noći"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> sutra"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Kada dopuštate prekid?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Koliko dugo?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Neodređeno"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> minuta</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minuta</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> sat</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> sata</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> sati</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Promijeni na \"Samo prioritetne obavijesti\" na neodređeno vrijeme"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Promijeni na \"Samo prioritetne obavijesti\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> minute do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Promijeni na \"Samo prioritetne obavijesti\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> minute do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Promijeni na \"Samo prioritetne obavijesti\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> minuta do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Promijeni na \"Samo prioritetne obavijesti\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> sata (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">Promijeni na \"Samo prioritetne obavijesti\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> sata (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Promijeni na \"Samo prioritetne obavijesti\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> sati (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Promijeni na \"Samo alarmi\" na neodređeno vrijeme"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">Promijeni na \"Samo alarmi\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> minute (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">Promijeni na \"Samo alarmi\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> minute (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Promijeni na \"Samo alarmi\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> minuta (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="one">Promijeni na \"Samo alarmi\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> sata do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Promijeni na \"Samo alarmi\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> sata do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Promijeni na \"Samo alarmi\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> sati do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Promijeni na \"Ne prekidaj\" na neodređeno vrijeme"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Promijeni na \"Ne prekidaj\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> minute (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">Promijeni na \"Ne prekidaj\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> minute (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Promijeni na \"Ne prekidaj\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> minuta (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Promijeni na \"Ne prekidaj\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> sata do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Promijeni na \"Ne prekidaj\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> sata do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Promijeni na \"Ne prekidaj\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> sati do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Promijeni na \"Uvijek prekidaj\""</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"zauvijek"</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>
@@ -2578,7 +2678,11 @@
       <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> dopuštenja odobrena</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dopuštenja odobreno</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> od <xliff:g id="COUNT_3">%d</xliff:g> dopuštenja odobreno</item>
+      <item quantity="few"><xliff:g id="COUNT_2">%d</xliff:g> od <xliff:g id="COUNT_3">%d</xliff:g> dopuštenja odobreno</item>
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> od <xliff:g id="COUNT_3">%d</xliff:g> dopuštenja odobreno</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Postavljene su neke zadane postavke"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Nema zadanih postavki"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Sve aplikacije"</string>
@@ -2589,8 +2693,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritetno"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Osjetljivo"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"S URL-ovima domena"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Vraćanje postavki na svim aplikacijama na zadano"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"Broj instaliranih aplikacija, uključujući aplikacije sustava i preuzete aplikacije: <xliff:g id="COUNT">%d</xliff:g>"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Onemogućio administrator"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Napredno"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nepoznata aplikacija"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Odabir profila"</string>
@@ -2606,4 +2709,11 @@
       <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aplikacije mogu otvoriti URL-ove svojih domena</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikacija može otvoriti URL-ove svojih domena</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Nije prepoznat"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Zadane aplikacije"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Aplikacija preglednika"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Nema zadanog preglednika"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Zadano)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 6c4d927..1acdcdb 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"Nyilvános webes meghajtó"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Nyomógomb"</item>
@@ -283,7 +286,7 @@
     <item msgid="3073734345226842233">"mikrofon némítása és a némítás feloldása"</item>
     <item msgid="1148142988678569310">"médiatartalom kivetítése"</item>
     <item msgid="9130014005474445273">"VPN aktiválása"</item>
-    <item msgid="1165192162975045562">"háttér írása"</item>
+    <item msgid="1165192162975045562">"háttérkép írása"</item>
     <item msgid="7129487923652967258">"segédlet a szerkezethez"</item>
     <item msgid="1069023208100114540">"segédlet a képernyőképhez"</item>
   </string-array>
@@ -335,7 +338,7 @@
     <item msgid="1312534577834048535">"Mikrofon némítása és a némítás feloldása"</item>
     <item msgid="5906017727368097853">"Médiatartalom kivetítése"</item>
     <item msgid="2486614710846178542">"VPN aktiválása"</item>
-    <item msgid="5586547561693629602">"Háttér írása"</item>
+    <item msgid="5586547561693629602">"Háttérkép írása"</item>
     <item msgid="32794179825485062">"Segédlet a szerkezethez"</item>
     <item msgid="7872852746938272552">"Segédlet a képernyőképhez"</item>
   </string-array>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"alacsony"</item>
     <item msgid="4212263919458209842">"kritikus"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Ki"</item>
-    <item msgid="5656544177755411222">"Korlátozott megszakítások"</item>
-    <item msgid="8735337502532332056">"Nincs megszakítás"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normál"</item>
     <item msgid="866544120205026771">"Mérsékelt"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 55a940f..b12135d 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kártya"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxybeállítások"</string>
     <string name="cancel" msgid="6859253417269739139">"Mégse"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"MÉGSE"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"FOLYTATÁS"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"IGEN"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NEM"</string>
-    <string name="forget" msgid="7267115980248732932">"ELFELEJTÉS"</string>
+    <string name="forget" msgid="1400428660472591263">"Elfelejt"</string>
+    <string name="save" msgid="879993180139353333">"Mentés"</string>
+    <string name="done" msgid="6942539184162713160">"Kész"</string>
     <string name="settings_label" msgid="1626402585530130914">"Beállítások"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Beállítások"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Beállítások parancsikon"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Csatlakoztassa töltőjét, és próbálja újra."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nincs a zárolási képernyőhöz tartozó PIN kód vagy jelszó"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Be kell állítani egy zárolási képernyőhöz tartozó PIN kódot vagy jelszót a titkosítás megkezdése előtt."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Rajzolja le a feloldási mintát az eszköz titkosításának megerősítéséhez."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Titkosítja?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"A titkosítási művelet visszafordíthatatlan, ha megszakítja, adatai elvesznek. A titkosítás legalább egy órát vesz igénybe, mialatt a táblagép többször újra fog indulni."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"A titkosítási művelet visszafordíthatatlan, ha megszakítja, adatai elvesznek. A titkosítás legalább egy órát vesz igénybe, mialatt a telefon többször újra fog indulni."</string>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Speciális"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Speciális Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Ha a Bluetooth aktív, az eszköz képes kommunikálni a közelben lévő Bluetooth-eszközökkel."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"A pontosabb helyadatok érdekében a Google-szolgáltatások Bluetooth-eszközöket keresnek még kikapcsolt Bluetooth mellett is. Ezt a LINK_BEGINkeresési beállításoknálLINK_END módosíthatja."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"A pontosabb helyadatok érdekében az alkalmazások és szolgáltatások Bluetooth-eszközöket keresnek még kikapcsolt Bluetooth mellett is. Ezt a <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>keresési beállításoknál<xliff:g id="LINK_END_1">LINK_END</xliff:g> módosíthatja."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Csatlakozás a következőhöz..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> leválasztásra kerül a hordozóeszköz hangkimenetéről."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> leválasztásra kerül a kihangosító hangkimenetéről."</string>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"A pontosabb helyadatok érdekében a Google-szolgáltatások Wi-Fi-hálózatokat keresnek még kikapcsolt Wi-Fi mellett is. Ezt a LINK_BEGINkeresési beállításoknálLINK_END módosíthatja."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"A pontosabb helyadatok érdekében az alkalmazások és szolgáltatások Wi-Fi-hálózatokat keresnek még kikapcsolt Wi-Fi mellett is. Ezt a <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>keresési beállításoknál<xliff:g id="LINK_END_1">LINK_END</xliff:g> módosíthatja."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ne jelenjen meg többé"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Tartsa bekapcsolva a Wi-Fit alvó üzemmódban"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi bekapcsolva alvó módban"</string>
@@ -604,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Keresés"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Speciális"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Alkalmazások"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Wi-Fi-jelerősség"</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>
@@ -663,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Bejelentkezik a csatlakozáshoz?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g>: online bejelentkezés szükséges a csatlakozás előtt."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"KAPCSOLÓDÁS"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"A hálózaton nincs internetkapcsolat. Mindenképpen csatalkozni szeretne hozzá?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Ne kérdezzen rá újra ennél a hálózatnál"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Kapcsolódás"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nem sikerült hálózathoz csatlakozni."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Elfelejt"</string>
@@ -729,21 +726,17 @@
     <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> hordozható Wi-Fi hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi-hívás"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Híváspreferencia"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi-hívás üzemmód"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi előnyben részesítve"</item>
     <item msgid="5267397515594230396">"Mobiladat-kapcsolat előnyben részesítve"</item>
-    <item msgid="3132912693346866895">"Csak Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Ha be van kapcsolva a Wi-Fi-hívás, akkor a telefon az Ön beállításaitól és a jelerősségtől függően vagy a Wi-Fi-hálózaton, vagy a mobilszolgáltató hálózatán át vezeti a hívásokat. A funkció bekapcsolása előtt tájékozódjon mobilszolgáltatójánál a díjakról és egyéb részletekről."</string>
     <string name="home_settings" msgid="212375129455718176">"Főoldal"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Megjelenítés"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Hang"</string>
@@ -915,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Elérhető (csak olvasható)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Összes hely"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Számítás..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Alkalmazások (alkalmazásadatok és médiatartalom)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Alkalmazások és alkalmazásadatok"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Média"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Letöltések"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Képek, videók"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Hang (zene, csengőhangok, podcastok stb.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Egyéb."</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Egyéb fájlok"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Gyorsítótárazott adatok"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Megosztott tárh. levál."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD-kártya leválasztása"</string>
@@ -953,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Leválasztás folyamatban"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Kevés a szabad terület"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Néhány rendszerfunkció, mint például a szinkronizálás, nem fog megfelelően működni. Próbáljon meg helyet felszabadítani elemek, például alkalmazások és médiatartalom törlésével vagy feloldásával."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Átnevezés"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Csatlakoztatás"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Kiadás"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Törlés és formázás"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Törlés és formázás belső tárhelyként"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Számítógépes USB-kapcsolat"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Számítógépes USB-kapcsolat"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Kapcsolódás a következőként:"</string>
@@ -963,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Lehetővé teszi, hogy a MIDI-kompatibilis alkalmazások USB-n keresztül működjenek a MIDI-szoftverrel a számítógépen."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Egyéb felhasználók"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Eszköz tárhelye"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Cserélhető tárhely"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> szabad (összesen: <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"A(z) <xliff:g id="NAME">%1$s</xliff:g> csatlakoztatva"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"A(z) <xliff:g id="NAME">%1$s</xliff:g> csatlakoztatása sikertelen"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"A(z) <xliff:g id="NAME">%1$s</xliff:g> biztonságosan eltávolítva"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"A(z) <xliff:g id="NAME">%1$s</xliff:g> biztonságos eltávolítása sikertelen"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"A(z) <xliff:g id="NAME">%1$s</xliff:g> formázása megtörtént"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"A(z) <xliff:g id="NAME">%1$s</xliff:g> formázása sikertelen"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Tárhely átnevezése"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"A formázás után ez a(z) <xliff:g id="NAME_0">^1</xliff:g> használható más eszközökben. \n\nA(z) <xliff:g id="NAME_1">^1</xliff:g> összes adata törölve lesz, ezért előbb gondolja át, hogy kell-e készítenie biztonsági mentést. \n\n"<b>"Készítsen biztonsági mentést fotóiról és más médiatartalmairól"</b>" \nMédiafájljait helyezze át az eszközben lévő egyéb tárhelyre, vagy másolja át számítógépére egy USB-kábel segítségével. \n\n"<b>"Készítsen biztonsági mentést alkalmazásairól"</b>" \nA(z) <xliff:g id="NAME_6">^1</xliff:g> tárterületén lévő összes alkalmazással együtt azok adatai is törlődnek. Ha meg szeretné tartani ezeket az alkalmazásokat, helyezze át őket az eszközben lévő egyéb tárhelyre."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Ezen <xliff:g id="NAME_0">^1</xliff:g> kiadásakor a rátelepített alkalmazások működésképtelenné válnak, a rajta tárolt médiafájlok pedig nem lesznek elérhetők egészen addig, amíg Ön vissza nem helyezi a tárolót az eszközbe."</b>" \n\nA(z) <xliff:g id="NAME_1">^1</xliff:g> úgy van formázva, hogy csak ezen az eszközön működjön, más eszközökön ne."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"A(z) <xliff:g id="NAME">^1</xliff:g> beállítása"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Használat hordozható tárolóként"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Fotók és más médiatartalmak eszközök közötti áthelyezéséhez."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Használat belső tárhelyként"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Annak érdekében, hogy – az alkalmazásokat és fotókat is beleértve – mindent ezen az eszközön tároljon. Ehhez formázást kell végrehajtania, amely megakadályozza, hogy a tároló más eszközökben is használható legyen."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formázás belső tárhelyként"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Ez megköveteli a(z) <xliff:g id="NAME_0">^1</xliff:g> biztonságos formázását. \n\nA formázás után ez a(z) <xliff:g id="NAME_1">^1</xliff:g> csak ezzel az eszközzel fog működni. \n\n"<b>"A formázással törlődik a(z) <xliff:g id="NAME_2">^1</xliff:g> tárterületén jelenleg megtalálható összes adat."</b>" Az adatvesztés elkerülése érdekében fontolja meg biztonsági mentés végrehajtását."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Törlés és formázás"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"A(z) <xliff:g id="NAME">^1</xliff:g> formázása folyamatban van…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"A(z) <xliff:g id="NAME">^1</xliff:g> formázásakor ne vegye ki azt az eszközből."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Áthelyezés az új tárhelyre"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Fotóit, fájljait és alkalmazásadatait áthelyezheti új tárolóeszközére (<xliff:g id="NAME">^1</xliff:g>). \n\nA művelet időtartama körülbelül <xliff:g id="TIME">^2</xliff:g>, és <xliff:g id="SIZE">^3</xliff:g> tárterületet szabadít fel a belső tárhelyen. Az áthelyezés végrehajtása során egyes alkalmazások nem fognak működni."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Áthelyezés most"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Áthelyezés később"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Adatok áthelyezése most"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"A művelet időtartama körülbelül <xliff:g id="TIME">^1</xliff:g>, és <xliff:g id="SIZE">^2</xliff:g> tárterületet szabadít fel a belső tárhelyen."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Áthelyezés"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Az áthelyezés folyamatban van…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"A művelet végrehajtása során: \n• A(z) <xliff:g id="NAME">^1</xliff:g> nem távolítható el az eszközből. \n• Egyes alkalmazások nem fognak megfelelően működni. \n• Az eszköz legyen töltőn."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"A(z) <xliff:g id="NAME">^1</xliff:g> készen áll"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"A(z) <xliff:g id="NAME">^1</xliff:g> be van állítva, így használhatja fotókhoz és más médiatartalmakhoz."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Az új <xliff:g id="NAME">^1</xliff:g> működik. \n\nHa fotókat, fájlokat és alkalmazásadatokat szeretne áthelyezni erre az eszközre, nyissa meg a Beállítások &gt; Tárhely menüpontot."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> áthelyezése"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"A(z) <xliff:g id="APP">^1</xliff:g> és adatainak a(z) <xliff:g id="NAME_0">^2</xliff:g> tárhelyre való áthelyezése mindössze néhány pillanatig fog tartani. Az áthelyezési művelet befejeződéséig nem fogja tudni használni az alkalmazást. \n\nA(z) <xliff:g id="NAME_1">^2</xliff:g> nem távolítható el a művelet végrehajtása során."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"A(z) <xliff:g id="APP">^1</xliff:g> áthelyezése folyamatban van…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Az áthelyezés végrehajtása során a(z) <xliff:g id="NAME">^1</xliff:g> nem távolítható el az eszközből. \n\nAz eszközön lévő <xliff:g id="APP">^2</xliff:g> alkalmazás a művelet befejeződéséig nem lesz elérhető."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Áthelyezés megszakítása"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Akkumulátor állapota"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Akkumulátorszint"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN-ek"</string>
@@ -1007,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Visszaállítás alaphelyzetbe"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Az alapértelmezett APN-beállítások visszaállítása befejeződött."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Hálózati beállítások visszaállítása"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Ezzel visszaállítja az összes hálózati beállítást a gyári alapértelmezett értékre, beleértve a következőket:\n\n"<li>"Wi-Fi"</li>\n<li>"Mobiladatok"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Ezzel minden hálózati beállítás alaphelyzetbe áll, beleértve a következőket:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobiladatok"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Beállítások visszaállítása"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Visszaállítja az összes hálózati beállítást? Ezt a lépést nem lehet visszavonni."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Visszaállítja az összes hálózati beállítást? Ezt a műveletet nem lehet visszavonni."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Beállítások visszaállítása"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Meg kell adnia a feloldási mintát a hálózati beállítások visszaállításának megerősítéséhez."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Visszaállítja?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Hálózati beállítások visszaállítva"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"A hálózati beállítások vissza lettek állítva."</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Eszköz újraindítása"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Gyári adatok visszaállítása"</string>
     <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>
@@ -1029,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Minden adat, például zenék és képek törlése az SD-kártyáról"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Táblagép visszaállítása"</string>
     <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_desc" msgid="1062841478823409667">"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_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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"A gyári beállítások visszaállítása nem hajtható végre ennél a felhasználónál"</string>
@@ -1048,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Hangposta, hívásátirányítás, hívásvárakoztatás és hívóazonosító beállítása"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-megosztás"</string>
@@ -1081,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Súgó"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobilhálózatok"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobil-előfizetés"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Alapértelmezett SMS-alkalmazás"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS-küldő"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Módosítja az SMS-alkalmazást?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"A(z) <xliff:g id="NEW_APP">%1$s</xliff:g> alkalmazást szeretné használni a(z) <xliff:g id="CURRENT_APP">%2$s</xliff:g> helyett az SMS-ekhez?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"A(z) <xliff:g id="NEW_APP">%s</xliff:g> alkalmazást szeretné használni az SMS-ekhez?"</string>
@@ -1112,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPS használata a tartózkodási hely meghatározásához"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Beolvasás"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Beolvasás"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi-alapú keresés"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"A pontosabb helyadatok érdekében engedélyezze az alkalmazások és szolgáltatások számára Wi-Fi-hálózatok keresését akkor is, amikor a Wi‑Fi ki van kapcsolva."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth-alapú keresés"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"A pontosabb helyadatokért a rendszerszolgáltatások Bluetooth-eszközöket keresnek még kikapcsolt Bluetooth mellett is."</string>
     <string name="location_network_based" msgid="6010456018401296590">"Hely Wi‑Fi és mobil alapján"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Engedélyezze az alkalmazásoknak, hogy a Google helymeghatározó szolgáltatásával gyorsabban megbecsüljék tartózkodási helyét. A névtelen helyadatok összegyűjtés után a Google-hoz kerülnek."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Helymeghatározás Wi-Fi-vel"</string>
@@ -1157,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"A jelszó beállítva"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"A PIN kód beállítva"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"A minta beállítva"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"A folytatáshoz használja eszköze mintáját."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"A folytatáshoz adja meg eszköze PIN kódját."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"A folytatáshoz adja meg eszköze jelszavát."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Helytelen PIN kód"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Helytelen jelszó"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Helytelen minta"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Eszközbiztonság"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Feloldási minta módosítása"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"A feloldó PIN kód módosítása"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Erősítse meg az elmentett mintát"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Próbálja újra:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Rajzoljon egy feloldási mintát"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Nyomja meg a Menü gombot, ha segítségre van szüksége."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Emelje fel az ujját, ha kész"</string>
@@ -1183,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Feloldási minta beállítása"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Feloldási minta módosítása"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Hogyan kell feloldási mintát rajzolni"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Túl sok helytelen próbálkozás!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Próbálja újra <xliff:g id="NUMBER">%d</xliff:g> másodperc múlva."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Túl sok helytelen próbálkozás. Próbálja újra <xliff:g id="NUMBER">%d</xliff:g> másodperc múlva."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Az alkalmazás már nincs telepítve a telefonján."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Alkalmazások kezelése"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Telepített alkalmazások kezelése és eltávolítása"</string>
@@ -1235,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Rendezés méret szerint"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Futó szolgáltatások"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Tárolt folyamatok"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Segélyhívó"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Alapbeállítások"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Visszaállítja a beállításokat?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Ez visszaállítja a következőkre vonatkozó összes beállítást:\n\n "<li>"Letiltott alkalmazások"</li>\n" "<li>"Letiltott alkalmazásértesítések"</li>\n" "<li>"Alapértelmezett alkalmazások adott műveletekhez"</li>\n" "<li>"Alkalmazások háttéradat-korlátozása"</li>\n" "<li>"Minden engedélykorlátozás"</li>\n\n" Az alkalmazásadatok nem vesznek el."</string>
@@ -1440,8 +1479,6 @@
     <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="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="select_logd_size_title" msgid="7433137108348553508">"Logger pufferméret"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 óra"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 nap"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Rendszerfolyamatok megjelenítése"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Rendszer elrejtése"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Egyedi készletméret használata"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statisztika típusa"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Háttérben futó folyamatok"</string>
@@ -1838,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Jelenlegi jelszó:"</string>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Felhasználó"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Korlátozott profil"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Hozzáad új felhasználót?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"További felhasználók létrehozásával megoszthatja ezt az eszközt másokkal. Minden felhasználó saját tárterülettel rendelkezik, amelyet személyre szabhat saját alkalmazásaival, háttérképével stb. A felhasználók módosíthatják az eszköz beállításait is, például a Wi‑Fi használatát, amely mindenkit érint.\n\nHa új felhasználót ad hozzá, az illetőnek be kell állítania saját tárterületét.\n\nBármely felhasználó frissítheti az alkalmazásokat valamennyi felhasználó számára."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"További felhasználók létrehozásával megoszthatja ezt az eszközt másokkal. Minden felhasználó saját tárterülettel rendelkezik, amelyet személyre szabhat saját alkalmazásaival, háttérképével stb. A felhasználók módosíthatják az eszköz beállításait is, például a Wi‑Fi használatát, amely mindenkit érint.\n\nHa új felhasználót ad hozzá, az illetőnek be kell állítania saját tárterületét.\n\nBármely felhasználó frissítheti az alkalmazásokat valamennyi felhasználó számára."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Ha új felhasználót ad hozzá, az illetőnek be kell állítania saját tárterületét.\n\nBármely felhasználó frissítheti az alkalmazásokat valamennyi felhasználó számára."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Beállít most egy felhasználót?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Győződjön meg arról, hogy a személy hozzá tud férni az eszközhöz, hogy beállíthassa a területét"</string>
@@ -2393,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"korlátozás korlátoz korlátozott"</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_reset_apps" msgid="6420313678620788457">"visszaállítás beállítások alapértelmezett érték"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"alapértelmezett segélykérő (ICE) alkalmazás"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"alkalmazás letöltés alkalmazások rendszer"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"alkalmazások engedélyek biztonság"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"Alkalmazások alapbeállításai"</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>
@@ -2411,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Ébresztés hangereje"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Csengés hangereje"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Értesítés hangereje"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Megszakítások tiltása"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Csak a prioritást élvezők"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatikus szabályok"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Hívások és értesítések é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_alarms" msgid="7380265858042606857">"Csak riasztások engedélyezése"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ne zavarjon"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Csak prioritásos"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Csak riasztások"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Ne zavarjon"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefon csengőhangja"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Értesítések alapértelmezett csengőhangja"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Rezgés a hívásoknál is"</string>
@@ -2451,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Nincs telepítve értesítésfigyelő."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Engedélyezi a(z) <xliff:g id="SERVICE">%1$s</xliff:g> szolgáltatást?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> a rendszer és minden telepített alkalmazás által küldött összes értesítést el tudja majd olvasni. Ezekben lehetnek személyes adatok, például ismerősök nevei és az Ön részére küldött SMS-ek szövegei. Ezeket az értesítéseket el is vetheti, illetve a bennük lévő műveletgombokat megérintheti."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Feltételbiztosítók"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Egy alkalmazás sem biztosít feltételeket"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d alkalmazás biztosít feltételeket</item>
-      <item quantity="one">%d alkalmazás biztosít feltételeket</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nincsenek telepített feltételbiztosítók."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Engedélyezi a(z) <xliff:g id="SERVICE">%1$s</xliff:g> szolgáltatást?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"A(z) <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> szolgáltató hozzáadhat majd kilépési feltételeket a „Ne zavarjanak” módhoz."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Alkalmazások betöltése…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Az összes letiltása"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Soha ne jelenjenek meg az alkalmazás értesítései"</string>
@@ -2473,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritást élvező"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Bizalmas"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Szabály neve"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Szabály hozzáadása"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Szabály törlése"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Törli a(z) „<xliff:g id="RULE">%1$s</xliff:g>” szabályt?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Törlés"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Szabály típusa"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Ismeretlen"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Szabály konfigurálása"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Ütemezési szabály"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Szabály nem található"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Napok"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Nincs"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Minden nap"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Soha"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="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>
@@ -2493,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Riasztások"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Emlékeztetők"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Események"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Kijelölt hívók"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Többször hívó személyek"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Ha <xliff:g id="MINUTES">%d</xliff:g> percen belül másodjára is hív valaki, akkor engedélyezze"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Auto. bekapcsolás"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Soha"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Minden este"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> a következő napon"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Mikor zavarhatják meg?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Mennyi időre?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Határozatlan időre"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> perc</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> perc</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> óra</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> óra</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"„Csak elsőbbségi értesítések” beállítása határozatlan időre"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Csak elsőbbségi értesítések <xliff:g id="DURATION">%1$d</xliff:g> percen át, eddig: <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Csak elsőbbségi értesítések egy percen át, eddig: <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Csak elsőbbségi értesítések <xliff:g id="DURATION">%1$d</xliff:g> órán át, eddig: <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Csak elsőbbségi értesítések egy órán át, eddig: <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"„Csak riasztások” beállítása határozatlan időre"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Csak riasztások <xliff:g id="DURATION">%1$d</xliff:g> percen át (eddig: <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Csak riasztások egy percen át, eddig: <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Csak riasztások <xliff:g id="DURATION">%1$d</xliff:g> órán át, eddig: <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Csak riasztások egy órán át, eddig: <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"„Ne zavarjon” beállítása határozatlan időre"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Módosítás a(z) „<xliff:g id="DURATION">%1$d</xliff:g> percen át ne zavarjanak” beállításra eddig: <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Módosítás az „egy percen át ne zavarjanak” beállításra eddig: <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Módosítás az „<xliff:g id="DURATION">%1$d</xliff:g> órán át ne zavarjanak” beállításra eddig: <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Módosítás az „egy órán át ne zavarjanak” beállításra eddig: <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Módosítás a bármikor történő megszakításra"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"végtelenségig"</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>
@@ -2566,7 +2659,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> engedély megadva</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> engedély megadva</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_3">%d</xliff:g>/<xliff:g id="COUNT_2">%d</xliff:g> engedély megadva</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>/<xliff:g id="COUNT_0">%d</xliff:g> engedély megadva</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Van néhány alapértelmezett beállítás"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Nincs alapértelmezett beállítás"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Az összes alkalmazás"</string>
@@ -2577,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritást élvező"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Bizalmas"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Domain URL-ekkel"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Az összes alkalmazás beállításának visszaállítása az alapértelmezett értékre."</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> alkalmazás telepítve, beleértve a rendszer- és a letöltött alkalmazásokat"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Letiltva a rendszergazda által"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Speciális"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Ismeretlen alkalmazás"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Profil kiválasztása"</string>
@@ -2593,4 +2688,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> alkalmazás meg tudja nyitni a domainjei URL-jeit</item>
       <item quantity="one">Egy alkalmazás meg tudja nyitni a domainje URL-jeit</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Nem sikerült felismerni"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Alapértelmezett alkalmazások"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Böngésző"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Nincs alapértelmezett böngésző"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Alapértelmezett)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-hy-rAM/arrays.xml b/res/values-hy-rAM/arrays.xml
index a98cd07..f178f08 100644
--- a/res/values-hy-rAM/arrays.xml
+++ b/res/values-hy-rAM/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Սեղմման կոճակ"</item>
@@ -283,7 +286,7 @@
     <item msgid="3073734345226842233">"խոսափողն անջատել/միացնել"</item>
     <item msgid="1148142988678569310">"տեսարձակել մեդիան"</item>
     <item msgid="9130014005474445273">"ակտիվացնել VPN-ը"</item>
-    <item msgid="1165192162975045562">"ստեղծել պաստառ"</item>
+    <item msgid="1165192162975045562">"պաստառների պահում"</item>
     <item msgid="7129487923652967258">"օժանդակ կառույց"</item>
     <item msgid="1069023208100114540">"օժանդակ էկրանի պատկեր"</item>
   </string-array>
@@ -335,7 +338,7 @@
     <item msgid="1312534577834048535">"Խոսափողն անջատել/միացնել"</item>
     <item msgid="5906017727368097853">"Տեսարձակել մեդիան"</item>
     <item msgid="2486614710846178542">"Ակտիվացնել VPN-ը"</item>
-    <item msgid="5586547561693629602">"Ստեղծել պաստառ"</item>
+    <item msgid="5586547561693629602">"Պաստառների պահում"</item>
     <item msgid="32794179825485062">"Օժանդակ կառույց"</item>
     <item msgid="7872852746938272552">"Օժանդակ էկրանի պատկեր"</item>
   </string-array>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"ցածր"</item>
     <item msgid="4212263919458209842">"կրիտիկական"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Անջատված"</item>
-    <item msgid="5656544177755411222">"Սահմանափակ ընդհատումներ"</item>
-    <item msgid="8735337502532332056">"Զրոյական ընդհատումներ"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Սովորական"</item>
     <item msgid="866544120205026771">"Չափավոր"</item>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index c7a5cd3..a258dad 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD քարտ"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Պրոքսի կարգավորումներ"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ԱՅՈ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"ՈՉ"</string>
-    <string name="forget" msgid="7267115980248732932">"ՄՈՌԱՆԱԼ"</string>
+    <string name="forget" msgid="1400428660472591263">"Մոռանալ"</string>
+    <string name="save" msgid="879993180139353333">"Պահել"</string>
+    <string name="done" msgid="6942539184162713160">"Պատրաստ է"</string>
     <string name="settings_label" msgid="1626402585530130914">"Կարգավորումներ"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Կարգավորումներ"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Կարգավորումների դյուրանցում"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Միացրեք ձեր լիցքավորիչը և կրկին փորձեք:"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Կողպէկրանի PIN կամ գաղտնաբառ չկա"</string>
     <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>
@@ -411,7 +408,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="current_screen_lock" msgid="4104091715420072219">"Ընթացիկ էկրանի փական"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Կողպման ընթացիկ եղանակը"</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>
@@ -419,7 +416,7 @@
     <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_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Էկրանի փականը կարգավորելուց հետո կարող եք ավելացնել ձեր մատնահետքը Կարգավորումներ &gt; Անվտանգություն ընտրացանկում:"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Էկրանի կողպումը կարգավորելուց հետո կարող եք ավելացնել ձեր մատնահետքը Կարգավորումներ &gt; Անվտանգություն ընտրացանկում:"</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>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Ընդլայնված"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Ընդլայնված Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Երբ Bluetooth-ը միացված է, ձեր սարքը կարող է հաղորդակցվել այլ հարակից Bluetooth սարքերի հետ:"</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"Տեղադրության որոշման ճշգրտությունը բարելավելու նպատակով Google ծառայությունները կորոնեն Bluetooth սարքեր՝ նույնիսկ երբ Bluetooth-ն անջատված է: Կարող եք դա փոխել LINK_BEGINորոնելու կարգավորումներումLINK_END:"</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Տեղադրության որոշման ճշգրտությունը բարելավելու նպատակով հավելվածներն ու ծառայությունները կորոնեն Bluetooth սարքեր՝ նույնիսկ, երբ Bluetooth-ն անջատված է: Այս ընտրանքը կարող եք փոխել <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>որոնման կարգավորումներում<xliff:g id="LINK_END_1">LINK_END</xliff:g>:"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Միացում…"</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>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"Տեղադրության որոշման ճշգրտությունը բարելավելու նպատակով Google ծառայությունները կորոնեն Wi‑Fi սարքեր՝ նույնիսկ երբ Wi‑Fi-ն անջատված է: Կարող եք դա փոխել LINK_BEGINորոնելու կարգավորումներումLINK_END:"</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Տեղադրության որոշման ճշգրտությունը բարելավելու նպատակով հավելվածներն ու ծառայությունները կորոնեն Wi‑Fi ցանցեր՝ նույնիսկ, երբ Wi‑Fi-ն անջատված է: Այս ընտրանքը կարող եք փոխել <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>որոնման կարգավորումներում<xliff:g id="LINK_END_1">LINK_END</xliff:g>:"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Նորից ցույց չտալ"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Միացրած պահել Wi‑Fi-ը քնած ռեժիմի ընթացքում"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi-ը՝ քնելու ռեժիմում"</string>
@@ -604,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi ուղիղ"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Սկանավորում"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Ընդլայնված"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Դիտել հավելվածները"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Դիտել WiFi ազդանշանը"</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>
@@ -663,6 +658,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ՄԻԱՆԱԼ"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Այս ցանցը համացանցի կապակցում չունի: Այնուամենայնիվ, օգտագործե՞լ այս ցանցը:"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Չհարցնել այլևս այս ցանցի համար"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Միանալ"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Ցանցին միանալ չհաջողվեց"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Մոռանալ"</string>
@@ -729,21 +726,17 @@
     <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> դյուրակիր Wi‑Fi թեժ կետ"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android թեժ կետ"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Զանգեր Wi-Fi-ի միջոցով"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Զանգերի նախասիրություններ"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi-ի միջոցով զանգերի ռեժիմ"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi, նախընտրելի"</item>
     <item msgid="5267397515594230396">"Բջջային, նախընտրելի"</item>
-    <item msgid="3132912693346866895">"Միայն Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Երբ Wi-Fi-ի միջոցով զանգերը միացված են, հեռախոսը կարող է ուղարկել զանգերը Wi-Fi ցանցերի կամ ձեր օպերատորի ցանցի միջոցով՝ կախված ձեր նախընտրություններից և ազդանշանի ուժգնությունից: Մինչ այս գործառույթը միացնելը՝ տեղեկացեք վճարների և այլ մանրամասների մասին ձեր օպերատորից:"</string>
     <string name="home_settings" msgid="212375129455718176">"Հիմնական"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ցուցադրիչ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ձայն"</string>
@@ -760,7 +753,7 @@
     <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="alarm_volume_title" msgid="2285597478377758706">"Ազդանշան"</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>
     <string name="sound_effects_enable_title" msgid="1171590821131077296">"Հպել ձայնային ազդակները"</string>
@@ -915,12 +908,12 @@
     <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">"Հավելվածներ (հավելվածների տվյալներ &amp; մեդիա բովանդակություն)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Հավելվածներ և հավելվածների տվյալներ"</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_media_misc_usage" msgid="235452944021647124">"Խառնաբնույթ"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Այլ ֆայլեր"</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>
@@ -953,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Անջատումը ընթացքի մեջ է"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Պահոցային տարածքը սպառվում է"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Որոշ համակարգային գործառույթներ, ինչպես օրինակ համաժամեցումը հնարավոր է` այնքան էլ ճշգրիտ չաշխատեն: Փորձեք տարածք ազատել` ջնջելով կամ հանելով այնպիսի հատվածներ, ինչպիսիք են հավելածները կամ մեդիա բովանդակությունը:"</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Վերանվանել"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Միացնել"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Անջատել"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Ջնջել և ձևաչափել"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Ջնջել և ձևաչափել որպես ներքին հիշողություն"</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>
@@ -963,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Թույլ է տալիս MIDI աջակցումով ծրագրերին USB-ի և MIDI-ի համակցությամբ ծրագրակազմի միջոցով աշխատել ձեր համակարգչի վրա:"</string>
     <string name="storage_other_users" msgid="808708845102611856">"Այլ օգտվողներ"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Սարքի հիշողություն"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Շարժական կրիչ"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> ազատ տարածք (ընդհանուր՝ <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> պահեստը միացվեց"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Չհաջողվեց միացնել <xliff:g id="NAME">%1$s</xliff:g> պահեստը"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> կրիչն անվնաս անջատվեց"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Չհաջողվեց անվնաս անջատել <xliff:g id="NAME">%1$s</xliff:g> կրիչը"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> կրիչի ձևաչափումը հաջողվեց"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Չհաջողվեց ձևաչափել <xliff:g id="NAME">%1$s</xliff:g> կրիչը"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Պահեստի վերանվանում"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Ձևաչափումից հետո այս <xliff:g id="NAME_0">^1</xliff:g>-ը կարող եք օգտագործել այլ սարքերում: \n\nԱյս <xliff:g id="NAME_1">^1</xliff:g>-ի վրայի բոլոր տվյալները կջնջվեն: Ուստի, չմոռանաք նախ պահուստավորել: \n\n"<b>"Պահուստավորեք լուսանկարներն ու այլ մեդիա ֆայլերը"</b>" \nՏեղափոխեք մեդիա ֆայլերը այս սարքի մեկ այլ պահեստ կամ որևէ համակարգիչ USB մալուխի միջոցով: \n\n"<b>"Պահուստավորեք հավելվածները"</b>" \nԱյս <xliff:g id="NAME_6">^1</xliff:g>-ի վրայի բոլոր հավելվածները ապատեղադրվելու են, իսկ նրանց տվյալները ջնջվելու են: Հավելվածները պահպանելու համար տեղափոխեք դրանք այս սարքի մեկ այլ պահեստ:"</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Եթե հանեք այս <xliff:g id="NAME_0">^1</xliff:g>-ը, նրա վրա պահեստավորված հավելվածներն այլևս չեն աշխատի, իսկ մեդիա ֆայլերը հասանելի չեն լինի մինչև նորից չզետեղեք այն:"</b>" \n\nԱյս <xliff:g id="NAME_1">^1</xliff:g>-ը ձևաչափված է միայն այս սարքի վրա աշխատելու համար: Այն չի աշխատի այլ սարքերի վրա:"</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Տեղադրեք <xliff:g id="NAME">^1</xliff:g>-ը"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Օգտագործել որպես շարժական պահեստ"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Լուսանկարները և այլ մեդիա ֆայլերը սարքից սարք տեղափոխելու համար:"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Օգտագործել որպես ներքին հիշողություն"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Հավելվածները, լուսանկարները և այլ բաներ միայն այս սարքի վրա պահեստավորելու համար: Հարկավոր է ձևաչափում, որի արդյունքում այն չի աշխատի այլ սարքերի վրա:"</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Ձևաչափել որպես ներքին պահեստ"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"<xliff:g id="NAME_0">^1</xliff:g>-ի անվտանգությունը ապահովելու համար այն պետք է ձևաչափել: \n\nՈրից հետո այս <xliff:g id="NAME_1">^1</xliff:g>-ը կաշխատի միայն այս սարքի վրա: \n\n"<b>"Ձևաչափումից հետո <xliff:g id="NAME_2">^1</xliff:g>-ի վրա պահեստավորված բոլոր տվյալները կջնջվեն:"</b>" Տվյալները չկորցնելու համար չմոռանաք նախ պահուստավորել դրանք:"</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Ջնջել և ձևաչափել"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g>-ի ձևաչափում…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Չհեռացնեք <xliff:g id="NAME">^1</xliff:g>-ը ձևաչափման ընթացքում:"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Տեղափոխել տվյալները նոր պահեստ"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Ձեր լուսանկարները, ֆայլերը և հավելվածների տվյալները կարող եք տեղափոխել նոր <xliff:g id="NAME">^1</xliff:g>: \n\nՏեղափոխումը տևում է մոտ <xliff:g id="TIME">^2</xliff:g>, որի արդյունքում ներքին հիշողությունը կազատվի <xliff:g id="SIZE">^3</xliff:g>-ով: Որոշ հավելվածների աշխատանքը կկասեցվի տեղափոխման ընթացքում:"</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Տեղափոխել հիմա"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Տեղափոխել ավելի ուշ"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Տեղափոխել տվյալները"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Տեղափոխումը տևում է մոտ <xliff:g id="TIME">^1</xliff:g>, որի արդյունքում ներքին հիշողությունը կազատվի <xliff:g id="SIZE">^2</xliff:g>-ով:"</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Տեղափոխել"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Տվյալների տեղափոխում…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Տեղափոխման ընթացքում. \n• Չհեռացնեք <xliff:g id="NAME">^1</xliff:g>-ը: \n• Որոշ հավելվածների աշխատանքի մեջ խնդիրներ կառաջանան: \n• Լիցքավորված պահեք սարքը:"</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g>-ը պատրաստ է"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g>-ը պատրաստ է իր բոլոր լուսանկարներով և այլ մեդիա ֆայլերով:"</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Նոր <xliff:g id="NAME">^1</xliff:g>-ն աշխատում է: \n\nԼուսանկարներ, ֆայլեր և հավելվածների տվյալներ այս սարք տեղափոխելու համար գնացեք Կարգավորումներ և պահեստ:"</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Տեղափոխել <xliff:g id="APP">^1</xliff:g> հավելվածը"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<xliff:g id="APP">^1</xliff:g> հավելվածի և նրա տվյալների տեղափոխումը <xliff:g id="NAME_0">^2</xliff:g> ընդամենը մի քանի վայրկյան կտևի: Դուք չեք կարողանա օգտագործել հավելվածը մինչև տեղափոխումը չավարտվի: \n\nՏեղափոխման ընթացքում չհեռացնեք <xliff:g id="NAME_1">^2</xliff:g>-ը:"</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> հավելվածի տեղափոխում…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Տեղափոխման ընթացքում չհեռացնեք <xliff:g id="NAME">^1</xliff:g>-ը: \n\n<xliff:g id="APP">^2</xliff:g> հավելվածը հասանելի չի լինի մինչև տեղափոխումը չավարտվի:"</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Չեղարկել տեղափոխումը"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Մարտկոցի կարգավիճակը"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Մարտկոցի մակարդակը"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN-ներ"</string>
@@ -1007,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Վերականգնել լռելյայնը"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Սկզբնական APN կարգավորումների վերակարգավորումն ավարտված է:"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Ցանցային կարգավորումների վերակայում"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Այս գործողության արդյունքում կվերակայվեն գործարանային կանխադրված արժեքները ցանցային կապակցման բոլոր կարգավորումների համար, ներառյալ՝\n\n"<li>"Wifi"</li>\n<li>"Շարժական տվյալներ"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Այս գործողության արդյունքում կվերակայվեն ցանցի բոլոր կարգավորումները, այդ թվում նաև՝\n\n"<li>"Wi‑Fi-ի"</li>\n<li>"Բջջային կապի տվյալների"</li>\n<li>"Bluetooth-ի"</li>" կարգավորումները"</string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Վերակայել կարգավորումները"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Վերակայե՞լ բոլոր ցանցային կարգավորումները: Այս գործողությունը հնարավոր չի լինի հետարկել:"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Վերակայե՞լ ցանցի բոլոր կարգավորումները: Այլևս չեք կարող հետարկել այս գործողությունը:"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Վերակայել կարգավորումները"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Ցանցային կարգավորումների վերակայումը հաստատելու համար անհրաժեշտ է մուտքագրել ապակողպող նախշը:"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Վերակայե՞լ:"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Ցանցային կարգավորումները վերակայվեցին"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Ցանցի կարգավորումները վերակայվել են"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Վերակայել սարքը"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Գործարանային տվյալների վերականգնում"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Սա կջնջի բոլոր տվյալները ձեր գրասալիկի "<b>" ներքին պահոցից"</b>", այդ թվում՝\n\n"<li>"Ձեր Google հաշիվը"</li>\n<li>"Համակարգի և հավելվածների տվյալներն ու կարգավորումները"</li>\n<li>"Ներբեռնված հավելվածները"</li></string>
@@ -1029,9 +1065,8 @@
     <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="1062841478823409667">"Ջնջե՞լ բոլոր անձնական տեղեկությունները և ներբեռնված հավելվածները: Այլևս չեք կարող հետարկել այս գործողությունը:"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Ջնջել ամենը"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Այս օգտվողը չի կարող վերակայել սարքը և վերականգնել գործարանային կարգավորումները"</string>
@@ -1048,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Կարգավորեք ձայնային փոստը, զանգի վերահասցեավորումը, զանգի սպասումը, զանգողի ID-ն"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB միացում"</string>
@@ -1081,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Օգնություն"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Բջջային ցանցեր"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Բջջային փաթեթ"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Լռելյայն SMS ծրագիր"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS հավելված"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Փոխե՞լ SMS ծրագիրը:"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Որպես SMS ծրագիր` <xliff:g id="CURRENT_APP">%2$s</xliff:g>-ի փոխարեն օգտագործե՞լ <xliff:g id="NEW_APP">%1$s</xliff:g>-ը:"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Որպես SMS ծրագիր` օգտագործե՞լ <xliff:g id="NEW_APP">%s</xliff:g>-ը:"</string>
@@ -1112,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Տեղադրությունը որոշելու համար օգտագործել GPS-ը"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Վերլուծում"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Վերլուծում"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi ցանցերի որոնում"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Բարելավեք տեղադրության որոնումը՝ թույլատրելով հավելվածներին ու ծառայություններին որոնել Wi‑Fi ցանցեր՝ նույնիսկ, երբ Wi‑Fi-ն անջատված է"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth սարքերի որոնում"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Բարելավեք տեղադրության որոնումը՝ թույլատրելով համակարգի ծառայություններին որոնել Bluetooth սարքեր՝ նույնիսկ, երբ Bluetooth-ն անջատված է"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi և բջջային ցանցի տեղադրություն"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Թույլատրել ծրագրերին օգտագործել Google-ի տեղակայման ծառայությունները` ձեր տեղադրությունը ավելի արագ որոշելու համար: Անանուն տեղակայման տվյալները կհավաքագրվեն և կուղարկվեն Google-ին:"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Տեղադրությունը որոշված է Wi‑Fi-ի կողմից"</string>
@@ -1157,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Գաղտնաբառը սահմանված է"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-ը սահմանված է"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Նախշը կարգավորված է"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Շարունակելու համար գծեք նախշը:"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Շարունակելու համար մուտքագրեք սարքի PIN կոդը:"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Շարունակելու համար մուտքագրեք սարքի գաղտնաբառը:"</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN կոդը սխալ է"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Գաղտնաբառը սխալ է"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Նախշը սխալ է"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Սարքի անվտանգությունը"</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_wrong" msgid="4694973540770105678">"Կրկին փորձեք`"</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>
@@ -1183,8 +1224,7 @@
     <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" msgid="6909161623701848863">"Չափից շատ սխալ փորձ է կատարվել: Նորից փորձեք <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>
@@ -1235,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Տեսակավորել ըստ չափի"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Ցույց տալ ընթացիկ ծառայությունները"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Ցուցադրել քեշավորված գործընթացները"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Հավելված արտակարգ իրավիճակների համար"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Վերակարգավորել հավելվածի նախընտրանքները"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Վերակարգավորե՞լ ծրագրի նախընտրությունները:"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Սա կվերակայի հետևյալ բոլոր նախընտրանքները՝\n\n "<li>"Անջատված ծրագրերը"</li>\n" "<li>"Ծրագրերի անջատված ծանուցումները"</li>\n" "<li>"Գործադրման լռելյայն ծրագրերը"</li>\n" "<li>"Ծրագրերի հետնաշերտային տվյալների սահմանափակումները"</li>\n" "<li>"Թույլտվությունների բոլոր սահմանափակումները"</li>\n\n" Ծրագրերի ոչ մի տվյալ չի կորի:"</string>
@@ -1440,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Կորզել բոլոր bluetooth HCI փաթեթները մի ֆայլում"</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="select_logd_size_title" msgid="7433137108348553508">"Տեղեկամատյանի պահնակի չափերը"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 ժամ"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 օր"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Ցույց տալ համակարգը"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Թաքցնել համակարգի գործընթացները"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Օգտագործել Uss-ը"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Վիճակագրության տեսակը"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Հետնաշերտ"</string>
@@ -1838,7 +1876,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_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>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Օգտվող"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Սահմանափակված պրոֆիլ"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Ավելացնե՞լ նոր օգտվող:"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Կարող եք սարքը համօգտագործել այլ մարդկանց հետ՝ ստեղծելով լրացուցիչ օգտվողներ: Յուրաքանչյուր օգտվող ունի սեփական տարածք, որտեղ կարող է հարմարեցնել իր ծրագրերը, պաստառները և այլն: Օգտվողները կարող են նաև հարմարեցնել սարքի կարգավորումները, ինչպես օրինակ՝ Wi-Fi-ը, որը կազդի բոլոր օգտվողներին:\n\nԵրբ նոր օգտվող եք ավելացնում, նա պետք է կարգավորի իր տարածքը:\n\nՑանկացած օգտվող կարող է թարմացնել ծրագրերը՝ մյուս բոլոր օգտվողների համար:"</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Ավելացնելով հավելյալ օգտվողներ՝ սարքը կարող եք համօգտագործել այլ մարդկանց հետ: Ամեն մի օգտվող կունենա իր սեփական տարածքը, որը կարող է հարմարեցնել իր հավելվածներով, պաստառով և այլ բաներով: Օգտվողները կարող են նաև կարգաբերել Wi‑Fi-ի և սարքի այլ կարգավորումները, որոնք առնչվում են բոլորին:\n\nԵրբ նոր օգտվող եք ավելացնում, նա պետք է կարգավորի իր տարածքը:\n\nՑանկացած օգտվող կարող է թարմացնել բոլոր օգտվողների հավելվածները:"</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Երբ նոր օգտվող եք ավելացնում, նա պետք է կարգավորի իր տարածքը:\n\nՑանկացած օգտվող կարող է թարմացնել ծրագրերը՝ մյուս բոլոր օգտվողների համար:"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Ստեղծե՞լ օգտվող հիմա:"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Համոզվեք, որ անձը կարող է վերցնել սարքը և կարգավորել իր տարածքը"</string>
@@ -2393,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"սահմանափակում սահմանափակել սահմանափակված"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"տեքստի ուղղում ուղղել ձայն թրթռալ ավտոմատ լեզու ժեստ առաջարկել առաջարկ թեմա վիրավորական բառ մուտքագրել զմայլիկ միջազգային"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"վերակայել կանխադրված նախընտրանքները"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"կանխադրված հավելված արտակարգ իրավիճակներում"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"հավելվածներ ներբեռնել հավելվածներ համակարգ"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"հավելվածների թույլտվություններին վերաբերող անվտանգություն"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"կանխադրված հավելվածները"</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>
@@ -2411,14 +2448,12 @@
     <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="6948120138640252732">"Արգելափակել միջամտությունները"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Միայն կարևոր միջամտություններ"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Միայն կարևորները"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Ինքնաշխատ կանոններ"</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_alarms" msgid="7380265858042606857">"Թույլատրել միայն ազդանշանները"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Չընդհատել"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Միայն կարևորները"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Միայն զարթուցիչը"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Առանց ընդհատումների"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>՝ <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Հեռախոսի զանգերանգ"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Ծանուցումների կանխադրված զանգերանգը"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Նաև թրթռալ զանգերի ժամանակ"</string>
@@ -2451,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Ծանուցման ունկնդիրներ տեղադրված չեն:"</string>
     <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">"Ոչ մի ծրագիր պայմաններ չի տալիս"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="one">%d հավելված տրամադրում է պայմաններ</item>
-      <item quantity="other">%d հավելված տրամադրում է պայմաններ</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="loading_notification_apps" msgid="5031818677010335895">"Ծրագրերը բեռնվում են..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Արգելափակել բոլորը"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Երբեք ցույց չտալ ծանուցումներ այս ծրագրից"</string>
@@ -2473,35 +2499,102 @@
     <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_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_rule_name" msgid="5149068059383837549">"Կանոնի անունը"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Ավելացնել կանոն"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Ջնջել կանոնը"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Ջնջե՞լ «<xliff:g id="RULE">%1$s</xliff:g>» կանոնը:"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Ջնջել"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Կանոնի տեսակը"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Անհայտ"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Կազմաձևել կանոնը"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Ժամանակացույցի կանոն"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Կանոնը չի գտնվել:"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Օրեր"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Չկան"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Ամեն օր"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Երբեք"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>-ից <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="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_alarms" msgid="2165302777886552926">"Ազդանշաններ"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Զարթուցիչ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Հիշեցումներ"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Միջոցառումներ"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Ընտրված զանգողներ"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Բազմակի զանգեր կատարած"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Թույլատրել նույն անձին <xliff:g id="MINUTES">%d</xliff:g> րոպեի ընթացքում կատարել երկրորդ զանգը"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"Հաջորդ օրը <xliff:g id="FORMATTED_TIME">%s</xliff:g>-ին"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Ե՞րբ եք ցանկանում, որ ձեզ ընդհատենք:"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Որքա՞ն ժամանակով:"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Անորոշ ժամանակով"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> minutes</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> րոպե</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> hours</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ժամ</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Անորոշ ժամանակով ակտիվացնել «Միայն կարևոր ծանուցումները» ռեժիմը"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Change to priority notifications only for <xliff:g id="DURATION">%1$d</xliff:g> minutes until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Ակտիվացնել «Միայն կարևոր ծանուցումները» ռեժիմը <xliff:g id="DURATION">%1$d</xliff:g> րոպեով մինչև <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Change to priority notifications only for <xliff:g id="DURATION">%1$d</xliff:g> hours (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Ակտիվացնել «Միայն կարևոր ծանուցումները» ռեժիմը <xliff:g id="DURATION">%1$d</xliff:g> ժամով (մինչև <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Անորոշ ժամանակով ակտիվացնել «Միայն զարթուցիչը» ռեժիմը"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> minutes (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Ակտիվացնել «Միայն զարթուցիչը» ռեժիմը <xliff:g id="DURATION">%1$d</xliff:g> րոպեով (մինչև <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="one">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> hours until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Ակտիվացնել «Միայն զարթուցիչը» ռեժիմը <xliff:g id="DURATION">%1$d</xliff:g> ժամով մինչև <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Անորոշ ժամանակով ակտիվացնել «Չընդհատել» ռեժիմը"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Change to don\'t interrupt for <xliff:g id="DURATION">%1$d</xliff:g> minutes (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Ակտիվացնել «Չընդհատել» ռեժիմը <xliff:g id="DURATION">%1$d</xliff:g> րոպեով (մինչև <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Change to don\'t interrupt for <xliff:g id="DURATION">%1$d</xliff:g> hours until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Ակտիվացնել «Չընդհատել» ռեժիմը <xliff:g id="DURATION">%1$d</xliff:g> ժամով մինչև <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Ակտիվացնել «Միշտ ընդհատել» ռեժիմը"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ընդմիշտ"</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>
@@ -2545,8 +2638,8 @@
     <string name="launch_by_default" msgid="2184141780491382435">"Գործարկել լռելյայն"</string>
     <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> պահոցում օգտագործված է <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="app_launch_domain_links_title" msgid="458956710410857777">"Տիրույթի հղումներ"</string>
-    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Բացել Տիրույթի URL-ները"</string>
-    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Թույլատրել հավելվածին անմիջապես բացել Տիրույթի URL-ները"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Բացել տիրույթի URL-ները"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Թույլատրել հավելվածին անմիջապես բացել տիրույթի URL-ները"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Աջակցվող տիրույթների URL-ներ"</string>
     <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Այլ կանխադրված կարգավորումներ"</string>
     <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> պահոցում օգտագործված է <xliff:g id="SIZE">%1$s</xliff:g>"</string>
@@ -2566,7 +2659,10 @@
       <item quantity="one">Տրամադրվել է <xliff:g id="COUNT_1">%d</xliff:g> թույլտվություն</item>
       <item quantity="other">Տրամադրվել է <xliff:g id="COUNT_1">%d</xliff:g> թույլտվություն</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> of <xliff:g id="COUNT_3">%d</xliff:g> permissions granted</item>
+      <item quantity="other">Տրվել է <xliff:g id="COUNT_3">%d</xliff:g>-ից <xliff:g id="COUNT_2">%d</xliff:g> թույլտվություն</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Որոշ կանխադրված կարգավորումներ կան"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Կանխադրված կարգավորումներ չկան"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Բոլոր հավելվածները"</string>
@@ -2577,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Առաջնահերթ"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Զգայուն"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Տիրույթի URL-ներով"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Վերակայել կանխադրված նախընտրանքները բոլոր հավելվածներում"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"Տեղադրվել է <xliff:g id="COUNT">%d</xliff:g> հավելված (այդ թվում նաև համակարգային և ներբեռնած հավելվածներ)"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Կասեցված է ադմինիստրատորի կողմից"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Լրացուցիչ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Անհայտ հավելված"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Ընտրել պրոֆիլ"</string>
@@ -2593,4 +2688,11 @@
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> հավելված կարող է բացել իր տիրույթի URL-ները</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> հավելված կարող է բացել իր տիրույթի URL-ները</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Չճանաչվեց"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Կանխադրված հավելվածները"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Դիտարկիչի հավելված"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Կանխադրված դիտարկիչ չկա"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Կանխադրված)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index d027fe9..e66463c 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Tekan tombol"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"Media"</item>
     <item msgid="7924928667052300589">"Perangkat"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"lokasi sementara"</item>
+    <item msgid="5789673140227507995">"lokasi terperinci"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"getar"</item>
+    <item msgid="3434165993711230924">"membaca kontak"</item>
+    <item msgid="616161687718081936">"ubah kontak"</item>
+    <item msgid="7638002295329050091">"baca log panggilan"</item>
+    <item msgid="6546959730920410907">"ubah log panggilan"</item>
+    <item msgid="446877710771379667">"membaca kalender"</item>
+    <item msgid="7674458294386319722">"ubah kalender"</item>
+    <item msgid="8281201165558093009">"pemindaian Wi-Fi"</item>
+    <item msgid="8694611243479480497">"pemberitahuan"</item>
+    <item msgid="7776439107987345446">"pemindaian seluler"</item>
+    <item msgid="514615766544675057">"telepon"</item>
+    <item msgid="8181415497109310680">"baca SMS"</item>
+    <item msgid="6816551144382117307">"tulis SMS"</item>
+    <item msgid="4600463921908905030">"terima SMS"</item>
+    <item msgid="5958926493289432745">"terima SMS darurat"</item>
+    <item msgid="4945269495221089540">"terima MMS"</item>
+    <item msgid="5570472453573929087">"terima WAP push"</item>
+    <item msgid="7125408150230860501">"kirim SMS"</item>
+    <item msgid="7080337936612188061">"baca ICC SMS"</item>
+    <item msgid="587124103118495063">"tulis ICC SMS"</item>
+    <item msgid="2320577158869025503">"ubah setelan"</item>
+    <item msgid="1545733463471924009">"gambar di atas"</item>
+    <item msgid="3609046903962454582">"akses pemberitahuan"</item>
+    <item msgid="4671646036128214513">"kamera"</item>
+    <item msgid="1097324338692486211">"rekam audio"</item>
+    <item msgid="5031552983987798163">"putar audio"</item>
+    <item msgid="8374996688066472414">"baca papan klip"</item>
+    <item msgid="3045529469061083747">"ubah papan klip"</item>
+    <item msgid="5124443975763747838">"tombol media"</item>
+    <item msgid="4547883971364273343">"fokus audio"</item>
+    <item msgid="2603878814882344450">"volume master"</item>
+    <item msgid="7136963238377062018">"volume suara"</item>
+    <item msgid="4270236897655923007">"volume dering"</item>
+    <item msgid="6325739889222559394">"volume media"</item>
+    <item msgid="5762123934816216821">"volume alarm"</item>
+    <item msgid="785049718065337473">"volume pemberitahuan"</item>
+    <item msgid="6700305533746877052">"volume bluetooth"</item>
+    <item msgid="2029227495214047094">"tetap aktif"</item>
+    <item msgid="26109888160231211">"monitor lokasi"</item>
+    <item msgid="5753382310468855812">"memantau lokasi berdaya tinggi"</item>
+    <item msgid="3356591542543137332">"dapatkan statistik penggunaan"</item>
+    <item msgid="3073734345226842233">"bisukan/suarakan mikrofon"</item>
+    <item msgid="1148142988678569310">"media proyek"</item>
+    <item msgid="9130014005474445273">"aktifkan VPN"</item>
+    <item msgid="1165192162975045562">"tulis wallpaper"</item>
+    <item msgid="7129487923652967258">"bantu struktur"</item>
+    <item msgid="1069023208100114540">"bantu tangkapan layar"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Lokasi"</item>
+    <item msgid="8677040780775113033">"Lokasi"</item>
+    <item msgid="1660743989948992916">"Lokasi"</item>
+    <item msgid="8791172739860195290">"Getar"</item>
+    <item msgid="383413555642128046">"Membaca kontak"</item>
+    <item msgid="3654594895269697313">"Ubah kontak"</item>
+    <item msgid="7928393476362362538">"Baca log panggilan"</item>
+    <item msgid="6248591205254641116">"Ubah log panggilan"</item>
+    <item msgid="6093344633066170692">"Membaca kalender"</item>
+    <item msgid="1334886368750347692">"Ubah kalender"</item>
+    <item msgid="1638204101698708656">"Lokasi"</item>
+    <item msgid="2154671955760380322">"Notifikasi pos"</item>
+    <item msgid="4282477730595931828">"Lokasi"</item>
+    <item msgid="4891423912898525905">"Telepon"</item>
+    <item msgid="2623604824935968113">"Baca SMS/MMS"</item>
+    <item msgid="4420177125221176306">"Tulis SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Terima SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Terima SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Terima SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Terima SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Kirim SMS/MMS"</item>
+    <item msgid="3527273606643794973">"Baca SMS/MMS"</item>
+    <item msgid="4370895547001583812">"Tulis SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Ubah setelan"</item>
+    <item msgid="736541391767350377">"Gambar di atas"</item>
+    <item msgid="5530815681721654194">"Akses pemberitahuan"</item>
+    <item msgid="781213371706962767">"Kamera"</item>
+    <item msgid="1720492593061838172">"Rekam audio"</item>
+    <item msgid="3493046322001257041">"Putar audio"</item>
+    <item msgid="136815868796597058">"Baca papan klip"</item>
+    <item msgid="5238692940326972503">"Ubah papan klip"</item>
+    <item msgid="5753789168376302997">"Tombol media"</item>
+    <item msgid="3265262911688671938">"Fokus audio"</item>
+    <item msgid="2098976479485046797">"Volume utama"</item>
+    <item msgid="5660213838861789350">"Volume suara"</item>
+    <item msgid="7983336752371254444">"Volume dering"</item>
+    <item msgid="7878027809189330917">"Volume media"</item>
+    <item msgid="7260546305036218513">"Volume alarm"</item>
+    <item msgid="9103719301075748925">"Volume pemberitahuan"</item>
+    <item msgid="7025966722295861512">"Volume bluetooth"</item>
+    <item msgid="4665183401128289653">"Tetap aktif"</item>
+    <item msgid="8584357129746649222">"Lokasi"</item>
+    <item msgid="7669257279311110599">"Lokasi"</item>
+    <item msgid="3459320345690097795">"Dapatkan statistik penggunaan"</item>
+    <item msgid="1312534577834048535">"Bisukan/suarakan mikrofon"</item>
+    <item msgid="5906017727368097853">"Media proyek"</item>
+    <item msgid="2486614710846178542">"Aktifkan VPN"</item>
+    <item msgid="5586547561693629602">"Tulis wallpaper"</item>
+    <item msgid="32794179825485062">"Bantu struktur"</item>
+    <item msgid="7872852746938272552">"Bantu tangkapan layar"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Singkat"</item>
     <item msgid="2560532955514699713">"Sedang"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"rendah"</item>
     <item msgid="4212263919458209842">"kritis"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Nonaktif"</item>
-    <item msgid="5656544177755411222">"Gangguan terbatas"</item>
-    <item msgid="8735337502532332056">"Tanpa gangguan"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Sedang"</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 537385c..14514c3 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Kartu SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Setelan proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Batal"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"BATAL"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"LANJUTKAN"</string>
     <string name="okay" msgid="1997666393121016642">"Oke"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"YA"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"TIDAK"</string>
-    <string name="forget" msgid="7267115980248732932">"LUPAKAN"</string>
+    <string name="forget" msgid="1400428660472591263">"Lupakan"</string>
+    <string name="save" msgid="879993180139353333">"Simpan"</string>
+    <string name="done" msgid="6942539184162713160">"Selesai"</string>
     <string name="settings_label" msgid="1626402585530130914">"Setelan"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Setelan"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Pintasan setelan"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Pasang pengisi daya Anda dan coba lagi."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Tidak ada PIN atau sandi pengunci layar"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Anda perlu menyetel PIN atau sandi pengunci layar sebelum dapat memulai enkripsi."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Anda perlu menggambar pola pembuka kunci untuk mengonfirmasi pengenkripsian perangkat."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Enkripsikan?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Operasi enkripsi tidak dapat dibatalkan dan jika Anda menghentikannya, data akan hilang. Enkripsi membutuhkan waktu satu jam atau lebih, dan selama itu tablet akan dimulai ulang beberapa kali."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Operasi enkripsi tidak dapat dibatalkan dan jika Anda menghentikannya, data akan hilang. Enkripsi membutuhkan waktu satu jam atau lebih, dan selama itu ponsel akan dimulai ulang beberapa kali."</string>
@@ -419,8 +416,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Pola"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Sandi"</string>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Setelah menyiapkan kunci layar, Anda juga dapat menyiapkan sidik jari di Setelan &gt; Keamanan."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Matikan kunci layar"</string>
     <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>
@@ -522,8 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Lanjutan"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth Lanjutan"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Saat Bluetooth aktif, perangkat dapat berkomunikasi dengan perangkat Bluetooth terdekat lainnya."</string>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Untuk meningkatkan akurasi lokasi, aplikasi dan layanan akan memindai perangkat Bluetooth, meski Bluetooth tidak aktif. Anda dapat mengubahnya di <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>setelan pemindaian<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Sambungkan ke…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas sambungannya dari audio media."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas sambungannya dari audio handsfree."</string>
@@ -589,8 +584,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Untuk meningkatkan akurasi lokasi, aplikasi dan layanan akan memindai jaringan Wi-Fi, meski Wi-Fi tidak aktif. Anda dapat mengubahnya di <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>setelan pemindaian<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Jangan tampilkan lagi"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Biarkan Wi-Fi nyala saat mode tidur"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi aktif saat mode tidur"</string>
@@ -607,8 +601,6 @@
     <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_apps" msgid="6003687912727859577">"Tampilkan Aplikasi"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Tampilkan Kekuatan Wi-Fi"</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>
@@ -666,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Masuk untuk menyambung?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> mewajibkan Anda masuk secara online sebelum menyambung ke jaringan."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"SAMBUNGKAN"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Jaringan ini tidak memiliki akses internet. Tetap gunakan jaringan ini?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Jangan tanya lagi untuk jaringan ini"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Sambungkan"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Gagal menyambung ke jaringan"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Lupakan"</string>
@@ -737,14 +731,12 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi dipilih"</item>
     <item msgid="5267397515594230396">"Seluler dipilih"</item>
-    <item msgid="3132912693346866895">"Khusus Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Jika panggilan Wi-Fi aktif, ponsel dapat merutekan panggilan telepon melalui jaringan Wi-Fi atau jaringan operator, bergantung pada preferensi dan sinyal mana yang lebih kuat. Sebelum mengaktifkan fitur ini, cari tahu dari operator terkait biaya dan detail lain."</string>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Jika panggilan Wi-Fi aktif, ponsel dapat merutekan panggilan telepon melalui jaringan Wi-Fi atau jaringan operator, bergantung pada preferensi dan sinyal mana yang lebih kuat. Sebelum mengaktifkan fitur ini, sebaiknya tanyakan info biaya dan detail lainnya ke operator."</string>
     <string name="home_settings" msgid="212375129455718176">"Beranda"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tampilan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Suara"</string>
@@ -916,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Tersedia (hanya baca)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Total ruang"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Menghitung..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplikasi (data &amp; konten media)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Aplikasi &amp; data aplikasi"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Unduhan"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Gambar, video"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (musik, nada dering, podcast, dll.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Serbaneka"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"File lainnya"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Data dalam cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Lepas penyimpanan bersama"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Lepaskan kartu SD"</string>
@@ -954,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Pelepasan sedang berlangsung"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Ruang penyimpanan hampir habis"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Beberapa fungsi sistem, seperti sinkronisasi, mungkin tidak bekerja dengan benar. Coba kosongkan ruang dengan menghapus atau mencopot sematan item, seperti konten media atau aplikasi."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Ganti nama"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Pasang"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Keluarkan"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Hapus &amp; format"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Hapus &amp; format sbg penyimpanan internal"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Koneksi komputer USB"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Koneksi komputer USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Sambungkan sebagai"</string>
@@ -964,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Mengizinkan aplikasi dengan MIDI aktif bekerja melalui USB dengan perangkat lunak MIDI di komputer."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Pengguna lainnya"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Penyimpanan perangkat"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Penyimpanan yang dapat dicopot"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> kosong (Total <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> telah dipasang"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Tidak dapat memasang <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> dikeluarkan dengan aman"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Tidak dapat mengeluarkan <xliff:g id="NAME">%1$s</xliff:g> dengan aman"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> telah diformat"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Tidak dapat memformat <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Ganti nama penyimpanan"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Setelah memformat, Anda dapat menggunakan <xliff:g id="NAME_0">^1</xliff:g> ini di perangkat lain. \n\nSemua data di <xliff:g id="NAME_1">^1</xliff:g> ini akan dihapus. Pertimbangkan untuk mencadangkan terlebih dahulu. \n\n"<b>"Cadangkan foto &amp; media lain"</b>" \nPindahkan file media ke penyimpanan alternatif di perangkat ini, atau transfer ke komputer menggunakan kabel USB. \n\n"<b>"Cadangkan aplikasi"</b>" \nSemua aplikasi yang disimpan di <xliff:g id="NAME_6">^1</xliff:g> ini akan dicopot pemasangannya dan datanya akan dihapus. Untuk menyimpan aplikasi tersebut, pindahkan ke penyimpanan alternatif di perangkat ini."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Saat Anda mengeluarkan <xliff:g id="NAME_0">^1</xliff:g> ini, aplikasi yang tersimpan di situ tidak akan berfungsi lagi, dan file media yang tersimpan di situ baru dapat tersedia jika dicolokkan kembali."</b>" \n\n <xliff:g id="NAME_1">^1</xliff:g> ini diformat untuk berfungsi hanya di perangkat ini dan tidak akan berfungsi di perangkat lain."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Siapkan <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Gunakan sebagai penyimpanan portabel"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Untuk memindahkan foto dan media lain antar-perangkat."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Gunakan sebagai penyimpanan internal"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Untuk menyimpan item apa pun hanya di perangkat ini, termasuk aplikasi dan foto. Perlu diformat agar tidak berfungsi di perangkat lain."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Format sebagai penyimpanan internal"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Agar aman, <xliff:g id="NAME_0">^1</xliff:g> perlu diformat. \n\nSetelah diformat, <xliff:g id="NAME_1">^1</xliff:g> ini hanya akan berfungsi di perangkat ini. \n\n"<b>"Memformat akan menghapus semua data yang saat ini disimpan di <xliff:g id="NAME_2">^1</xliff:g>."</b>" Agar tidak kehilangan data, pertimbangkan untuk mencadangkannya."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Hapus &amp; format"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Memformat <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Jangan cabut <xliff:g id="NAME">^1</xliff:g> saat sedang diformat."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Pindahkan data ke penyimpanan baru"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Anda dapat memindahkan foto, file, dan data aplikasi ke <xliff:g id="NAME">^1</xliff:g> baru ini. \n\nPemindahan berlangsung sekitar <xliff:g id="TIME">^2</xliff:g> dan akan mengosongkan <xliff:g id="SIZE">^3</xliff:g> di perangkat internal. Beberapa aplikasi tidak akan berfungsi saat pemindahan berlangsung."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Pindahkan sekarang"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Pindahkan nanti"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Pindahkan data sekarang"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Pemindahan ini berlangsung sekitar <xliff:g id="TIME">^1</xliff:g>. <xliff:g id="SIZE">^2</xliff:g> dari penyimpanan internal akan dikosongkan."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Pindahkan"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Memindahkan data..."</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Selama pemindahan: \n• Jangan cabut <xliff:g id="NAME">^1</xliff:g>. \n• Beberapa aplikasi tidak akan berfungsi dengan benar. \n• Selalu isi daya perangkat."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> sudah siap"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> sudah siap untuk digunakan dengan foto dan media lain."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> baru sedang bekerja. \n\nUntuk memindahkan foto, file, dan data aplikasi ke perangkat ini, buka Setelan &gt; Pemindahan."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Pindahkan <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Pemindahan <xliff:g id="APP">^1</xliff:g> dan datanya ke <xliff:g id="NAME_0">^2</xliff:g> hanya akan berlangsung sebentar. Anda tidak akan dapat menggunakan aplikasi hingga pemindahan selesai. \n\nJangan cabut <xliff:g id="NAME_1">^2</xliff:g> selama pemindahan."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Memindahkan <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Jangan cabut <xliff:g id="NAME">^1</xliff:g> selama pemindahan. \n\nAplikasi <xliff:g id="APP">^2</xliff:g> di perangkat ini baru dapat tersedia jika pemindahan selesai."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Batalkan pemindahan"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Status baterai"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Tingkat baterai"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1008,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Setel ulang ke default"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Penyetelan ulang setelan APN default selesai."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Setelan jaringan diatur ulang"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Tindakan ini akan mengatur ulang semua setelan yang terkait dengan sambungan jaringan ke default pabrik, termasuk:\n\n"<li>"Wi-Fi"</li>\n<li>"Data seluler"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Tindakan ini akan menyetel ulang semua setelan jaringan, termasuk:\n\n"<li>"Wi‑Fi"</li>\n<li>"Data seluler"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Atur ulang setelan"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Atur ulang semua setelan jaringan? Anda tidak dapat membalikkan tindakan ini!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Setel ulang semua setelan jaringan? Tindakan ini tidak dapat diurungkan!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Atur ulang setelan"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Anda perlu membuat pola pembuka kunci untuk mengonfirmasi pengaturan ulang setelan jaringan."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Setel ulang?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Setelan jaringan diatur ulang"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Setelan jaringan telah disetel ulang"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Setel ulang perangkat"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Kembalikan ke setelan pabrik"</string>
     <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>
@@ -1030,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Hapus semua data di kartu SD, seperti musik atau foto"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Setel ulang tablet"</string>
     <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_desc" msgid="1062841478823409667">"Hapus semua informasi pribadi dan aplikasi yang diunduh? Tindakan ini tidak dapat diurungkan!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Hapus semua"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Fitur kembalikan ke setelan pabrik tidak tersedia untuk pengguna ini"</string>
@@ -1049,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Siapkan kotak pesan, penerusan panggilan, nada tunggu, nomor penelepon"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Penambatan USB"</string>
@@ -1082,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Bantuan"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Jaringan seluler"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Paket seluler"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Aplikasi SMS default"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplikasi SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Ubah aplikasi SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Gunakan <xliff:g id="NEW_APP">%1$s</xliff:g> dan bukan <xliff:g id="CURRENT_APP">%2$s</xliff:g> sebagai aplikasi SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Gunakan <xliff:g id="NEW_APP">%s</xliff:g> sebagai aplikasi SMS?"</string>
@@ -1113,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Menggunakan GPS untuk menentukan lokasi"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Memindai"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Memindai"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Pemindaian Wi-Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Tingkatkan akurasi lokasi dengan mengizinkan aplikasi dan layanan memindai jaringan Wi-Fi meski Wi-Fi tidak aktif"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Pemindaian Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Tingkatkan akurasi lokasi dengan mengizinkan layanan sistem memindai perangkat Bluetooth, meski Bluetooth tidak aktif"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Lokasi jaringan Wi‑Fi &amp; seluler"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Izinkan aplikasi menggunakan layanan lokasi Google untuk memperkirakan lokasi Anda dengan lebih cepat. Data lokasi anonim akan dikumpulkan dan dikirim ke Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Lokasi yang ditentukan oleh Wi-Fi"</string>
@@ -1158,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Sandi telah ditetapkan"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN telah ditetapkan"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Pola telah ditetapkan"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Gunakan pola perangkat untuk melanjutkan."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Masukkan PIN perangkat untuk melanjutkan."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Masukkan sandi perangkat untuk melanjutkan."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN Salah"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Sandi salah"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Pola salah"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Keamanan perangkat"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Ubah pola pembuka kunci"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Ubah PIN pembuka kunci"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Konfirmasi pola tersimpan"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Coba lagi:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Buat pola pembuka kunci"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Tekan Menu untuk bantuan."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Angkat jari ketika selesai"</string>
@@ -1184,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Setel pola pembuka kunci"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Ubah pola pembuka kunci"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Cara membuat pola pembuka kunci"</string>
-    <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="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Terlalu banyak kesalahan pola. Coba kembali 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 aplikasi"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Mengelola dan menghapus apl terpasang"</string>
@@ -1236,7 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Urutkan menurut ukuran"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Lihat layanan berjalan"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Lihat proses di cache"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"Aplikasi darurat default"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Aplikasi darurat"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Setel ulang pref aplikasi"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Setel ulang pref aplikasi?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Hal ini akan menyetel ulang semua preferensi untuk:\n\n "<li>"Aplikasi yang dinonaktifkan"</li>\n" "<li>"Notifikasi aplikasi yang dinonaktifkan"</li>\n" "<li>"Aplikasi default untuk tindakan"</li>\n" "<li>"Batasan data latar belakang untuk aplikasi"</li>\n" "<li>"Batasan izin apa pun"</li>\n\n" Data aplikasi Anda tidak akan hilang."</string>
@@ -1308,7 +1347,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Pengoperasian aplikasi"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Berjalan"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Tidak pernah digunakan)"</string>
-    <string name="no_default_apps" msgid="2915315663141025400">"Tidak ada Aplikasi default."</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Tak ada Aplikasi default."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Penggunaan penyimpanan"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Lihat penyimpanan yang digunakan apl"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Layanan yang sedang berjalan"</string>
@@ -1440,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Tangkap semua paket HCI bluetooth di dalam file"</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="select_logd_size_title" msgid="7433137108348553508">"Ukuran penyangga pencatat log"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 jam"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 hari"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Tampilkan sistem"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Sembunyikan sistem"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Gunakan Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Jenis statistik"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Latar Belakang"</string>
@@ -1838,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Sandi saat ini:"</string>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Pengguna"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil dibatasi"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Tambahkan pengguna baru?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Anda dapat membagikan perangkat ini dengan orang lain dengan membuat pengguna tambahan. Setiap pengguna memiliki ruang sendiri, yang dapat disesuaikan dengan aplikasi, wallpaper milik mereka, dan lain sebagainya. Pengguna juga dapat menyesuaikan setelan perangkat seperti Wi‑Fi yang memengaruhi semua orang.\n\nSaat Anda menambahkan pengguna baru, orang tersebut perlu menyiapkan ruang mereka.\n\nPengguna mana pun dapat memperbarui aplikasi untuk semua pengguna lainnya."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Anda dapat berbagi perangkat ini ke orang lain dengan membuat pengguna tambahan. Setiap pengguna memiliki ruang sendiri, yang dapat disesuaikan dengan aplikasi, wallpaper, dan lain sebagainya.\n\nSaat Anda menambahkan pengguna baru, maka pengguna tersebut perlu menyiapkan ruangnya.\n\nPengguna mana pun dapat memperbarui aplikasi untuk semua pengguna lainnya."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Saat Anda menambahkan pengguna baru, orang tersebut perlu menyiapkan ruang mereka sendiri.\n\nPengguna mana pun dapat memperbarui aplikasi untuk semua pengguna lain."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Siapkan pengguna sekarang?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Pastikan orang tersebut ada untuk mengambil perangkat dan menyiapkan ruangnya"</string>
@@ -2396,6 +2433,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"aplikasi ice darurat default"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"apl unduh aplikasi sistem"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"keamanan izin aplikasi"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"aplikasi default"</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>
@@ -2410,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume alarm"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume dering"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume pemberitahuan"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Blokir gangguan"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritas hanya mengizinkan"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Hanya izinkan prioritas"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Aturan otomatis"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Saat ada panggilan telepon dan 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_alarms" msgid="7380265858042606857">"Izinkan hanya alarm"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Jangan ganggu"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Hanya untuk prioritas"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Hanya alarm"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Tanpa gangguan"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Nada dering ponsel"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Nada dering pemberitahuan default"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Juga getar saat ada panggilan"</string>
@@ -2450,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Tidak ada pendengar pemberitahuan yang terpasang."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Aktifkan <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> akan dapat membaca semua pemberitahuan yang diposkan oleh sistem atau aplikasi apa pun yang terpasang, yang dapat meliputi informasi pribadi seperti nama kontak dan pesan teks yang dikirimkan kepada Anda. Pendengar pemberitahuan tersebut juga akan dapat menyingkirkan pemberitahuan ini atau menyentuh tombol tindakan di dalamnya."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Penyedia ketentuan"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Tidak ada aplikasi yang memberikan ketentuan"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d aplikasi memberikan ketentuan</item>
-      <item quantity="one">%d aplikasi memberikan ketentuan</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Tidak ada penyedia ketentuan yang dipasang."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Aktifkan <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> akan dapat menambah ketentuan keluar ke mode Jangan ganggu."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Memuat aplikasi..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokir semua"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Jangan pernah tampilkan pemberitahuan dari aplikasi ini"</string>
@@ -2472,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritas"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitif"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Nama aturan"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Tambahkan aturan"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Hapus aturan"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Hapus aturan \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Hapus"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Jenis aturan"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Tidak diketahui"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Konfigurasi aturan"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Aturan jadwal"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Aturan tidak ditemukan."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Hari"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Tidak ada"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Setiap hari"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Tidak pernah"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> sampai <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2492,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarm"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Pengingat"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Acara"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Penelepon yang dipilih"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Penelepon berulang"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Jika orang yang sama menelepon untuk kedua kalinya dalam waktu <xliff:g id="MINUTES">%d</xliff:g> menit, izinkan"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Otomatis aktif"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Tidak pernah"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Setiap malam"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> hari berikutnya"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Kapan Anda bisa diganggu?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Untuk berapa lama?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Untuk waktu yang tidak ditentukan"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> menit</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> menit</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> jam</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> jam</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Ubah ke mode notifikasi prioritas untuk waktu yang tidak ditentukan"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Ubah ke mode hanya notifikasi prioritas selama <xliff:g id="DURATION">%1$d</xliff:g> menit hingga <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Ubah ke mode hanya notifikasi prioritas selama satu menit hingga <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Ubah ke mode hanya notifikasi prioritas selama <xliff:g id="DURATION">%1$d</xliff:g> jam (hingga <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Ubah ke mode hanya notifikasi prioritas selama satu jam hingga <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Ubah ke mode hanya alarm untuk waktu yang tidak ditentukan"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Ubah ke mode hanya alarm selama <xliff:g id="DURATION">%1$d</xliff:g> menit (hingga <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Ubah ke mode hanya alarm selama satu menit hingga <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Ubah ke mode hanya alarm selama <xliff:g id="DURATION">%1$d</xliff:g> jam hingga <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Ubah ke mode hanya alarm selama satu jam hingga <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Ubah ke mode jangan ganggu untuk waktu yang tidak ditentukan"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Ubah ke mode jangan ganggu selama <xliff:g id="DURATION">%1$d</xliff:g> menit (hingga <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Ubah ke mode jangan ganggu selama satu menit hingga <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Ubah ke mode jangan ganggu selama <xliff:g id="DURATION">%1$d</xliff:g> jam hingga <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Ubah ke mode jangan ganggu selama satu jam hingga <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Ubah ke mode selalu ganggu"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"selamanya"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notifikasi 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>
@@ -2565,7 +2659,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> izin diberikan</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> izin diberikan</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> dari <xliff:g id="COUNT_3">%d</xliff:g> izin diberikan</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> dari <xliff:g id="COUNT_1">%d</xliff:g> izin diberikan</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Beberapa setelan default"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Tidak ada setelan default"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Semua aplikasi"</string>
@@ -2576,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritas"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensitif"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Dengan URL domain"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Menyetel ulang preferensi di semua aplikasi menjadi default"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> aplikasi dipasang, termasuk aplikasi sistem dan yang diunduh"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Dinonaktifkan oleh administrator"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Lanjutan"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplikasi tak dikenal"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Pilih Profil"</string>
@@ -2592,4 +2688,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikasi dapat membuka URL domainnya</item>
       <item quantity="one">Satu aplikasi dapat membuka URL domainnya</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Tidak dikenali"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Aplikasi Default"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Aplikasi browser"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Tidak ada Browser default"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Default)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-is-rIS/arrays.xml b/res/values-is-rIS/arrays.xml
index f0e23a8..1981a7c 100644
--- a/res/values-is-rIS/arrays.xml
+++ b/res/values-is-rIS/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Hnappur"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"lítið"</item>
     <item msgid="4212263919458209842">"á þrotum"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Slökkt"</item>
-    <item msgid="5656544177755411222">"Truflanir í lágmarki"</item>
-    <item msgid="8735337502532332056">"Engar truflanir"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Venjulegt"</item>
     <item msgid="866544120205026771">"Í meðallagi"</item>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 1ee844e..eb86a48 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kort"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Stillingar proxy-þjóns"</string>
     <string name="cancel" msgid="6859253417269739139">"Hætta við"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"HÆTTA VIÐ"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"HALDA ÁFRAM"</string>
     <string name="okay" msgid="1997666393121016642">"Í lagi"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"JÁ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NEI"</string>
-    <string name="forget" msgid="7267115980248732932">"GLEYMA"</string>
+    <string name="forget" msgid="1400428660472591263">"Gleyma"</string>
+    <string name="save" msgid="879993180139353333">"Vista"</string>
+    <string name="done" msgid="6942539184162713160">"Lokið"</string>
     <string name="settings_label" msgid="1626402585530130914">"Stillingar"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Stillingar"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Flýtileið stillinga"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Settu hleðslutækið í samband og reyndu aftur."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ekkert PIN-númer eða aðgangsorð fyrir lásskjá"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Þú þarft að velja PIN-númer eða aðgangsorð fyrir lásskjáinn til að geta hafið dulkóðun."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Þú þarft að teikna opnunarmynstrið til að staðfesta dulkóðun tækisins."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Dulkóða?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Dulkóðunaraðgerðin er óafturkræf og ef hún er trufluð glatar þú gögnum. Dulkóðun tekur allt frá einni klukkustund og á þeim tíma endurræsir spjaldtölvan sig nokkrum sinnum."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Dulkóðunaraðgerðin er óafturkræf og ef hún er trufluð glatar þú gögnum. Dulkóðun tekur allt frá einni klukkustund og á þeim tíma endurræsir síminn sig nokkrum sinnum."</string>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Ítarlegt"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Ítarlegar Bluetooth-stillingar"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Þegar kveikt er á Bluetooth getur tækið átt í samskiptum við önnur nálæg Bluetooth tæki."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"Til þess að auka staðsetningarnákvæmni leitar Google að Bluetooth-tækjum, jafnvel þegar slökkt er á Bluetooth. Þú getur breytt þessu í LINK_BEGINleitarstillingunumLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Til þess að auka staðsetningarnákvæmni leita forrit og þjónustur að Bluetooth-tækjum, jafnvel þegar slökkt er á Bluetooth. Þú getur breytt þessu í <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>leitarstillingunum<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Tengjast…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verður aftengt frá hljóði efnisspilunar."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verður aftengt frá hljóði handfrjáls búnaðar."</string>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"Til þess að auka staðsetningarnákvæmni leitar Google að Wi-Fi netum, jafnvel þegar slökkt er á Wi-Fi. Þú getur breytt þessu í LINK_BEGINleitarstillingunumLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Til þess að auka staðsetningarnákvæmni leita forrit og þjónustur að Wi-Fi netum, jafnvel þegar slökkt er á Wi-Fi. Þú getur breytt þessu í <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>leitarstillingunum<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ekki sýna þetta aftur"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Hafa kveikt á Wi-Fi í biðstöðu"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Kveikt á Wi-Fi í svefnstöðu"</string>
@@ -604,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Leita"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Ítarlegt"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Sýna forrit"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Sýna styrk Wi-Fi"</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>
@@ -663,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Viltu skrá þig inn til að tengjast?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> krefst þess að þú skráir þig inn á netinu áður en þú tengist þessu netkerfi."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"TENGJA"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Engin internetaðgangur er á þessu neti. Viltu samt nota það?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Ekki spyrja aftur fyrir þetta net"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Tengjast"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Ekk tókst að tengjast neti"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Gleyma"</string>
@@ -729,21 +726,17 @@
     <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> heitur Wi‑Fi reitur"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi símtöl"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Forgangur símtala"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi símtöl"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi í forgangi"</item>
     <item msgid="5267397515594230396">"Farsímakerfi í forgangi"</item>
-    <item msgid="3132912693346866895">"Wi-Fi eingöngu"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Þegar kveikt er á Wi-Fi símtölum getur síminn beint símtölum um Wi-Fi net eða kerfi símafyrirtækisins, eftir því hvað þú velur og hvor tengingin er betri. Kannaðu verðskrá og aðrar upplýsingar hjá símafyrirtækinu þínu áður en þú kveikir á þessu."</string>
     <string name="home_settings" msgid="212375129455718176">"Heim"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skjár"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Hljóð"</string>
@@ -915,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Laust (skrifvarið)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Heildarrými"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Reiknar út…"</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Forrit (gögn forrita og margmiðlunarefni)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Forrit og forritsgögn"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Margmiðlun"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Niðurhal"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Myndir, myndskeið"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Hljóð (tónlist, hringitónar, hlaðvarpsskrár o.s.frv.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Ýmislegt"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Aðrar skrár"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Gögn í skyndiminni"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Aftengja samnýtta geymslu"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Aftengja SD-kort"</string>
@@ -953,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Aftenging fer fram"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Geymslurýmið er senn á þrotum"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Sumar kerfisaðgerðir, svo sem samstilling, virka hugsanlega ekki rétt. Prófaðu að losa um pláss með því að eyða eða losa atriði á borð við forrit eða margmiðlunarefni."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Endurnefna"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Tengja"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Aftengja"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Eyða og forsníða"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Eyða og forsníða sem innbyggða geymslu"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB-tenging tölvu"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-tenging tölvu"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Tengja sem"</string>
@@ -963,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Gerir MIDI-forritum kleift að virka yfir USB með MIDI-hugbúnaði í tölvunni."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Aðrir notendur"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Geymsla tækis"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Tengd geymsla"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> laus (<xliff:g id="TOTAL">%2$s</xliff:g> samtals)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> var tengt"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Ekki var hægt að tengja <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> var aftengt á öruggan hátt"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Ekki var hægt að aftengja <xliff:g id="NAME">%1$s</xliff:g> á öruggan hátt"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> var forsniðið"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Ekki var hægt að forsníða <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Endurnefna geymslu"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Þegar búið er að forsníða þetta <xliff:g id="NAME_0">^1</xliff:g> geturðu notað það í öðrum tækjum. \n\nÖllum gögnum á þessu <xliff:g id="NAME_1">^1</xliff:g> verður eytt. Þú ættir að afrita gögnin af því fyrst. \n\n"<b>"Taktu afrit af myndum og öðru efni"</b>" \nFærðu skrárnar þínar yfir í aðra geymslu í þessu tæki eða flyttu þær yfir í tölvu með því að nota USB-snúru. \n\n"<b>"Taktu afrit af forritum"</b>" \nÖll forrit sem vistuð eru á þessu <xliff:g id="NAME_6">^1</xliff:g> verða fjarlægð og gögnum þeirra eytt. Til að halda þessum forritum skaltu færa þau yfir í aðra geymslu í þessu tæki."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Þegar þú tekur þetta <xliff:g id="NAME_0">^1</xliff:g> úr hætta forrit sem eru vistuð á því að virka og skrár á því verða ekki aðgengilegar fyrr en það er sett aftur í."</b>" \n\nÞetta <xliff:g id="NAME_1">^1</xliff:g> er forsniðið þannig að það virkar aðeins í þessu tæki. Það virkar ekki í neinu öðru tæki."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Setja upp <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Nota sem færanlega geymslu"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Til að færa myndir og aðrar skrár milli tækja."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Nota sem innbyggða geymslu"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Aðeins til geymslu í þessu tæki, s.s. á forritum og myndum. Þarf að forsníða til að ekki sé hægt að nota það í öðrum tækjum."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Forsníða sem innri geymslu"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Þetta krefst þess að <xliff:g id="NAME_0">^1</xliff:g> sé forsniðið til að gera það öruggt. \n\nÞegar búið er að forsníða <xliff:g id="NAME_1">^1</xliff:g> virkar það bara í þessu tæki. \n\n"<b>"Þetta eyðir öllum gögnum sem vistuð eru á <xliff:g id="NAME_2">^1</xliff:g>."</b>" Til að forðast að þessi gögn glatist þarftu að taka öryggisafrit af þeim."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Hreinsa og forsníða"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Forsníður <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Ekki fjarlægja <xliff:g id="NAME">^1</xliff:g> á meðan verið er að forsníða það."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Færðu gögn í nýja geymslu"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Þú getur flutt myndir, skrár og forritsgögn yfir á þetta nýja <xliff:g id="NAME">^1</xliff:g>. \n\nFlutningurinn tekur um það bil <xliff:g id="TIME">^2</xliff:g> og mun losa um <xliff:g id="SIZE">^3</xliff:g> af innra geymsluplássi. Sum forrit virka ekki meðan á flutningi stendur."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Færa núna"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Færa síðar"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Færa gögn núna"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Flutningurinn tekur um það bil <xliff:g id="TIME">^1</xliff:g>. Hann mun losa um <xliff:g id="SIZE">^2</xliff:g> af innra geymsluplássi."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Færa"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Færir gögn…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Meðan á flutningi stendur: \n• Ekki fjarlægja <xliff:g id="NAME">^1</xliff:g>. \n• Sum forrit munu ekki starfa rétt. \n• Hafðu tækið í hleðslu."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> er tilbúið"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> er nú tilbúið til notkunar með myndunum þínum og öðrum skrám."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> er tilbúið. \n\nTil að færa myndir, skrár og forritsgögn yfir í þetta tæki skaltu fara í Stillingar &gt; Geymsla."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Færa <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Það tekur bara smástund að færa <xliff:g id="APP">^1</xliff:g> og meðfylgjandi gögn yfir á <xliff:g id="NAME_0">^2</xliff:g>. Þú getur ekki notað forritið fyrr en að flutningi loknum. \n\nEkki fjarlægja <xliff:g id="NAME_1">^2</xliff:g> meðan á flutningi stendur."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Færir <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Ekki fjarlægja <xliff:g id="NAME">^1</xliff:g> á meðan flutningur stendur yfir. \n\n<xliff:g id="APP">^2</xliff:g> forritið í þessu tæki verður ekki aðgengilegt fyrr en að flutningi loknum."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Hætta við flutning"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Staða rafhlöðu"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Staða rafhlöðu"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Aðgangsstaðir"</string>
@@ -1007,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Núllstilla"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Sjálfgefnar stillingar aðgangsstaðar endurheimtar."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Netstillingar endurstilltar"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Þetta færir allar stillingar sem tengjast netum aftur í sjálfgildi framleiðanda, þar á meðal:\n\n"<li>"Wi-Fi"</li>\n<li>"Farsímagögn"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Þetta endurstillir allar netstillingar, þar á meðal:\n\n"<li>"Wi‑Fi"</li>\n<li>"Farsímagögn"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Endurstilla stillingar"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Endurstilla allar netstillingar? Ekki er hægt að afturkalla þessa aðgerð."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Endurstilla allar netstillingar? Ekki er hægt að afturkalla þessa aðgerð."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Endurstilla stillingar"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Þú þarft að teikna opnunarmynstrið til að staðfesta endurstillingu netstillinga."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Endurstilla?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Netstillingar endurstilltar"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Netstillingar voru endurstilltar"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Endurstilla tæki"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Núllstilling"</string>
     <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>
@@ -1029,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Eyða öllum gögnum á SD-korti, svo sem tónlist eða ljósmyndum"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Endurstilla spjaldtölvuna"</string>
     <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_desc" msgid="1062841478823409667">"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_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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Núllstilling er ekki í boði fyrir þennan notanda"</string>
@@ -1048,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Setja upp talhólf, framsendingu símtala, símtöl í bið, númerabirtingu"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-tjóðrun"</string>
@@ -1081,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjálp"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Farsímakerfi"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Farsímaáskrift"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Sjálfgefið SMS-forrit"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS-forrit"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Skipta um SMS-forrit?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Nota <xliff:g id="NEW_APP">%1$s</xliff:g> í stað <xliff:g id="CURRENT_APP">%2$s</xliff:g> sem SMS-forrit?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Nota <xliff:g id="NEW_APP">%s</xliff:g> sem SMS-forrit?"</string>
@@ -1112,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Nota GPS til að ákvarða staðsetningu"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Skönnun"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skönnun"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi leit"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Auktu staðsetningarnákvæmni með því að leyfa forritum og þjónustum að leita að Wi-Fi netum, jafnvel þegar slökkt er á Wi-Fi"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth-leit"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Bættu staðsetningarnákvæmni með því að leyfa kerfisþjónustum að leita að Bluetooth-tækjum, jafnvel þegar slökkt er á Bluetooth"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Staðsetning með Wi-Fi og farsímakerfi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Leyfir forritum að nota þjónustu Google fyrir hraðvirkari staðsetningarákvörðun. Nafnlausar upplýsingar verða sendar til Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fi ákvarðar staðsetningu"</string>
@@ -1157,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Aðgangsorð hefur verið valið"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-númer var valið"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Mynstur hefur verið valið"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Teiknaðu mynstrið þitt fyrir tækið til að halda áfram."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Sláðu inn PIN-númerið þitt fyrir tækið til að halda áfram."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Sláðu inn aðgangsorðið þitt fyrir tækið til að halda áfram."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Rangt PIN-númer"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Rangt aðgangsorð"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Rangt mynstur"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Öryggi tækis"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Breyta opnunarmynstri"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Breyta PIN-númeri til að opna"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Staðfestu vistað mynstur"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Reyndu aftur:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Teiknaðu opnunarmynstur"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Ýttu á valmyndartakkann til að fá hjálp."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Slepptu fingrinum þegar þú ert búin(n)"</string>
@@ -1183,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Velja opnunarmynstur"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Breyta opnunarmynstri"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Hvernig opnunarmynstur er teiknað"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Of margar misheppnaðar tilraunir!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Reyndu aftur eftir <xliff:g id="NUMBER">%d</xliff:g> sekúndur."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Of margar misheppnaðar tilraunir. Reyndu aftur eftir <xliff:g id="NUMBER">%d</xliff:g> sekúndur."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Forritið er ekki uppsett í símanum."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Stjórna forritum"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Stjórna og fjarlægja upsett forrit"</string>
@@ -1235,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Raða eftir stærð"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Sýna þjónustur í gangi"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Sýna vinnslur í skyndiminni"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Neyðarforrit"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Endurstilla stillingar forrits"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Endurstilla stillingar forrita?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Þetta endurstillir allar stillingar fyrir:\n\n "<li>"Óvirk forrit"</li>\n" "<li>"Óvirkar tilkynningar forrita"</li>\n" "<li>"Sjálfgefin forrit aðgerða"</li>\n" "<li>"Gagnatakmarkanir forrita í bakgrunni"</li>\n" "<li>"Takmarkanir á heimildum"</li>\n\n" Þú glatar engum fyrirliggjandi forritagögnum."</string>
@@ -1440,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Fanga alla HCI-pakka Bluetooth í skrá"</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="select_logd_size_title" msgid="7433137108348553508">"Annálsritastærðir biðminna"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 klukkustundir"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dagur"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Sýna kerfi"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Fela kerfi"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Nota USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tegund tölfræði"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Bakgrunnur"</string>
@@ -1838,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Núverandi aðgangsorð:"</string>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Notandi"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Takmarkað snið"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Bæta nýjum notanda við?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Þú getur búið til fleiri notendur til að deila þessu tæki með öðrum. Hver notandi hefur sitt eigið svæði sem viðkomandi getur sérsniðið með eigin forritum, veggfóðri o.s.frv. Notendur geta einnig breytt þeim stillingum tækisins sem hafa áhrif á alla notendur, t.d. Wi-Fi.\n\nÞegar þú bætir nýjum notanda við þarf sá notandi að setja upp svæðið sitt.\n\nHvaða notandi sem er getur uppfært forrit fyrir alla aðra notendur."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Þú getur búið til fleiri notendur til að deila þessu tæki með öðrum. Hver notandi hefur sitt eigið svæði sem viðkomandi getur sérsniðið með forritum, veggfóðri o.s.frv. Notendur geta einnig breytt þeim stillingum tækisins sem hafa áhrif á alla notendur, t.d. Wi-Fi.\n\nÞegar þú bætir nýjum notanda við þarf sá notandi að setja upp svæðið sitt.\n\nHvaða notandi sem er getur uppfært forrit fyrir alla aðra notendur."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Þegar þú bætir nýjum notanda við þarf sá notandi að setja upp svæðið sitt.\n\nHvaða notandi sem er getur uppfært forrit fyrir alla aðra notendur."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Setja notanda upp núna?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Gakktu úr skugga um að notandinn geti tekið tækið og sett upp sitt svæði"</string>
@@ -2393,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"takmörkun takmarka takmarkað"</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_reset_apps" msgid="6420313678620788457">"endurstilla stillingar sjálfgildi"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"sjálfgefið ICE-neyðarforrit"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"forrit sækja niðurhal kerfi"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"öryggi forritsheimilda"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"sjálfgefin forrit"</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>
@@ -2411,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Hljóðstyrkur vekjara"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Hljóðstyrkur hringingar"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Hljóðstyrkur tilkynninga"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Loka á truflanir"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Aðeins forgangsheimildir"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Sjálfvirkar reglur"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Þegar símtöl og 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_alarms" msgid="7380265858042606857">"Leyfa aðeins vekjara"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ekki trufla"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Aðeins forgangur"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Aðeins vekjarar"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Engar truflanir"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Hringitónn síma"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Sjálfgefinn hringitónn tilkynninga"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Titra líka fyrir símtöl"</string>
@@ -2451,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Engin tilkynningahlustun er uppsett."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Virkja <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> mun geta lesið allar tilkynningar frá kerfinu eða uppsettum forritum, sem kunna að innihalda persónuupplýsingar á borð við nöfn tengiliða og texta skilaboða sem þú færð. Það mun einnig geta hunsað þessar tilkynningar eða valið aðgerðahnappa innan þeirra."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Skilyrðaveitur"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Engin forrit setja skilyrði"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="one">%d forrit setur skilyrði</item>
-      <item quantity="other">%d forrit setja skilyrði</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Engar skilyrðaveitur eru uppsettar."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Gera <xliff:g id="SERVICE">%1$s</xliff:g> virkt?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> getur bætt lokaskilyrðum við stillinguna „Ónáðið ekki“."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Hleður forrit..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Útiloka allt"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Birta aldrei tilkynningar úr þessu forriti"</string>
@@ -2473,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Forgangur"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Viðkvæmt"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Heiti reglu"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Bæta við reglu"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Eyða reglu"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Eyða reglunni „<xliff:g id="RULE">%1$s</xliff:g>“?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Eyða"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Tegund reglu"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Óþekkt"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Stilla reglu"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Dagskrárregla"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Regla fannst ekki."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dagar"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Ekkert"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Á hverjum degi"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Aldrei"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> til <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2493,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Vekjarar"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Áminningar"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Viðburðir"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Valdir hringjendur"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Hringt endurtekið"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Leyfa símtal ef sami aðili hringir aftur innan <xliff:g id="MINUTES">%d</xliff:g> mínútna"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Kveikja sjálfkrafa"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Aldrei"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Á hverju kvöldi"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> daginn eftir"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Hvenær viltu fá truflun?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Hversu lengi?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Án tímatakmarkana"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> mínúta</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> mínútur</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> klukkustund</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> klukkustundir</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Breyta í forgangstruflanir eingöngu til frambúðar"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Breyta í forgangstruflanir eingöngu í <xliff:g id="DURATION">%1$d</xliff:g> mínútu til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Breyta í forgangstruflanir eingöngu í <xliff:g id="DURATION">%1$d</xliff:g> mínútur til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Breyta í forgangstruflanir eingöngu í <xliff:g id="DURATION">%1$d</xliff:g> klukkustund (til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Breyta í forgangstruflanir eingöngu í <xliff:g id="DURATION">%1$d</xliff:g> klukkustundir (til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Breyta í vekjara eingöngu til frambúðar"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">Breyta í vekjara eingöngu í <xliff:g id="DURATION">%1$d</xliff:g> mínútu (til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Breyta í vekjara eingöngu í <xliff:g id="DURATION">%1$d</xliff:g> mínútur (til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="one">Breyta í vekjara eingöngu í <xliff:g id="DURATION">%1$d</xliff:g> klukkustund til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Breyta í vekjara eingöngu í <xliff:g id="DURATION">%1$d</xliff:g> klukkustundir til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Breytar í engar truflanir til frambúðar"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Breyta í engar truflanir í <xliff:g id="DURATION">%1$d</xliff:g> mínútu (til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Breyta í engar truflanir í <xliff:g id="DURATION">%1$d</xliff:g> mínútur (til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Breyta í engar truflanir í <xliff:g id="DURATION">%1$d</xliff:g> klukkustund til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Breyta í engar truflanir í <xliff:g id="DURATION">%1$d</xliff:g> klukkustundir til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Breyta í truflanir alltaf"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"til frambúðar"</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>
@@ -2566,7 +2659,10 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> heimild veitt</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> heimildir veittar</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> heimild af <xliff:g id="COUNT_3">%d</xliff:g> veitt</item>
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> heimildir af <xliff:g id="COUNT_3">%d</xliff:g> veittar</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Einhver sjálfgildi valin"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Engin sjálfgildi valin"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Öll forrit"</string>
@@ -2577,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Forgangur"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Viðkvæmt"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Með vefslóðum léns"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Endurstilla stillingar allra forrita í sjálfgildi sín"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> forrit uppsett, þar með talin kerfisforrit og sótt forrit"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Stjórnandi gerði óvirkt"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Ítarlegt"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Óþekkt forrit"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Veldu snið"</string>
@@ -2593,4 +2688,11 @@
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> forrit getur opnað vefslóðir lénsins síns</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> forrit geta opnað vefslóðir lénsins síns</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Þekktist ekki"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Sjálfgefin forrit"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Vafraforrit"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Enginn sjálfgefinn vafri"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Sjálfgefið)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index e3876b1..5e7a880 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Pulsante di comando"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"Contenuti multimediali"</item>
     <item msgid="7924928667052300589">"Dispositivo"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"posizione approssimativa"</item>
+    <item msgid="5789673140227507995">"posizione precisa"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibrazione"</item>
+    <item msgid="3434165993711230924">"lettura contatti"</item>
+    <item msgid="616161687718081936">"modifica dei contatti"</item>
+    <item msgid="7638002295329050091">"lettura del registro chiamate"</item>
+    <item msgid="6546959730920410907">"modifica del registro chiamate"</item>
+    <item msgid="446877710771379667">"lettura calendario"</item>
+    <item msgid="7674458294386319722">"modifica del calendario"</item>
+    <item msgid="8281201165558093009">"scansione Wi-Fi"</item>
+    <item msgid="8694611243479480497">"notifica"</item>
+    <item msgid="7776439107987345446">"scansione cell"</item>
+    <item msgid="514615766544675057">"chiamate telefono"</item>
+    <item msgid="8181415497109310680">"lettura SMS"</item>
+    <item msgid="6816551144382117307">"scrittura SMS"</item>
+    <item msgid="4600463921908905030">"ricezione SMS"</item>
+    <item msgid="5958926493289432745">"ricezione SMS di emergenza"</item>
+    <item msgid="4945269495221089540">"ricezione MMS"</item>
+    <item msgid="5570472453573929087">"ricezione push WAP"</item>
+    <item msgid="7125408150230860501">"invio SMS"</item>
+    <item msgid="7080337936612188061">"lettura SMS ICC"</item>
+    <item msgid="587124103118495063">"scrittura SMS ICC"</item>
+    <item msgid="2320577158869025503">"modifica delle impostazioni"</item>
+    <item msgid="1545733463471924009">"traccia in alto"</item>
+    <item msgid="3609046903962454582">"accesso a notifiche"</item>
+    <item msgid="4671646036128214513">"fotocamera"</item>
+    <item msgid="1097324338692486211">"registrazione audio"</item>
+    <item msgid="5031552983987798163">"riproduzione audio"</item>
+    <item msgid="8374996688066472414">"lettura degli appunti"</item>
+    <item msgid="3045529469061083747">"modifica degli appunti"</item>
+    <item msgid="5124443975763747838">"pulsanti contenuti multimediali"</item>
+    <item msgid="4547883971364273343">"focus audio"</item>
+    <item msgid="2603878814882344450">"volume principale"</item>
+    <item msgid="7136963238377062018">"volume voce"</item>
+    <item msgid="4270236897655923007">"volume suoneria"</item>
+    <item msgid="6325739889222559394">"volume contenuti multimediali"</item>
+    <item msgid="5762123934816216821">"volume sveglia"</item>
+    <item msgid="785049718065337473">"volume notifiche"</item>
+    <item msgid="6700305533746877052">"volume bluetooth"</item>
+    <item msgid="2029227495214047094">"mantieni attivo"</item>
+    <item msgid="26109888160231211">"monitora posizione"</item>
+    <item msgid="5753382310468855812">"monitora localizzazione a consumo elevato"</item>
+    <item msgid="3356591542543137332">"ricevi statistiche sull\'utilizzo"</item>
+    <item msgid="3073734345226842233">"attiva/disattiva microfono"</item>
+    <item msgid="1148142988678569310">"elementi multimediali dei progetti"</item>
+    <item msgid="9130014005474445273">"attiva VPN"</item>
+    <item msgid="1165192162975045562">"scrivi sfondo"</item>
+    <item msgid="7129487923652967258">"struttura evento indiretto"</item>
+    <item msgid="1069023208100114540">"screenshot evento indiretto"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Posizione"</item>
+    <item msgid="8677040780775113033">"Posizione"</item>
+    <item msgid="1660743989948992916">"Posizione"</item>
+    <item msgid="8791172739860195290">"Vibrazione"</item>
+    <item msgid="383413555642128046">"Lettura contatti"</item>
+    <item msgid="3654594895269697313">"Modifica dei contatti"</item>
+    <item msgid="7928393476362362538">"Lettura del registro chiamate"</item>
+    <item msgid="6248591205254641116">"Modifica del registro chiamate"</item>
+    <item msgid="6093344633066170692">"Lettura calendario"</item>
+    <item msgid="1334886368750347692">"Modifica del calendario"</item>
+    <item msgid="1638204101698708656">"Posizione"</item>
+    <item msgid="2154671955760380322">"Pubblicazione notifica"</item>
+    <item msgid="4282477730595931828">"Posizione"</item>
+    <item msgid="4891423912898525905">"Chiamate telefono"</item>
+    <item msgid="2623604824935968113">"Lettura di SMS/MMS"</item>
+    <item msgid="4420177125221176306">"Scrittura di SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Ricezione SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Ricezione SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Ricezione SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Ricezione SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Invio SMS/MMS"</item>
+    <item msgid="3527273606643794973">"Lettura di SMS/MMS"</item>
+    <item msgid="4370895547001583812">"Scrittura di SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Modifica delle impostazioni"</item>
+    <item msgid="736541391767350377">"Traccia in alto"</item>
+    <item msgid="5530815681721654194">"Accesso a notifiche"</item>
+    <item msgid="781213371706962767">"Fotocamera"</item>
+    <item msgid="1720492593061838172">"Registrazione audio"</item>
+    <item msgid="3493046322001257041">"Riproduzione audio"</item>
+    <item msgid="136815868796597058">"Lettura degli appunti"</item>
+    <item msgid="5238692940326972503">"Modifica degli appunti"</item>
+    <item msgid="5753789168376302997">"Pulsanti contenuti multimediali"</item>
+    <item msgid="3265262911688671938">"Focus audio"</item>
+    <item msgid="2098976479485046797">"Volume principale"</item>
+    <item msgid="5660213838861789350">"Volume voce"</item>
+    <item msgid="7983336752371254444">"Volume suoneria"</item>
+    <item msgid="7878027809189330917">"Volume contenuti multimediali"</item>
+    <item msgid="7260546305036218513">"Volume sveglia"</item>
+    <item msgid="9103719301075748925">"Volume notifiche"</item>
+    <item msgid="7025966722295861512">"Volume Bluetooth"</item>
+    <item msgid="4665183401128289653">"Mantieni attivo"</item>
+    <item msgid="8584357129746649222">"Posizione"</item>
+    <item msgid="7669257279311110599">"Geolocalizzazione"</item>
+    <item msgid="3459320345690097795">"Ricevi statistiche sull\'utilizzo"</item>
+    <item msgid="1312534577834048535">"Attiva/disattiva microfono"</item>
+    <item msgid="5906017727368097853">"Elementi multimediali dei progetti"</item>
+    <item msgid="2486614710846178542">"Attiva VPN"</item>
+    <item msgid="5586547561693629602">"Scrivi sfondo"</item>
+    <item msgid="32794179825485062">"Struttura evento indiretto"</item>
+    <item msgid="7872852746938272552">"Screenshot evento indiretto"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Breve"</item>
     <item msgid="2560532955514699713">"Medio"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"basso"</item>
     <item msgid="4212263919458209842">"critico"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Disattivata"</item>
-    <item msgid="5656544177755411222">"Interruzioni limitate"</item>
-    <item msgid="8735337502532332056">"Zero interruzioni"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normale"</item>
     <item msgid="866544120205026771">"Moderata"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 62f3e33..9872f98 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Scheda SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Impostazioni proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Annulla"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ANNULLA"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUA"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"SÌ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NO"</string>
-    <string name="forget" msgid="7267115980248732932">"ELIMINA"</string>
+    <string name="forget" msgid="1400428660472591263">"Elimina"</string>
+    <string name="save" msgid="879993180139353333">"Salva"</string>
+    <string name="done" msgid="6942539184162713160">"Fine"</string>
     <string name="settings_label" msgid="1626402585530130914">"Impostazioni"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Impostazioni"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Scorciatoia Impostazioni"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Collega il caricabatterie e riprova."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nessun PIN/password di blocco dello schermo"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Devi impostare un PIN o una password di blocco dello schermo per poter iniziare la crittografia."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Devi tracciare la sequenza di sblocco per confermare la crittografia del dispositivo."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Crittografare?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"L\'operazione di crittografia non è reversibile e la sua interruzione causerà la perdita di dati. La crittografia richiede almeno un\'ora, durante la quale il tablet verrà riavviato diverse volte."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"L\'operazione di crittografia non è reversibile e la sua interruzione causerà la perdita di dati. La crittografia richiede almeno un\'ora, durante la quale il telefono verrà riavviato diverse volte."</string>
@@ -419,8 +416,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Sequenza"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Password"</string>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Dopo aver impostato il blocco schermo, puoi anche impostare la tua impronta digitale in Impostazioni e sicurezza."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Disattiva blocco schermo"</string>
     <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>
@@ -522,8 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avanzate"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth avanzato"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Quando il Bluetooth è attivato, il dispositivo può comunicare con altri dispositivi che si trovano nelle vicinanze."</string>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Per una maggiore precisione della localizzazione, le app e i servizi cercheranno dispositivi Bluetooth nelle vicinanze, anche quando il Bluetooth non è attivo. Puoi modificare questa impostazione nelle <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>impostazioni di ricerca<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Connessione a…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verrà disconnesso dall\'audio multimediale."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verrà disconnesso dall\'audio vivavoce."</string>
@@ -589,8 +584,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Per una maggiore precisione della localizzazione, le app e i servizi cercheranno reti Wi-Fi nelle vicinanze, anche quando la connessione Wi-Fi non è attiva. Puoi modificare questa impostazione nelle <xliff:g id="LINK_END_1">LINK_END</xliff:g>impostazioni di ricerca<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Non mostrare più"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Tieni attivo Wi‑Fi durante sospensione"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi attivo in sospensione"</string>
@@ -607,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scansione"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avanzate"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Mostra app"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Mostra intensità Wi-Fi"</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>
@@ -666,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Accedere per connettersi?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> richiede di accedere online per potersi collegare alla rete."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONNETTI"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Questa rete non ha accesso a Internet. Utilizzare questa rete comunque?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Non chiedermelo più per questa rete"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connetti"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Impossibile connettersi alla rete"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Elimina"</string>
@@ -732,21 +726,17 @@
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Hotspot Wi‑Fi <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> portatile"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"HotspotAndroid"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Chiamate Wi-Fi"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Preferenza di chiamata"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Modalità di chiamata Wi-Fi"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Reta preferita: Wi-Fi"</item>
     <item msgid="5267397515594230396">"Rete preferita: cellulare"</item>
-    <item msgid="3132912693346866895">"Solo Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Se le chiamate Wi-Fi sono attive, il tuo telefono può instradare le chiamate tramite reti Wi-Fi o la rete del tuo operatore, in base alle tue preferenze e alla potenza del segnale. Prima di attivare questa funzione, verifica tariffe e ulteriori dettagli con il tuo operatore."</string>
     <string name="home_settings" msgid="212375129455718176">"Home page"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Audio"</string>
@@ -918,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Disponibile (in sola lettura)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Spazio totale"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calcolo..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"App (dati di app e contenuti multimediali)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"App e dati delle app"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Supporti"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Download"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Foto, video"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (musica, suonerie, podcast e così via)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Vari"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Altri file"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Dati memorizzati nella cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Smonta archivio condiviso"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Smonta scheda SD"</string>
@@ -956,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Smontaggio in corso"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Spazio archiviazione in esaurim."</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Alcune funzioni di sistema, come la sincronizzazione, potrebbero non funzionare correttamente. Prova a liberare spazio eliminando o sbloccando elementi, come applicazioni o contenuti multimediali."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Rinomina"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Monta"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Espelli"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Resetta e formatta"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Resetta e formatta memoria interna"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Connessione computer USB"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Connessione computer USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Connetti come"</string>
@@ -966,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Consente alle applicazioni MIDI di funzionare tramite USB con software MIDI sul computer."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Altri utenti"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Memoria dispositivo"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Archivio rimovibile"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> liberi (<xliff:g id="TOTAL">%2$s</xliff:g> totali)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> montata"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Impossibile montare la <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"Espulsione della <xliff:g id="NAME">%1$s</xliff:g> eseguita in modo sicuro"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Impossibile espellere in modo sicuro la <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"Formattazione della <xliff:g id="NAME">%1$s</xliff:g> eseguita"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Impossibile formattare la <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Rinomina memoria"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Dopo la formattazione potrai utilizzare questa <xliff:g id="NAME_0">^1</xliff:g> in altri dispositivi. \n\nTutti i dati della <xliff:g id="NAME_1">^1</xliff:g> verranno cancellati. Potresti effettuare il backup prima. \n\n"<b>"Effettua il backup di foto e altri contenuti multimediali"</b>" \nSposta i file multimediali sulla memoria alternativa di questo dispositivo, oppure trasferiscili su un computer utilizzando un cavo USB. \n\n"<b>"Effettua il backup delle app"</b>" \nTutte le app memorizzate su questa <xliff:g id="NAME_6">^1</xliff:g> verranno disinstallate e i relativi dati verranno cancellati. Per tenere queste app, spostale sulla memoria alternativa del dispositivo."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Se espelli questa <xliff:g id="NAME_0">^1</xliff:g>, le app memorizzate non funzioneranno più e i file multimediali memorizzati non saranno disponibili fino all\'inserimento della scheda."</b>" \n\nQuesta <xliff:g id="NAME_1">^1</xliff:g> è supportata soltanto su questo dispositivo pertanto non funzionerà su altri dispositivi."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configura la tua <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utilizza come memoria portatile"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Per spostare foto e altri contenuti multimediali da un dispositivo all\'altro"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Utilizza come memoria interna"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Per memorizzare tutti i contenuti soltanto su questo dispositivo, incluse app e foto. È necessario formattare la memoria per evitare che funzioni con altri dispositivi."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatta memoria interna"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"È necessario formattare la <xliff:g id="NAME_0">^1</xliff:g> per proteggerla. \n\nDopo la formattazione, questa <xliff:g id="NAME_1">^1</xliff:g> funzionerà soltanto in questo dispositivo. \n\n"<b>"La formattazione cancella tutti i dati attualmente memorizzati sulla <xliff:g id="NAME_2">^1</xliff:g>."</b>" Per evitare di perdere i dati, effettua il backup."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Resetta e formatta"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formattazione della <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Non rimuovere la <xliff:g id="NAME">^1</xliff:g> durante la formattazione."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Sposta dati nella nuova memoria"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Puoi spostare foto, file e dati delle app su questa nuova <xliff:g id="NAME">^1</xliff:g>. \n\nLo spostamento richiede circa <xliff:g id="TIME">^2</xliff:g> e verranno liberati <xliff:g id="SIZE">^3</xliff:g> di memoria interna. Alcune app non funzioneranno durante la procedura."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Sposta ora"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Sposta più tardi"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Sposta ora i dati"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Lo spostamento richiede circa <xliff:g id="TIME">^1</xliff:g>. Verranno liberati <xliff:g id="SIZE">^2</xliff:g> di memoria interna."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Sposta"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Spostamento dei dati…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Durante lo spostamento: \n• Non rimuovere la <xliff:g id="NAME">^1</xliff:g>. \n• Alcune app non funzioneranno correttamente. \n• Il dispositivo deve essere sempre carico."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"La <xliff:g id="NAME">^1</xliff:g> è pronta"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"La tua <xliff:g id="NAME">^1</xliff:g> è pronta per memorizzare foto e altri contenuti multimediali."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"La tua nuova <xliff:g id="NAME">^1</xliff:g> è attiva. \n\nPer spostare foto, file e dati delle app su questo dispositivo, seleziona Impostazioni &gt; Memoria."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Sposta <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Lo spostamento dell\'app <xliff:g id="APP">^1</xliff:g> e dei relativi dati sulla <xliff:g id="NAME_0">^2</xliff:g> sarà veloce. Potrai utilizzare l\'app soltanto al termine dello spostamento. \n\nNon rimuovere la <xliff:g id="NAME_1">^2</xliff:g> durante lo spostamento."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Spostamento dell\'app <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Non rimuovere la <xliff:g id="NAME">^1</xliff:g> durante lo spostamento. \n\nL\'app <xliff:g id="APP">^2</xliff:g> su questo dispositivo sarà disponibile soltanto al termine dello spostamento."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Annulla spostamento"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Stato batteria"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Livello batteria"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1010,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Ripristina impostazioni predefinite"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Ripristino delle impostazioni APN predefinite completato."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Reimpostazione della rete"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Questa operazione determina il ripristino delle impostazioni predefinte di fabbrica per la rete, di conseguenza riguarda anche le seguenti opzioni: \n\n"<li>"Wi-Fi"</li>\n<li>"Dati mobili"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Verranno reimpostate tutte le impostazioni di rete, tra cui:\n\n"<li>"Wi‑Fi"</li>\n<li>"Dati mobili"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Reimposta impostazioni"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Reimpostare tutte le impostazioni di rete? L\'operazione non potrà essere annullata."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Reimpostare tutte le impostazioni di rete? Questa azione è irreversibile."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Reimposta impostazioni"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Devi tracciare la sequenza di sblocco per confermare la reimpostazione della rete."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Reimpostare?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Reimpostazione della rete"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Le impostazioni di rete sono state reimpostate"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Ripristina dispositivo"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Ripristino dati di fabbrica"</string>
     <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>
@@ -1032,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Cancella tutti i dati sulla scheda SD, come musica o foto"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Reimposta tablet"</string>
     <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_desc" msgid="1062841478823409667">"Cancellare tutte le informazioni personali e le app scaricate? Questa azione è irreversibile."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Cancella tutto"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Il ripristino dati di fabbrica non è consentito per questo utente"</string>
@@ -1051,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Imposta segreteria, deviazione chiamate, avviso di chiamata, ID chiamante"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering USB"</string>
@@ -1084,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Guida"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Reti cellulari"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Piano dati mobile"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"App SMS predefinita"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"App SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Cambiare app per gli SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Utilizzare <xliff:g id="NEW_APP">%1$s</xliff:g> anziché <xliff:g id="CURRENT_APP">%2$s</xliff:g> come app per gli SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Utilizzare <xliff:g id="NEW_APP">%s</xliff:g> come app per gli SMS?"</string>
@@ -1115,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utilizza il GPS per stabilire la posizione"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Ricerca"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Ricerca"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Ricerca di reti Wi-Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Migliora la localizzazione consentendo ad app e servizi di cercare reti Wi-Fi anche quando il Wi-Fi non è attivo"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Ricerca di dispositivi Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Migliora la localizzazione consentendo ai servizi di sistema di cercare dispositivi Bluetooth nelle vicinanze, anche quando il Bluetooth non è attivo"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Posiz. Wi‑Fi e rete cellulare"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Consenti alle app di usare localizzazione Google per stabilire la tua posizione. Saranno raccolti e inviati a Google dati anonimi."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Posizione determinata da Wi‑Fi"</string>
@@ -1160,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Password impostata"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN impostato"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Sequenza impostata"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Per continuare devi utilizzare la sequenza del dispositivo."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Per continuare devi inserire il PIN del dispositivo."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Per continuare devi inserire la password del dispositivo."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN errato"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Password errata"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Sequenza errata"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Sicurezza dispositivo"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Cambia sequenza sblocco"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Cambia PIN di sblocco"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Conferma sequenza salvata"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Riprova:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Inserisci una sequenza di sblocco"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Premi Menu per visualizzare la guida."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Solleva il dito al termine"</string>
@@ -1186,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Imposta sequenza"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Cambia sequenza di sblocco"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Procedura per l\'impostazione di una sequenza di sblocco"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Troppi tentativi errati."</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Riprova fra <xliff:g id="NUMBER">%d</xliff:g> secondi."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Troppi tentativi errati. Riprova fra <xliff:g id="NUMBER">%d</xliff:g> secondi."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Applicazione non installata sul telefono."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gestisci applicazioni"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestisci e rimuovi applicazioni installate"</string>
@@ -1238,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Ordina per dimensioni"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Mostra servizi in esecuzione"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Mostra processi nella cache"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"App di emergenza"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Reimposta preferenze app"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Reimpostare preferenze app?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Verranno reimpostate tutte le preferenze relative a:\n\n "<li>"App disattivate"</li>\n" "<li>"notifiche di app disattivate"</li>\n" "<li>"Applicazioni predefinite per azioni"</li>\n" "<li>"Limitazioni di dati in background per app"</li>\n" "<li>"Eventuali limitazioni di autorizzazione"</li>\n\n" Non perderai i dati delle app."</string>
@@ -1443,8 +1479,6 @@
     <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="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="select_logd_size_title" msgid="7433137108348553508">"Dimensioni buffer Logger"</string>
@@ -1745,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 ore"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 giorno"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Mostra sistema"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Nascondi sistema"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Utilizza Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipo di statistiche"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"In background"</string>
@@ -1841,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Password attuale:"</string>
@@ -2216,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Utente"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profilo con limitazioni"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Aggiungere un nuovo utente?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Puoi condividere il dispositivo con altre persone creando altri utenti. Ogni utente ha un proprio spazio personalizzabile con le app, gli sfondi e le altre opzioni che preferisce. Gli utenti possono anche regolare le impostazioni che riguardano tutti, come il Wi‑Fi.\n\nIl nuovo utente, una volta aggiunto, dovrà seguire una procedura di configurazione.\n\nQualsiasi utente può aggiornare le app per tutti gli altri utenti."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Puoi condividere il dispositivo con altre persone creando altri utenti. Ogni utente ha un proprio spazio personalizzabile con app, sfondi e così via. Gli utenti possono anche regolare le impostazioni del dispositivo che riguardano tutti, come il Wi‑Fi.\n\nIl nuovo utente, una volta aggiunto, dovrà configurare il suo spazio.\n\nQualsiasi utente può aggiornare le app per tutti gli altri utenti."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Il nuovo utente, una volta aggiunto, deve impostare il proprio spazio.\n\nQualsiasi utente può aggiornare le app per tutti gli altri."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurare l\'utente ora?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Assicurati che la persona sia disponibile a prendere il dispositivo e configurare il suo spazio"</string>
@@ -2396,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"limitazione limitare limitato"</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_reset_apps" msgid="6420313678620788457">"ripristino preferenze predefinite"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"app ice di emergenza predefinita"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"download app applicazioni sistema"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"sicurezza delle autorizzazioni app"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"impostazioni predefinite per le app"</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>
@@ -2414,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume sveglia"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume suoneria"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume notifiche"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Blocca interruzioni"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"La priorità consente solo"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Regole automatiche"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Quando ricevo chiamate e 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_alarms" msgid="7380265858042606857">"Consenti solo sveglie"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Non interrompere"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Solo con priorità"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Solo sveglie"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Nessuna interruzione"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Suoneria telefono"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Suoneria predefinita notifiche"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrazione anche per chiamate"</string>
@@ -2454,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Nessun listener di notifica installato."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Abilitare <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> sarà in grado di leggere tutte le notifiche pubblicate dal sistema o da qualsiasi app installata, che potrebbero includere informazioni personali come i nomi dei contatti e il testo dei messaggi ricevuti. Sarà inoltre in grado di ignorare tali notifiche o di attivare pulsanti di azione al loro interno."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Fornitori di condizioni"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nessuna app fornisce condizioni"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d app forniscono condizioni</item>
-      <item quantity="one">%d app fornisce condizioni</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nessun fornitore di condizioni installato."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Attivare <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> potrà aggiungere condizioni di uscita alla modalità Non disturbare."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Caricamento app..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blocca tutto"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Non mostrare mai notifiche di questa app"</string>
@@ -2476,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priorità"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Riservate"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Nome regola"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Aggiungi regola"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Elimina regola"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Eliminare la regola \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Elimina"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Tipo di regola"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Sconosciuto"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configura regola"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Regola di pianificazione"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Regola non trovata."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Giorni"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Nessuno"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Ogni giorno"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Mai"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"Dal <xliff:g id="START">%1$s</xliff:g> al <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2496,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Sveglie"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Promemoria"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventi"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Chiamanti selezionati"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Ripeti chiamanti"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Consenti se la stessa persona chiama una seconda volta entro <xliff:g id="MINUTES">%d</xliff:g> minuti"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> giorno successivo"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Quando vuoi essere interrotto?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Per quanto tempo?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Sempre"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minuti</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuto</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ore</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ora</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Cambia su Solo notifiche prioritarie sempre"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Cambia su Solo notifiche prioritarie per <xliff:g id="DURATION">%1$d</xliff:g> minuti (fino alle <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambia su Solo notifiche prioritarie per un minuto (fino alle <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Cambia su Solo notifiche prioritarie per <xliff:g id="DURATION">%1$d</xliff:g> ore (fino alle <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambia su Solo notifiche prioritarie per un\'ora (fino alle <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Cambia su Solo sveglie sempre"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Cambia su Solo sveglie per <xliff:g id="DURATION">%1$d</xliff:g> minuti (fino alle <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambia su Solo sveglie per un minuto (fino alle <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Cambia su Solo sveglie per <xliff:g id="DURATION">%1$d</xliff:g> ore (fino alle <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambia su Solo sveglie per un\'ora (fino alle <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Cambia su Non interrompere sempre"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Cambia su Non interrompere per <xliff:g id="DURATION">%1$d</xliff:g> minuti (fino alle <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambia su Non interrompere per un minuto (fino alle <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Cambia su Non interrompere per <xliff:g id="DURATION">%1$d</xliff:g> ore (fino alle <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambia su Non interrompere per un\'ora (fino alle <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Cambia su Interrompi sempre"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"per sempre"</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>
@@ -2569,7 +2659,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorizzazioni concesse</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> autorizzazione concessa</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> autorizzazioni su <xliff:g id="COUNT_3">%d</xliff:g> concesse</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> autorizzazione su <xliff:g id="COUNT_1">%d</xliff:g> concessa</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Alcune applicazioni predefinite impostate"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Nessuna applicazione predefinita impostata"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Tutte le applicazioni"</string>
@@ -2580,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritarie"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Riservate"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Con URL di dominio"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Ripristina le preferenze predefinite di tutte le app"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> app installate, incluse app di sistema e scaricate"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Disattivato dall\'amministratore"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avanzate"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Applicazione sconosciuta"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Scegli profilo"</string>
@@ -2596,4 +2688,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> app possono aprire i relativi URL di dominio</item>
       <item quantity="one">Un\'app può aprire i relativi URL di dominio</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Non riconosciuto"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"App predefinite"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"App Browser"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Nessun browser predefinito"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Predefinita)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 4b15d8a..c1e67bc 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"לחצן דחיפה"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"נמוך"</item>
     <item msgid="4212263919458209842">"קריטי"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"כבוי"</item>
-    <item msgid="5656544177755411222">"הפרעות מוגבלות"</item>
-    <item msgid="8735337502532332056">"ללא הפרעות"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"רגיל"</item>
     <item msgid="866544120205026771">"בינוני"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index ae1eb7b..ac37e9a 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -270,12 +270,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"‏כרטיס SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"‏הגדרות שרת Proxy"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"כן"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"לא"</string>
-    <string name="forget" msgid="7267115980248732932">"שכח"</string>
+    <string name="forget" msgid="1400428660472591263">"שכח"</string>
+    <string name="save" msgid="879993180139353333">"שמור"</string>
+    <string name="done" msgid="6942539184162713160">"סיום"</string>
     <string name="settings_label" msgid="1626402585530130914">"הגדרות"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"הגדרות"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"קיצור דרך של הגדרות"</string>
@@ -378,7 +376,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"חבר את המטען ונסה שוב."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"‏אין PIN או סיסמה לנעילת מסך"</string>
     <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>
@@ -537,7 +534,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"מתקדם"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"‏Bluetooth מתקדם"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"‏כשקישוריות ה-Bluetooth פועלת, המכשיר יכול לתקשר עם מכשירי Bluetooth אחרים."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"‏כדי לשפר את דיוק המיקום, שירותי Google יחפשו מכשירי Bluetooth גם כשה-Bluetooth כבוי. תוכל לשנות את ההגדרה הזו בLINK_BEGINהגדרות הסריקהLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"‏כדי לשפר את דיוק המיקום, אפליקציות ושירותים יחפשו מכשירי Bluetooth גם כאשר ה-Bluetooth כבוי. תוכל לשנות את ההגדרה הזו ב<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>הגדרות הסריקה<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"התחבר אל…"</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>
@@ -603,7 +600,7 @@
     <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" msgid="8382526568324164356">"‏כדי לשפר את דיוק המיקום, שירותי Google יחפשו מכשירי Wi‑Fi גם כשה-Wi‑Fi כבוי. תוכל לשנות את ההגדרה הזו בLINK_BEGINהגדרות הסריקהLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"‏כדי לשפר את דיוק המיקום, אפליקציות ושירותים יחפשו רשתות Wi‑Fi גם כאשר ה-Wi‑Fi כבוי. תוכל לשנות את ההגדרה הזו ב<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>הגדרות הסריקה<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"אל תציג שוב"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"‏השאר את ה-Wi-Fi פועל בזמן שינה"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"‏Wi‑Fi פועל בזמן מצב שינה"</string>
@@ -620,8 +617,6 @@
     <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_apps" msgid="6003687912727859577">"הצג אפליקציות"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"‏הצג עוצמת Wi-Fi"</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>
@@ -679,6 +674,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"חבר"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"אין לרשת הזו חיבור לאינטרנט. האם להשתמש בה בכל זאת?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"אל תשאל שוב בשביל הרשת הזו"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"התחבר"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"נכשל הניסיון להתחבר לרשת"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"שכח"</string>
@@ -750,12 +747,10 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"‏Wi-Fi מועדף"</item>
     <item msgid="5267397515594230396">"סלולרי מועדף"</item>
-    <item msgid="3132912693346866895">"‏Wi-Fi בלבד"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"‏כשהתקשרות Wi-Fi פועלת, הטלפון יכול לנתב שיחות ברשתות Wi-Fi או ברשת של הספק, בהתאם להעדפה שלך ולאות שחזק יותר. לפני הפעלת תכונה זו, בדוק עם הספק פרטים הקשורים לעמלות ופרטים אחרים."</string>
     <string name="home_settings" msgid="212375129455718176">"דף הבית"</string>
@@ -931,12 +926,12 @@
     <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="5128673488173839077">"אפליקציות ונתוני אפליקציות"</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_media_misc_usage" msgid="235452944021647124">"שונות"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"קבצים אחרים"</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>
@@ -969,6 +964,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"ביטול טעינה מתבצע"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"שטח האחסון הולך ואוזל"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"ייתכן שפונקציות מסוימות של המערכת, כמו סנכרון, לא יפעלו כראוי. נסה לפנות מקום על ידי מחיקה או ביטול הצמדה של פריטים, כגון אפליקציות או תוכן מדיה."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"שנה שם"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"טען"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"הוצא"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"מחק ופרמט"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"מחק ופרמט כאחסון פנימי"</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>
@@ -979,6 +979,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"‏מאפשר לאפליקציות התומכות ב-MIDI לפעול דרך USB באמצעות תוכנת MIDI המותקנת במחשב."</string>
     <string name="storage_other_users" msgid="808708845102611856">"משתמשים אחרים"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"אחסון במכשיר"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"אחסון נשלף"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> פנוי (סה\"כ <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> נטען"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"לא ניתן לטעון את <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> הוצא בבטחה"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"לא ניתן להוציא את <xliff:g id="NAME">%1$s</xliff:g> בבטחה"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> מפורמט"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"לא ניתן לפרמט את <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"שינוי שם של אמצעי אחסון"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"‏לאחר קביעת פורמט תוכל להשתמש ב-<xliff:g id="NAME_0">^1</xliff:g> זה במכשירים אחרים. \n\nכל הנתונים ב-<xliff:g id="NAME_1">^1</xliff:g> יימחקו. שקול לבצע גיבוי תחילה. \n\n"<b>"גבה תמונות וסוגי מדיה אחרים"</b>" \nהעבר את קובצי המדיה לאחסון חלופי במכשיר, או למחשב באמצעות כבל USB.‏ \n\n"<b>"גבה אפליקציות"</b>" \nתוסר ההתקנה של כל האפליקציות המאוחסנות ב-<xliff:g id="NAME_6">^1</xliff:g> זה והנתונים שלהן יימחקו. כדי להשאיר את האפליקציות האלה, העבר אותן לאחסון חלופי במכשיר זה."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"כשתוציא את <xliff:g id="NAME_0">^1</xliff:g>, האפליקציות המאוחסנות בו יפסיקו לפעול, וקובצי מדיה שמאוחסנים בו לא יהיו זמינים עד שתכניס אותו שוב."</b>" \n\nהפורמט של <xliff:g id="NAME_1">^1</xliff:g> זה הוגדר לפעול במכשיר הזה בלבד. הוא לא יפעל במכשירים אחרים."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"הגדרת <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"שימוש כאחסון נייד"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"להעברת תמונות וסוגי מדיה אחרים בין מכשירים."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"שימוש כאחסון פנימי"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"לאחסון כל דבר במכשיר זה בלבד, כולל אפליקציות ותמונות. נדרשת קביעת פורמט שלא מאפשרת לו לפעול עם מכשירים אחרים."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"קביעת פורמט כאחסון פנימי"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"קביעת הפורמט של <xliff:g id="NAME_0">^1</xliff:g> נדרשת כדי שיהיה מאובטח. \n\nלאחר קביעת הפורמט, <xliff:g id="NAME_1">^1</xliff:g> זה יפעל רק במכשיר הזה. \n\n"<b>"קביעת הפורמט מוחקת את כל הנתונים שמאוחסנים כרגע ב-<xliff:g id="NAME_2">^1</xliff:g>."</b>" כדי למנוע את אובדן הנתונים, שקול לגבות אותם."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"מחק וקבע פורמט"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"קובע פורמט ל-<xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"אל תסיר את <xliff:g id="NAME">^1</xliff:g> בעת קביעת הפורמט."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"העברת נתונים לאחסון חדש"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"תוכל להעביר את התמונות, הקבצים ואת נתוני האפליקציות אל ה-<xliff:g id="NAME">^1</xliff:g> החדש. \n\nההעברה אורכת כ-<xliff:g id="TIME">^2</xliff:g> ומפנה <xliff:g id="SIZE">^3</xliff:g> באחסון הפנימי. אפליקציות מסוימות לא יעבדו במהלך ההעברה."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"ביצוע העברה עכשיו"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"העברה במועד מאוחר יותר"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"העברת נתונים כעת"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"ההעברה אורכת כ-<xliff:g id="TIME">^1</xliff:g>. היא מפנה <xliff:g id="SIZE">^2</xliff:g> באחסון הפנימי."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"העברה"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"העברת נתונים..."</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"במהלך ההעברה: \n• אל תסיר את ה-<xliff:g id="NAME">^1</xliff:g>. \n• אפליקציות מסוימות לא יעבדו באופן תקין. \n• השאר את המכשיר בטעינה."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> מוכן"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"ה-<xliff:g id="NAME">^1</xliff:g> מוכן לשימוש עם תמונות וסוגי מדיה אחרים."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"ה-<xliff:g id="NAME">^1</xliff:g> החדש עובד. \n\nכדי להעביר תמונות, קבצים ונתוני אפליקציות למכשיר, עבור אל \'הגדרות\' ו\'אחסון\'."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"העברת <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"העברת <xliff:g id="APP">^1</xliff:g> והנתונים שבה אל <xliff:g id="NAME_0">^2</xliff:g> אורכת מספר דקות בלבד. לא תוכל להשתמש באפליקציה לפני השלמת ההעברה. \n\nאל תסיר את ה-<xliff:g id="NAME_1">^2</xliff:g> במהלך ההעברה."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"העברת <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"אל תסיר את ה-<xliff:g id="NAME">^1</xliff:g> במהלך ההעברה. \n\nהאפליקציה <xliff:g id="APP">^2</xliff:g> לא תהיה זמינה במכשיר לפני השלמת ההעברה."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ביטול העברה"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"מצב סוללה"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"טעינת סוללה:"</string>
     <string name="apn_settings" msgid="3743170484827528406">"‏פריטי APN"</string>
@@ -1023,13 +1062,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"אפס לברירת המחדל"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"‏איפוס הגדרות ברירת המחדל של APN הושלם."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"איפוס של הגדרות הרשת"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"‏הפעולה הזו תאפס להגדרות היצרן את כל ההגדרות הקשורות לתקשורת רשתות, כולל:\n\n"<li>"Wi-Fi"</li>\n<li>"נתונים לנייד"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"‏הפעולה הזו תאפס את כל הגדרות הרשת, כולל:\n\n"<li>"Wi‑Fi"</li>\n<li>"נתונים סלולריים"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"אפס הגדרות"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"האם לאפס את כל הגדרות הרשת? לא ניתן לבטל את הפעולה הזו."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"לאפס את כל הגדרות הרשת? לא ניתן לבטל את הפעולה!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"אפס הגדרות"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"עליך לשרטט את קו ביטול הנעילה כדי לאשר איפוס של הגדרות הרשת."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"האם לאפס?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"הגדרות הרשת אופסו"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"הגדרות הרשת אופסו"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"אפס את המכשיר"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"איפוס נתוני יצרן"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"‏פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטאבלט שלך, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והאפליקציות שלך"</li>\n<li>"האפליקציות שהורדת"</li></string>
@@ -1045,9 +1083,8 @@
     <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="1062841478823409667">"למחוק את כל המידע האישי שלך והאפליקציות שהורדת? לא ניתן לבטל את הפעולה!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"מחק הכל"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"איפוס להגדרות היצרן אינו זמין עבור המשתמש הזה"</string>
@@ -1064,8 +1101,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"הגדרת דואר קולי, העברת שיחות, שיחה ממתינה, זיהוי מתקשר"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"‏שיתוף אינטרנט דרך USB"</string>
@@ -1097,7 +1132,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"עזרה"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"רשתות סלולריות"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"תכנית לנייד"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"‏אפליקציית SMS המוגדרת כברירת מחדל"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"‏אפליקציית SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"‏לשנות את אפליקציית ה-SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"‏האם להשתמש ב-<xliff:g id="NEW_APP">%1$s</xliff:g> במקום ב-<xliff:g id="CURRENT_APP">%2$s</xliff:g> כאפליקציית ה-SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"‏האם להשתמש ב-<xliff:g id="NEW_APP">%s</xliff:g> כאפליקציית ה-SMS?"</string>
@@ -1128,6 +1163,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"‏השתמש ב-GPS לקביעת המיקום"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"סריקה"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"סריקה"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"‏סריקת Wi-Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"‏תוכל לשפר את דיוק המיקום על ידי כך שתאפשר לאפליקציות ולשירותים לחפש רשתות Wi‑Fi, אפילו כאשר ה-Wi‑Fi כבוי."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"‏סריקת Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"‏תוכל לשפר את דיוק המיקום על ידי כך שתאפשר לשירותי מערכת לחפש מכשירי Bluetooth גם כאשר ה-Bluetooth כבוי."</string>
     <string name="location_network_based" msgid="6010456018401296590">"‏מיקום עם Wi‑Fi ורשת סלולרית"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"‏אפשר לאפליקציות להשתמש בשירות המיקום של Google כדי להעריך את מיקומך מהר יותר. נתוני מיקום אנונימיים ייאספו ויישלחו אל Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"‏המיקום נקבע באמצעות Wi-Fi"</string>
@@ -1173,11 +1212,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"הסיסמה הוגדרה"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"‏PIN הוגדר"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"הוגדר קו"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"השתמש בקו ביטול הנעילה של המכשיר כדי להמשיך."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"‏הזן את מספר ה-PIN כדי להמשיך."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"הזן את סיסמת המכשיר כדי להמשיך."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"‏מספר PIN שגוי"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"סיסמה שגויה"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"קו ביטול נעילה שגוי"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"אבטחת המכשיר"</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_wrong" msgid="4694973540770105678">"נסה שוב:"</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>
@@ -1199,8 +1242,7 @@
     <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" msgid="6909161623701848863">"יותר מדי ניסיונות שגויים. נסה שוב בעוד <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>
@@ -1251,7 +1293,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"מיין לפי גודל"</string>
     <string name="show_running_services" msgid="5736278767975544570">"הצג שירותים פועלים"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"הצג תהליכים המאוחסנים בקובץ שמור"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"ברירת המחדל של אפליקציית חירום"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"אפליקציה לשעת חירום"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"אפס העדפות אפליקציה"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"האם לאפס העדפות אפליקציה?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"הפעולה תאפס את כל ההעדפות עבור:\n\n "<li>"אפליקציות מושבתות"</li>\n" "<li>"הודעות של אפליקציות מושבתות"</li>\n" "<li>"אפליקציות בברירת מחדל לביצוע פעולות"</li>\n" "<li>"הגבלות של נתוני רקע עבור אפליקציות"</li>\n<li></li>" \nהגבלות הרשאה כלשהן\n לא תאבד נתוני אפליקציות."</string>
@@ -1455,8 +1497,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"‏אחד את כל חבילות Bluetooth HCI בקובץ"</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="select_logd_size_title" msgid="7433137108348553508">"גדלי מאגר של יוצר יומן"</string>
@@ -1757,6 +1797,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 שעות"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"יום אחד"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"הצג מערכת"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"הסתר מערכת"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"‏השתמש ב-Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"סוג נתונים סטטיסטיים"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"רקע"</string>
@@ -1853,7 +1894,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_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>
@@ -2228,7 +2268,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"משתמש"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"פרופיל מוגבל"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"האם להוסיף משתמש חדש?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"‏תוכל לשתף מכשיר זה עם אנשים אחרים על ידי יצירת משתמשים נוספים. לכל משתמש יש שטח משלו, שהוא יכול להתאים אישית בעזרת אפליקציות, טפט ופריטים נוספים משלו. המשתמשים יכולים גם להתאים הגדרות של המכשיר כגון Wi‑Fi, שיכולות להשפיע על כל אחד.\n\nבעת הוספת משתמש חדש, על משתמש זה להגדיר את השטח שלו.\n\nכל משתמש יכול לעדכן אפליקציות עבור כל המשתמשים האחרים."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"‏תוכל לשתף מכשיר זה עם אנשים אחרים על ידי יצירת משתמשים נוספים. לכל משתמש יש שטח משלו, שהוא יכול להתאים אישית בעזרת אפליקציות, טפט ופריטים נוספים משלו. המשתמשים יכולים גם להתאים הגדרות של המכשיר כגון Wi‑Fi, שיכולות להשפיע על כל אחד.\n\nבעת הוספת משתמש חדש, על משתמש זה להגדיר את השטח שלו.\n\nכל משתמש יכול לעדכן אפליקציות עבור כל המשתמשים האחרים."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"בעת הוספת משתמש חדש, על משתמש זה להגדיר את השטח שלו.\n\nכל משתמש יכול לעדכן אפליקציות עבור כל המשתמשים האחרים."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"האם להגדיר משתמש עכשיו?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"ודא שהמשתמש זמין לקחת את המכשיר ולהגדיר את המרחב שלו"</string>
@@ -2411,6 +2451,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"‏ברירת המחדל של אפליקציית חירום ICE"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"מערכת לבקשה של הורדת אפליקציות"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"אבטחה של הרשאות לאפליקציות"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"ברירת מחדל לאפליקציות"</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>
@@ -2425,14 +2466,12 @@
     <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="6948120138640252732">"חסום הפרעות"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"רק התראות בעדיפות"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"כללים אוטומטיים"</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_alarms" msgid="7380265858042606857">"התר התראות בלבד"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"ללא הפרעות"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"רק הודעות בעדיפות"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"רק התראות"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"ללא הפרעות"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"רינגטון של טלפון"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"רינגטון להודעות המוגדר כברירת מחדל"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"הפעל גם רטט עבור שיחות"</string>
@@ -2467,17 +2506,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"לא מותקנים מאזינים להתראות."</string>
     <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">"אין אפליקציות המספקות תנאים"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="two">‏%d אפליקציות מספקות תנאים</item>
-      <item quantity="many">‏%d אפליקציות מספקות תנאים</item>
-      <item quantity="other">‏%d אפליקציות מספקות תנאים</item>
-      <item quantity="one">‏אפליקציה %d מספקת תנאים</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="loading_notification_apps" msgid="5031818677010335895">"טוען אפליקציות..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"חסום הכל"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"לעולם אל תציג הודעות מהאפליקציה הזו"</string>
@@ -2491,17 +2519,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"שם הכלל"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"הוסף כלל"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"מחק כלל"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"האם למחוק את הכלל \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"מחק"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"סוג הכלל"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"לא ידוע"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"הגדר כלל"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"כלל לוח זמנים"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"הכלל לא נמצא."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"ימים"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"ללא"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"כל יום"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"אף פעם"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> עד <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"שיחות"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"הודעות"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"שיחות/הודעות מאת"</string>
@@ -2511,15 +2545,92 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"התראות"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"תזכורות"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"אירועים"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"מתקשרים נבחרים"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"מתקשרים חוזרים"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"אם אותו אדם מתקשר בפעם השנייה בפרק זמן של <xliff:g id="MINUTES">%d</xliff:g> דקות, אפשר זאת"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ביום הבא"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"מתי תרצה לאפשר הפרעות?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"למשך כמה זמן?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"ללא הגבלה"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="two"><xliff:g id="COUNT_1">%d</xliff:g> דקות</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> דקות</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> דקות</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> דקה</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="two"><xliff:g id="COUNT_1">%d</xliff:g> שעות</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> שעות</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> שעות</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> שעה</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"שנה ל\'רק הודעות בעדיפות גבוהה\' ללא הגבלה"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="two">שנה ל‘רק הודעות בעדיפות גבוהה‘ למשך <xliff:g id="DURATION">%1$d</xliff:g> דקות, עד <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">שנה ל‘רק הודעות בעדיפות גבוהה‘ למשך <xliff:g id="DURATION">%1$d</xliff:g> דקות, עד <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">שנה ל‘רק הודעות בעדיפות גבוהה‘ למשך <xliff:g id="DURATION">%1$d</xliff:g> דקות, עד <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">שנה ל‘רק הודעות בעדיפות גבוהה‘ למשך דקה אחת, עד <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="two">שנה ל‘רק הודעות בעדיפות גבוהה‘ למשך <xliff:g id="DURATION">%1$d</xliff:g> שעות (עד <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="many">שנה ל‘רק הודעות בעדיפות גבוהה‘ למשך <xliff:g id="DURATION">%1$d</xliff:g> שעות (עד <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">שנה ל‘רק הודעות בעדיפות גבוהה‘ למשך <xliff:g id="DURATION">%1$d</xliff:g> שעות (עד <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">שנה ל‘רק הודעות בעדיפות גבוהה‘ למשך שעה אחת,עד <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"שנה ל\'רק התראות\' ללא הגבלה"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="two">שנה ל‘רק התראות‘ למשך <xliff:g id="DURATION">%1$d</xliff:g> דקות (עד <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="many">שנה ל‘רק התראות‘ למשך <xliff:g id="DURATION">%1$d</xliff:g> דקות (עד <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">שנה ל‘רק התראות‘ למשך <xliff:g id="DURATION">%1$d</xliff:g> דקות (עד <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">שנה ל‘רק התראות‘ למשך דקה אחת, עד <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="two">שנה ל‘רק התראות‘ למשך <xliff:g id="DURATION">%1$d</xliff:g> שעות, עד <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">שנה ל‘רק התראות‘ למשך <xliff:g id="DURATION">%1$d</xliff:g> שעות, עד <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">שנה ל‘רק התראות‘ למשך <xliff:g id="DURATION">%1$d</xliff:g> שעות, עד <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">שנה ל‘רק התראות‘ למשך שעה אחת, עד <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"שנה ל\'ללא הפרעות\' ללא הגבלה"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="two">שנה ל‘אל תתיר הפרעות‘ למשך <xliff:g id="DURATION">%1$d</xliff:g> דקות (עד <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="many">שנה ל‘אל תתיר הפרעות‘ למשך <xliff:g id="DURATION">%1$d</xliff:g> דקות (עד <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">שנה ל‘אל תתיר הפרעות‘ למשך <xliff:g id="DURATION">%1$d</xliff:g> דקות (עד <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">שנה ל‘אל תתיר הפרעות‘ למשך דקה אחת, עד <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="two">שנה ל‘אל תתיר הפרעות‘ למשך <xliff:g id="DURATION">%1$d</xliff:g> שעות, עד <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">שנה ל‘אל תתיר הפרעות‘ למשך <xliff:g id="DURATION">%1$d</xliff:g> שעות, עד <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">שנה ל‘אל תתיר הפרעות‘ למשך <xliff:g id="DURATION">%1$d</xliff:g> שעות, עד <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">שנה ל‘אל תתיר הפרעות‘ למשך שעה אחת, עד <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"שנה ל\'הפרעות בכל מצב\'"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ללא הפסקה"</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>
@@ -2586,7 +2697,12 @@
       <item quantity="other">הוענקו <xliff:g id="COUNT_1">%d</xliff:g> הרשאות</item>
       <item quantity="one">הוענקה הרשאה <xliff:g id="COUNT_0">%d</xliff:g></item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="two">הוענקו <xliff:g id="COUNT_2">%d</xliff:g> הרשאות מתוך <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="many">הוענקו <xliff:g id="COUNT_2">%d</xliff:g> הרשאות מתוך <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="other">הוענקו <xliff:g id="COUNT_2">%d</xliff:g> הרשאות מתוך <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="one">הוענקה הרשאה <xliff:g id="COUNT_0">%d</xliff:g> מתוך <xliff:g id="COUNT_1">%d</xliff:g></item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"הוגדרו כמה ברירת מחדל"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"לא הוגדרו ברירות מחדל"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"כל האפליקציות"</string>
@@ -2597,8 +2713,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"בעדיפות"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"רגישות"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"עם כתובות אתרים של דומיינים"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"אפס לברירת המחדל את ההעדפות בכל האפליקציות"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> אפליקציות מותקנות, כולל אפליקציות מערכת ואפליקציות שהורדת"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"הושבת על ידי מנהל המערכת"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"מתקדם"</string>
     <string name="unknown_app" msgid="5275921288718717656">"אפליקציה לא מוכרת"</string>
     <string name="choose_profile" msgid="8229363046053568878">"בחר פרופיל"</string>
@@ -2615,4 +2730,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> אפליקציות יכולות לפתוח את כתובות האתרים של הדומיין שלהן</item>
       <item quantity="one">אפליקציה אחת יכולה לפתוח את כתובות האתרים של הדומיין שלה</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"לא זוהתה"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"אפליקציות בברירת מחדל"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"אפליקציית דפדפן"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"אין דפדפן בברירת מחדל"</string>
+    <string name="default_app" msgid="6864503001385843060">"(ברירת מחדל)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index a3d0ffb..6943599 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"ボタンを押す"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"かなり不足"</item>
     <item msgid="4212263919458209842">"残りわずか"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"OFF"</item>
-    <item msgid="5656544177755411222">"制限付き割り込み"</item>
-    <item msgid="8735337502532332056">"割り込みなし"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"標準"</item>
     <item msgid="866544120205026771">"やや不足"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 2a74af6..3ccd759 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -270,12 +270,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SDカード"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"プロキシ設定"</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">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"はい"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"いいえ"</string>
-    <string name="forget" msgid="7267115980248732932">"切断"</string>
+    <string name="forget" msgid="1400428660472591263">"切断"</string>
+    <string name="save" msgid="879993180139353333">"保存"</string>
+    <string name="done" msgid="6942539184162713160">"完了"</string>
     <string name="settings_label" msgid="1626402585530130914">"設定"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"設定"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"設定をショートカットとする"</string>
@@ -376,7 +374,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"電源に接続してもう一度お試しください。"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"画面ロックのPIN/パスワードがありません"</string>
     <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">"この暗号化操作は元に戻すことができず、途中で中断するとデータが失われます。暗号化には1時間以上かかり、途中でタブレットが何度か再起動されます。"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"この暗号化操作は元に戻すことができず、途中で中断するとデータが失われます。暗号化には1時間以上かかり、途中で端末が何度か再起動されます。"</string>
@@ -523,7 +520,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"詳細設定"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth詳細設定"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetoothをオンにすると、お使いの端末は近くにある他のBluetoothデバイスと通信できます。"</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"位置情報の精度を向上させるため、BluetoothがOFFの場合でもGoogleサービスはBluetoothデバイスをスキャンします。この設定は、LINK_BEGINスキャンの設定LINK_ENDで変更できます。"</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"位置情報の精度を向上させるため、BluetoothがOFFの場合でもアプリやサービスはBluetoothデバイスをスキャンします。この設定は<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>スキャンの設定<xliff:g id="LINK_END_1">LINK_END</xliff:g>で変更できます。"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"接続先..."</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>
@@ -589,7 +586,7 @@
     <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" msgid="8382526568324164356">"位置情報の精度を向上させるため、Wi-FiがOFFの場合でもGoogleサービスはWi‑Fiネットワークをスキャンします。この設定は、LINK_BEGINスキャンの設定LINK_ENDで変更できます。"</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"位置情報の精度を向上させるため、Wi-FiがOFFの場合でもアプリやサービスはWi‑Fiネットワークをスキャンします。この設定は<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>スキャンの設定<xliff:g id="LINK_END_1">LINK_END</xliff:g>で変更できます。"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"次回から表示しない"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"スリープ時にWi-Fi接続を維持"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"スリープ時にWi-Fi接続を維持"</string>
@@ -606,8 +603,6 @@
     <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_apps" msgid="6003687912727859577">"アプリを表示"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Wi-Fi強度を表示"</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>
@@ -665,6 +660,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"接続する"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"このネットワークはインターネットに接続していません。このネットワークを使用しますか？"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"このネットワークについて次回から表示しない"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"接続"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ネットワークに接続できませんでした"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"切断"</string>
@@ -731,21 +728,17 @@
     <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>ポータブルWi-Fiアクセスポイント"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi通話"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"発信の設定"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi通話モード"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi優先"</item>
     <item msgid="5267397515594230396">"モバイル優先"</item>
-    <item msgid="3132912693346866895">"Wi-Fiのみ"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wi-Fi発信をONにすると、ユーザーの設定と信号の強度に応じて、スマートフォンからWi-Fiネットワークか携帯通信会社ネットワークのいずれかを経由して通話をルーティングできるようになります。この機能をONにする場合は、事前に料金などの条件について携帯通信会社にご確認ください。"</string>
     <string name="home_settings" msgid="212375129455718176">"ホーム"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"表示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音"</string>
@@ -917,12 +910,12 @@
     <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="5128673488173839077">"アプリとアプリデータ"</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_media_misc_usage" msgid="235452944021647124">"その他"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"その他のファイル"</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>
@@ -955,6 +948,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"マウントを解除中"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"空き容量が少なくなっています"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"同期などの一部のシステム機能が正常に動作しない可能性があります。アプリやメディアコンテンツなどのアイテムを削除するか、アイテムのオフライン利用設定を解除して、空き容量を確保してください。"</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"名前を変更"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"マウント"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"取り出し"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"消去してフォーマット"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"消去して内部ストレージとしてフォーマット"</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>
@@ -965,6 +963,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"MIDI対応アプリがUSBを介してパソコンのMIDIソフトと連携できるようにします。"</string>
     <string name="storage_other_users" msgid="808708845102611856">"その他のユーザー"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"端末のストレージ"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"リムーバブルストレージ"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"空き容量<xliff:g id="FREE">%1$s</xliff:g>（総容量<xliff:g id="TOTAL">%2$s</xliff:g>）"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g>をマウントしました"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g>をマウントできませんでした"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g>を安全に取り出しました"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g>を安全に取り出せませんでした"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g>をフォーマットしました"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g>をフォーマットできませんでした"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"ストレージの名前の変更"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"フォーマット後は、この<xliff:g id="NAME_0">^1</xliff:g>を他の端末で使用できます。\n\nこの<xliff:g id="NAME_1">^1</xliff:g>のすべてのデータが消去されます。フォーマットの前にバックアップを取ることを検討してください。\n\n"<b>"写真などのメディアのバックアップ"</b>\n"メディアファイルをこの端末上の別のストレージに移動するか、USBケーブルを使用してパソコンに転送します。\n\n"<b>"アプリのバックアップ"</b>\n"この<xliff:g id="NAME_6">^1</xliff:g>に保存されているすべてのアプリがアンインストールされ関連するデータが消去されます。アプリを引き続き使用する場合は、この端末上の別のストレージに移動してください。"</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"この<xliff:g id="NAME_0">^1</xliff:g>を取り外すと、もう一度挿入するまでは保存されているアプリやメディアファイルを使用できなくなります。"</b>\n\n"この<xliff:g id="NAME_1">^1</xliff:g>はこの端末用にフォーマットされており、他の端末では使用できません。"</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g>のセットアップ"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"外部ストレージとして使用"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"写真などのメディアを端末間で移動するために使用します。"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"内部ストレージとして使用"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"アプリや写真などすべてのデータをこの端末のみに保存するために使用します。他の端末で使用できないようにするためにフォーマットが必要です。"</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"内部ストレージとしてフォーマット"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"セキュリティを確保するには、<xliff:g id="NAME_0">^1</xliff:g>をフォーマットする必要があります。\n\nフォーマットした後、この<xliff:g id="NAME_1">^1</xliff:g>はこの端末でのみ使用できるようになります。\n\n"<b>"フォーマットを行うと<xliff:g id="NAME_2">^1</xliff:g>に保存されているすべてのデータが消去されます。"</b>"データの喪失を防ぐため、バックアップを取ることを検討してください。"</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"消去してフォーマット"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g>をフォーマット中…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"フォーマット中は<xliff:g id="NAME">^1</xliff:g>を取り外さないでください。"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"データを新しいストレージに移動"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"写真、ファイル、アプリデータをこの新しい<xliff:g id="NAME">^1</xliff:g>に移動できます。\n\n移動にはおよそ<xliff:g id="TIME">^2</xliff:g>かかります。これにより内部ストレージが<xliff:g id="SIZE">^3</xliff:g>解放されます。移動中は一部のアプリが使用できなくなります。"</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"今すぐ移動"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"後で移動"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"データの移動"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"移動にはおよそ<xliff:g id="TIME">^1</xliff:g>かかります。これにより内部ストレージが<xliff:g id="SIZE">^2</xliff:g>解放されます。"</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"移動"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"データを移動中…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"移動中は:\n•<xliff:g id="NAME">^1</xliff:g>を取り外さないでください。\n•一部のアプリは正常に機能しません。\n•端末を電源につないだままにしてください。"</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g>の準備が整いました"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g>を写真などのメディアの保存に使用する準備が整いました。"</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"新しい<xliff:g id="NAME">^1</xliff:g>は正常に動作しています。\n\n写真、ファイル、アプリなどのデータをこの端末に移動するには[設定]&gt;[ストレージ]に移動してください。"</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g>を移動"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<xliff:g id="APP">^1</xliff:g>とそのデータは数秒で<xliff:g id="NAME_0">^2</xliff:g>に移動できます。移動が完了するまでこのアプリは使用できません。\n\n移動中に<xliff:g id="NAME_1">^2</xliff:g>を取り外さないでください。"</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g>を移動中…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"移動中は<xliff:g id="NAME">^1</xliff:g>を取り外さないでください。\n\nこの端末の<xliff:g id="APP">^2</xliff:g>アプリは移動が完了するまで使用できません。"</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"移動をキャンセル"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"電池の状態:"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"電池残量"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1009,13 +1046,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"初期設定にリセット"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN設定をリセットしました。"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"ネットワーク設定のリセット"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"ネットワークに関連するすべての設定を出荷時設定にリセットします。以下の設定が含まれます。\n\n"<li>"Wi-Fi"</li>\n<li>"モバイルデータ"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"ネットワーク設定をすべてリセットします。以下の設定が含まれます。\n\n"<li>"Wi‑Fi"</li>\n<li>"モバイルデータ"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"設定をリセット"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"すべてのネットワーク設定をリセットしますか？この操作は元に戻せません。"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"すべてのネットワーク設定をリセットしますか？この操作は元に戻せません。"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"設定をリセット"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"ネットワーク設定をリセットしてよいか確認するため、ロック解除パターンを入力する必要があります。"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"リセットしますか？"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"ネットワーク設定をリセットしました"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"ネットワーク設定をリセットしました"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"端末をリセット"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"データの初期化"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"この操作を行うと、タブレットの以下のデータを含む"<b>"内部ストレージ"</b>"の全データが消去されます:\n\n"<li>"Googleアカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
@@ -1031,9 +1067,8 @@
     <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="1062841478823409667">"個人情報とダウンロードしたアプリをすべて削除しますか？この操作は元に戻せません。"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"すべて消去"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"このユーザーは出荷時設定へのリセットを許可されていません"</string>
@@ -1050,8 +1085,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"ボイスメール、着信転送、発信者番号など"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USBテザリング"</string>
@@ -1083,7 +1116,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"ヘルプ"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"モバイルネットワーク"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"モバイルプラン"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"デフォルトのSMSアプリ"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMSアプリ"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMSアプリを変更しますか？"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"SMSアプリとして<xliff:g id="CURRENT_APP">%2$s</xliff:g>の代わりに<xliff:g id="NEW_APP">%1$s</xliff:g>を使用しますか？"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"SMSアプリとして<xliff:g id="NEW_APP">%s</xliff:g>を使用しますか？"</string>
@@ -1095,8 +1128,8 @@
     <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_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>
@@ -1114,6 +1147,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPSで現在地を特定する"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"スキャン"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"スキャン"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fiのスキャン"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Wi-FiがOFFの場合でもアプリやサービスにWi‑Fiネットワークのスキャンを許可することで、位置情報を向上させます"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetoothのスキャン"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"BluetoothがOFFの場合でもシステムサービスにBluetoothデバイスのスキャンを許可することで、位置情報を向上させます"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi/モバイル接続時の位置情報"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Googleの位置情報サービスで現在地をすばやく推定することをアプリに許可します。匿名の現在地データが収集され、Googleに送信されます。"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fiで検出される現在地"</string>
@@ -1159,11 +1196,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"パスワードが設定されました"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PINが設定されました"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"パターンが設定されました"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"続行するには端末のパターンを使用してください。"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"続行するには端末のPINを入力してください。"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"続行するには端末のパスワードを入力してください。"</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PINが正しくありません"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"パスワードが正しくありません"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"パターンが正しくありません"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"端末のセキュリティ"</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_wrong" msgid="4694973540770105678">"もう一度お試しください:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"ロック解除パターンを入力"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"MENUキーでヘルプ表示"</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"描き終わりの点で指を離します"</string>
@@ -1185,8 +1226,7 @@
     <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" msgid="6909161623701848863">"誤った回数が多すぎます。<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>
@@ -1237,8 +1277,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"サイズ順"</string>
     <string name="show_running_services" msgid="5736278767975544570">"実行中のサービスを表示"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"キャッシュしたプロセスを表示"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"緊急アプリ"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"アプリの設定をリセット"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"設定をリセットしますか？"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"この操作により、次の設定がすべてリセットされます:\n\n "<li>"無効化されているアプリ"</li>\n" "<li>"無効化されているアプリの通知"</li>\n" "<li>"特定の操作で使用するデフォルトのアプリ"</li>\n" "<li>"アプリのバックグラウンドデータの制限"</li>\n" "<li>"権限のすべての制限"</li>\n\n"アプリのデータが失われることはありません。"</string>
@@ -1270,8 +1309,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>
@@ -1442,8 +1481,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Bluetooth HCIパケットをすべてファイルにキャプチャする"</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="select_logd_size_title" msgid="7433137108348553508">"ログバッファのサイズ"</string>
@@ -1744,6 +1781,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12時間"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1日"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"システムを表示"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"システムを表示しない"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Ussを使用"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"統計タイプ"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"バックグラウンド"</string>
@@ -1844,7 +1882,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_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>
@@ -1886,7 +1923,7 @@
     <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>
@@ -1939,8 +1976,8 @@
     <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="managed_profile_not_available_label" msgid="3489771164851107822">"ワークプロフィールがまだ利用できません"</string>
-    <string name="remove_managed_profile_label" msgid="3856519337797285325">"ワークプロフィールを削除"</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_dialog_title" msgid="6059217698124786537">"バックグラウンドを無効化"</string>
@@ -2209,7 +2246,7 @@
     <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>
-    <string name="user_summary_managed_profile_not_set_up" msgid="1659125858619760573">"セットアップしていません - ワークプロフィール"</string>
+    <string name="user_summary_managed_profile_not_set_up" msgid="1659125858619760573">"セットアップしていません - 仕事用プロファイル"</string>
     <string name="user_owner" msgid="3879126011135546571">"所有者"</string>
     <string name="user_you" msgid="1639158809315025986">"自分（<xliff:g id="NAME">%s</xliff:g>）"</string>
     <string name="user_nickname" msgid="5148818000228994488">"ニックネーム"</string>
@@ -2219,7 +2256,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"ユーザー"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"制限付きプロフィール"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"新しいユーザーを追加しますか？"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"追加ユーザーを作成して、この端末を他のユーザーと共有できます。各ユーザーは各自のスペースを所有でき、アプリや壁紙などを使用してカスタマイズできます。Wi-Fiなど、すべてのユーザーに影響する端末設定を変更することもできます。\n\n新しいユーザーを追加したら、そのユーザーは自分のスペースをセットアップする必要があります。\n\nすべてのユーザーは他のユーザーに代わってアプリを更新できます。"</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"追加ユーザーを作成して、この端末を他のユーザーと共有できます。各ユーザーは各自のスペースを所有でき、アプリや壁紙などを使用してカスタマイズできます。Wi-Fiなど、すべてのユーザーに影響する端末設定を変更することもできます。\n\n新しいユーザーを追加したら、そのユーザーは自分のスペースをセットアップする必要があります。\n\nすべてのユーザーは他のユーザーに代わってアプリを更新できます。"</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"新しいユーザーを追加したら、そのユーザーは自分のスペースをセットアップする必要があります。\n\nすべてのユーザーは他のユーザーに代わってアプリを更新できます。"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"ユーザーを今すぐセットアップ"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"ユーザーが端末を使って各自のスペースをセットアップできるよう確認してください"</string>
@@ -2236,7 +2273,7 @@
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"自分を削除しますか？"</string>
     <string name="user_confirm_remove_title" msgid="1163721647646152032">"ユーザーを削除しますか？"</string>
     <string name="user_profile_confirm_remove_title" msgid="5573161550669867342">"プロフィールを削除しますか？"</string>
-    <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"ワークプロフィールの削除"</string>
+    <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">"すべてのアプリとデータが削除されます。"</string>
@@ -2254,7 +2291,7 @@
     <string name="user_enable_calling_sms" msgid="9172507088023097063">"通話とSMSをON"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"ユーザーの削除"</string>
     <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"通話をONにしますか？"</string>
-    <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"通話履歴がこのユーザーと共有されます。"</string>
+    <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"発信履歴がこのユーザーと共有されます。"</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"通話とSMSをONにしますか？"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"通話とSMSの履歴がこのユーザーと共有されます。"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"アプリとコンテンツの許可"</string>
@@ -2399,10 +2436,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"制限 制限する 制限された"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"テキスト 補正 修正 音 バイブレーション 自動 言語 ジェスチャー 候補 テーマ 不適切 語 入力 絵文字 国際"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"リセット 設定 既定"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"既定の緊急連絡用アプリ"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"アプリ ダウンロード アプリ システム"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"アプリ 権限 セキュリティ"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"アプリ 既定"</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>
@@ -2417,14 +2454,12 @@
     <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="6948120138640252732">"通知をブロック"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"重要な通知のみを許可"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"自動ルール"</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_alarms" msgid="7380265858042606857">"アラームのみを許可"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"割り込みなし"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"重要な通知のみ"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"アラームのみ"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"サイレント"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"着信音"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"デフォルトの通知音"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"着信時もバイブレーションON"</string>
@@ -2457,15 +2492,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"通知リスナーはインストールされていません。"</string>
     <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">"条件を指定しているアプリはありません"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d個のアプリが条件を指定しています</item>
-      <item quantity="one">%d個のアプリが条件を指定しています</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="loading_notification_apps" msgid="5031818677010335895">"アプリを読み込んでいます..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"すべてブロック"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"このアプリからの通知を表示しない"</string>
@@ -2479,17 +2505,23 @@
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"ルール名"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"ルールを追加"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"ルールを削除"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"「<xliff:g id="RULE">%1$s</xliff:g>」ルールを削除しますか？"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"削除"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"ルールの種類"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"不明"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"ルールを設定"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"スケジュールのルール"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"ルールが見つかりません。"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"日数"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"指定しない"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"毎日"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">"、 "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"なし"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>～<xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>～<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"通話"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"メッセージ"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"発信/送信元"</string>
@@ -2499,15 +2531,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"アラーム"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"リマインダー"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"イベント"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"選択した発信者"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"同一発信者による再発信"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"同じ人が<xliff:g id="MINUTES">%d</xliff:g>分以内に再度発信することを許可する"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"自動的にON"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"翌日の<xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"どのようなときに割り込みますか？"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"期間を指定してください"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"期限なし"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>分</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>分</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>時間</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>時間</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"期限なしで、重要な通知のみに変更します"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>まで<xliff:g id="DURATION">%1$d</xliff:g>分間、重要な通知のみに変更します</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>まで1分間、重要な通知のみに変更します</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">（<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>まで）<xliff:g id="DURATION">%1$d</xliff:g>時間、重要な通知のみに変更します</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>まで1時間、重要な通知のみに変更します</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"期限なしで、アラームのみに変更します"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">（<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>まで）<xliff:g id="DURATION">%1$d</xliff:g>分間、アラームのみに変更します</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>まで1分間、アラームのみに変更します</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>まで<xliff:g id="DURATION">%1$d</xliff:g>時間、アラームのみに変更します</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>まで1時間、アラームのみに変更します</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"期限なしで、割り込みなしに変更します"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">（<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>まで）<xliff:g id="DURATION">%1$d</xliff:g>分間、割り込みなしに変更します</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>まで1分間、割り込みなしに変更します</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>まで<xliff:g id="DURATION">%1$d</xliff:g>時間、割り込みなしに変更します</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>まで1時間、割り込みなしに変更します</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"常に割り込みに変更します"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ずっと"</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>
@@ -2520,7 +2613,7 @@
     <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="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>
@@ -2572,7 +2665,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>件の権限を付与</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>件の権限を付与</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g>/<xliff:g id="COUNT_3">%d</xliff:g>件の権限を付与</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g>件の権限を付与</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"一部既定を設定"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"既定の設定なし"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"すべてのアプリ"</string>
@@ -2583,8 +2679,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"重要"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"プライベート"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ドメインURLあり"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"すべてのアプリの設定を既定にリセットします"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"インストール済みのアプリ: <xliff:g id="COUNT">%d</xliff:g>件（システムアプリやダウンロード済みアプリを含む）"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"管理者によって無効にされています"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"詳細設定"</string>
     <string name="unknown_app" msgid="5275921288718717656">"不明なアプリ"</string>
     <string name="choose_profile" msgid="8229363046053568878">"プロフィールの選択"</string>
@@ -2599,4 +2694,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g>個のアプリがドメインURLを開くことができます</item>
       <item quantity="one">1つのアプリがドメインURLを開くことができます</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"認識されませんでした"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"既定のアプリ"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"ブラウザアプリ"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"既定のブラウザなし"</string>
+    <string name="default_app" msgid="6864503001385843060">"（既定）"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-ka-rGE/arrays.xml b/res/values-ka-rGE/arrays.xml
index 49fb4e4..46cdc9f 100644
--- a/res/values-ka-rGE/arrays.xml
+++ b/res/values-ka-rGE/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Push ღილაკი"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"დაბალი"</item>
     <item msgid="4212263919458209842">"კრიტიკული"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"გამორთული"</item>
-    <item msgid="5656544177755411222">"შეზღუდული შეწყვეტები"</item>
-    <item msgid="8735337502532332056">"შეწყვეტების გარეშე"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"ჩვეულებრივი"</item>
     <item msgid="866544120205026771">"ზომიერი"</item>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 294410c..f1b7f19 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD ბარათი"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"პროქსი სერვერის პარამეტრები"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"დიახ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"არა"</string>
-    <string name="forget" msgid="7267115980248732932">"დავიწყება"</string>
+    <string name="forget" msgid="1400428660472591263">"დავიწყება"</string>
+    <string name="save" msgid="879993180139353333">"შენახვა"</string>
+    <string name="done" msgid="6942539184162713160">"დასრულდა"</string>
     <string name="settings_label" msgid="1626402585530130914">"პარამეტრები"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"პარამეტრები"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"პარამეტრების მალსახმობი"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"შეაერთეთ დამტენი და სცადეთ ხელახლა."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"ეკრანის დაბლოკვის PIN კოდი ან პაროლი არ არის დაყენებული"</string>
     <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>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"გაფართოებული"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth, დამატებითი"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"როდესაც Bluetooth ჩართულია, თქვენს მოწყობილობას ახლომდებარე Bluetooth მოწყობილობებთან კომუნიკაცია შეუძლია."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"მდებარეობის სიზუსტის გასაუმჯობესებლად, Google მომსახურებები Bluetooth მოწყობილობების სკანირებას მოახდენენ, მაშინაც კი, როცა Bluetooth გამორთულია. ამის შეცვლა LINK_BEGINსკანირების პარამეტრებშიLINK_END შეგიძლიათ."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"მდებარეობის სიზუსტის გასაუმჯობესებლად, აპები და მომსახურებები Bluetooth მოწყობილობების სკანირებას მოახდენენ, მაშინაც კი, როცა Bluetooth გამორთულია. ამის შეცვლა <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>სკანირების პარამეტრებში<xliff:g id="LINK_END_1">LINK_END</xliff:g> შეგიძლიათ."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"დაუკავშირდი…"</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>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"მდებარეობის სიზუსტის გასაუმჯობესებლად, Google მომსახურებები Wi‑Fi ქსელების სკანირებას მოახდენენ, მაშინაც კი, როცა Wi‑Fi გამორთულია. ამის შეცვლა LINK_BEGINსკანირების პარამეტრებშიLINK_END შეგიძლიათ."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"მდებარეობის სიზუსტის გასაუმჯობესებლად, აპები და მომსახურებები Wi‑Fi ქსელების სკანირებას მოახდენენ, მაშინაც კი, როცა Wi‑Fi გამორთულია. ამის შეცვლა <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>სკანირების პარამეტრებში<xliff:g id="LINK_END_1">LINK_END</xliff:g> შეგიძლიათ."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"აღარ მაჩვენო"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"ძილის რეჟიმის დროს Wi‑Fi დარჩეს ჩართული"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi ძილის რეჟიმში ჩართულია"</string>
@@ -604,8 +601,6 @@
     <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_apps" msgid="6003687912727859577">"აპების ჩვენება"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"WiFi სიმძ. ჩვენება"</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>
@@ -663,6 +658,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"დაკავშირება"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"ამ ქსელს არ აქვს ინტერნეტზე წვდომა. მაინც გამოიყენებთ ამ ქსელს?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"აღარ მოითხოვოთ ეს ქსელი კიდევ ერთხელ."</string>
     <string name="wifi_connect" msgid="1076622875777072845">"დაკავშირება"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ქსელთან დაკავშირება ვერ ხერხდება"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"წაშლა"</string>
@@ -729,21 +726,17 @@
     <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> პორტატიული Wi‑Fi hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"დარეკვა Wi-Fi-ს მეშვეობით"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"ზარის პრეფერენციები"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi-თი დარეკვის რეჟიმი"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"სასურველია Wi-Fi"</item>
     <item msgid="5267397515594230396">"სასურველია ფიჭური ინტერნეტი"</item>
-    <item msgid="3132912693346866895">"მხოლოდ Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"როდესაც Wi-Fi ზარი ჩართულია, თქვენს ტელეფონს შეუძლია გადაამისამართოს ზარი Wi-Fi ან თქვენს ოპერატორ ქსელზე, თქვენი პრეფერენციებისა და სიგნალის სიძლიერის მიხედვით. ამ ფუნქციის ჩართვამდე, დააზუსტეთ თქვენს ოპერატორთან შესაძლო თანხები და სხვა დეტალები."</string>
     <string name="home_settings" msgid="212375129455718176">"სახლი"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ეკრანი"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ხმა"</string>
@@ -915,12 +908,12 @@
     <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="5128673488173839077">"აპები და აპების მონაცემები"</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_media_misc_usage" msgid="235452944021647124">"სხვადასხვა"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"სხვა ფაილები"</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>
@@ -953,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"მიმდინარეობს გამოერთება"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"მეხსიერება ივსება"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Some system functions, such as syncing, may not work correctly. Try to free space by deleting or unpinning items, such as apps or media content."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"გადარქმევა"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"მიერთება"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"გამოღება"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"წაშლა და ფორმატირება"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"წაშლა და ფორმატირება შიდა მეხსიერებაში"</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>
@@ -963,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"საშუალებას აძლევს MIDI ჩართულ აპლიკაციებს, USB-ს მეშვეობით იმუშაოს თქვენი MIDI პროგრამული უზრუნველყოფის კომპიუტერებზე."</string>
     <string name="storage_other_users" msgid="808708845102611856">"სხვა მომხმარებლები"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"მოწყობილობის მეხსიერება"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"ამოღებადი მეხსიერება"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"თავისუფალია <xliff:g id="FREE">%1$s</xliff:g> (სულ: <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> მიერთებულია"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g>-ის მიერთება ვერ მოხერხდა"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> უსაფრთხოდ გამოღებულია"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g>-ის უსაფრთხოდ გამოღება ვერ მოხერხდა"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> ფორმატირებულია"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g>-ის ფორმატირება ვერ მოხერხდა"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"მეხსიერების სახელის გადარქმევა"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"დაფორმატების შემდეგ, ამ <xliff:g id="NAME_0">^1</xliff:g>-ის გამოყენება სხვა მოწყობილობებში შეგიძლიათ. \n\nამ <xliff:g id="NAME_1">^1</xliff:g>-ზე არსებული ყველა მონაცემი წაიშლება. პირველ რიგში, სასურველია, შექმნათ მონაცემთა სარეზერვო ასლი. \n\n"<b>"დაამარქაფეთ ფოტოები და სხვა მედია"</b>" \nგადაიტანეთ მედია ფაილები ამ მოწყობილობის ალტერნატიულ საცავში ან კომპიუტერში USB კაბელის გამოყენებით. \n\n"<b>"დაამარქაფეთ აპები"</b>" \nმოხდება ამ <xliff:g id="NAME_6">^1</xliff:g>-ზე შენახული ყველა აპის დეინსტალაცია, ხოლო მათი მონაცემები წაიშლება. ამ აპების შესანარჩუნებლად, გადააადგილეთ ისინი ამ მოწყობილობის ალტერნატიულ საცავში."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"ამ <xliff:g id="NAME_0">^1</xliff:g>-ის გამოღებისას, მასზე შენახული აპები შეწყვეტენ მუშაობას, ხოლო მასზე შენახული მედია ფაილები ხელახლა ჩასმამდე მიუწვდომელი იქნება."</b>" \n\nეს <xliff:g id="NAME_1">^1</xliff:g> დაფორმატებულია მხოლოდ ამ მოწყობილობაზე სამუშაოდ. ის არცერთ სხვა მოწყობილობაზე არ იმუშავებს."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"დააყენეთ თქვენი <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"პორტატულ საცავად გამოყენება"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"მოწყობილობებს შორის ფოტოებისა და სხვა მედიის გადასაადგილებლად."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"შიდა მეხსიერებად გამოყენება"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"განკუთვნილია ნებისმიერი ერთეულის, მათ შორის, აპებისა და ფოტოების შესანახად მხოლოდ ამ მოწყობილობაზე. საჭიროებს დაფორმატებას, რაც შეუძლებელს გახდის მის სხვა მოწყობილობებზე მუშაობას."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"შიდა მეხსიერებად დაფორმატება"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"ეს საჭიროებს <xliff:g id="NAME_0">^1</xliff:g>-ის დაფორმატებას უსაფრთხოების მიზნით. \n\nდაფორმატების შემდეგ, ეს <xliff:g id="NAME_1">^1</xliff:g> მხოლოდ ამ მოწყობილობაზე იმუშავებს. \n\n"<b>"დაფორმატება წაშლის <xliff:g id="NAME_2">^1</xliff:g>-ზე ამჟამად შენახულ ყველა მონაცემს."</b>" მონაცემთა დაკარგვის თავიდან ასაცილებლად, სასურველია, დამარქაფება."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"წაშლა და დაფორმატება"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g>-ის დაფორმატება…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"არ ამოიღოთ <xliff:g id="NAME">^1</xliff:g> დაფორმატებისას."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"გადააადგილეთ მონაც. ახალ საცავში"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"შეგიძლიათ ამ ახალ <xliff:g id="NAME">^1</xliff:g>-ზე გადააადგილოთ თქვენი ფოტოები, ფაილები და აპების მონაცემები. \n\nგადაადგილებას დაახლოებით <xliff:g id="TIME">^2</xliff:g> დასჭირდება და შიდა მეხსიერებაში <xliff:g id="SIZE">^3</xliff:g> გამოთავისუფლდება. გადაადგილების პროცესში ზოგიერთი აპი არ იმუშავებს."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"ახლავე გადაადგილება"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"მოგვიანებით გადაადგილება"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"გადაადგილეთ მონაცემები ახლა"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"გადაადგილებას დაახლოებით <xliff:g id="TIME">^1</xliff:g> დასჭირდება. ეს გამოათავისუფლებს <xliff:g id="SIZE">^2</xliff:g>-ს შიდა მეხსიერებიდან."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"გადაადგილება"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"მონაცემთა გადაადგილება…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"გადაადგილებისას: \n• არ ამოიღოთ <xliff:g id="NAME">^1</xliff:g>. \n• ზოგიერთი აპი სათანადოდ არ იმუშავებს. \n• არ შეწყვიტოთ მოწყობილობის დამუხტვა."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> მზად არის"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"თქვენი <xliff:g id="NAME">^1</xliff:g> ფოტოებისა და სხვა მედიის გამოსაყენებლად მზად არის."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"თქვენი ახალი <xliff:g id="NAME">^1</xliff:g> მუშაობს. \n\nფოტოების, ფაილებისა და აპების მონაცემების ამ მოწყობილობაზე გადასაადგილებლად გადადით: პარამეტრები &gt; მეხსიერება."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"გადაადგილეთ <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<xliff:g id="APP">^1</xliff:g>-ის და მისი მონაცემების <xliff:g id="NAME_0">^2</xliff:g>-ზე გადაადგილებას მხოლოდ რამდენიმე წამი დასჭირდება. გადაადგილების დასრულებამდე აპის გამოყენებას ვერ შეძლებთ. \n\nარ ამოიღოთ <xliff:g id="NAME_1">^2</xliff:g> გადაადგილებისას."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g>-ის გადაადგილება…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"გადაადგილებისას, არ ამოიღოთ <xliff:g id="NAME">^1</xliff:g>. \n\nგადაადგილების დასრულებამდე <xliff:g id="APP">^2</xliff:g> აპი ამ მოწყობილობაში მიუწვდომელი იქნება."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"გადაადგილების გაუქმება"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"ბატარეის სტატუსი"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ბატარეის დატენვის დონე"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1007,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"საწყის პარამეტრებზე ჩამოყრა"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ნაგულისხმევი APN პარამეტრების  აღდგენა დასრულებულია"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"ქსელის პარამეტრების ჩამოყრა"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"ეს ქსელთან დაკავშირებულ ყველა პარამეტრს ქარხნულ ნაგულისხმევ პარამეტრებზე ჩამოყრის, მათ შორის:\n\n"<li>"Wifi-ს"</li>\n<li>"მობილურ ინტერნეტს"</li>\n<li>"Bluetooth-ს"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"ამ მოქმედებით ქსელის ყველა პარამეტრი ჩამოიყრება, მათ შორის:\n\n"<li>"Wi‑Fi"</li>\n<li>"ფიჭური მონაცემები"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"პარამეტრების ჩამოყრა"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"ჩამოვყაროთ ქსელის ყველა პარამეტრი? ამ მოქმედების უკუქცევა შეუძლებელია!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"გსურთ ქსელის ყველა პარამეტრის ჩამოყრა? ამ მოქმედების გაუქმება შეუძლებელია!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"პარამეტრების ჩამოყრა"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"ქსელის პარამეტრების ჩამოყრის დასადასტურებლად, უნდა დახატოთ თქვენი განბლოკვის ნიმუში."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"ჩამოვყაროთ პარამეტრები?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"ქსელის პარამეტრების ჩამოყრა"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"ქსელის პარამეტრები ჩამოიყარა"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"მოწყობილობის საწყისზე დაბრ."</string>
     <string name="master_clear_title" msgid="5907939616087039756">"ქარხნული მონაცემების აღდგენა"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ეს მოქმედება წაშლის ყველა მონაცემებს თქვენი ტაბლეტის "<b>"შიდა მეხსიერებიდან"</b>", მათ შორის:\n\n"<li>"თქვენს Google-ის ანგარიშს"</li>\n<li>"სისტემისა და აპების მონაცემებს და პარამეტრებს"</li>\n<li>"ჩამოტვირთულ აპებს"</li></string>
@@ -1029,9 +1065,8 @@
     <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="1062841478823409667">"გსურთ მთელი თქვენი პირადი ინფორმაციისა და ჩამოტვირთული აპების წაშლა? ამ მოქმედების გაუქმება შეუძლებელია!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ყველაფრის წაშლა"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"ქარხნულ პარამეტრებზე დაბრუნება ამ მომხმარებლისათვის მიუწვდომელია"</string>
@@ -1048,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"ხმოვანი ფოსტის, ზარის გადამისამართების, ზარის დალოდების, დამრეკავის ID-ის დაყენება"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB მოდემი"</string>
@@ -1081,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"დახმარება"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"ფიჭური ქსელები"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"მობილური სატარიფო გეგმა"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"ნაგულისხმევი SMS აპი"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS აპი"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"შეიცვალოს SMS-ის აპი?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"გსურთ, <xliff:g id="CURRENT_APP">%2$s</xliff:g>-ის ნაცვლად გამოიყენოთ <xliff:g id="NEW_APP">%1$s</xliff:g> თქვენს SMS აპად?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"გსურთ, გამოიყენოთ <xliff:g id="NEW_APP">%s</xliff:g> თქვენს SMS აპად?"</string>
@@ -1112,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ადგილმდებარეობის განსაზღვრისათვის, გამოიყენეთ GPS"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"სკანირება"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"სკანირება"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi სკანირება"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"გააუმჯობესეთ მდებარეობის სიზუსტე აპებისთვის და მომსახურებებისთვის Wi‑Fi ქსელების სკანირების ნების მიცემით, მაშინაც კი, როცა Wi‑Fi გამორთულია"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth სკანირება"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"გააუმჯობესეთ მდებარეობის სიზუსტე სისტემური მომსახურებებისთვის Bluetooth მოწყობილობების სკანირების ნების მიცემით, მაშინაც კი, როცა Bluetooth გამორთულია"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; ფიჭური ქსელის მდებარეობა"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"თქვენი ადგილმდებარეობის უფრო სწრაფად დასადგენად დართეთ აპებს ნება, გამოიყენონ Google-ის მდებარეობის სერვისი. ანონიმური მდებარეობის მომაცემები შეგროვდება და გაეგზავნება Google-ს."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi-ს მიერ დადგენილი ადგილმდებარეობა"</string>
@@ -1157,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"პაროლი გაიგზავნა"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-კოდი გაიგზავნა"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"გრაფიკული გასაღები გაიგზავნა"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"გასაგრძელებლად გამოიყენეთ თქვენი მოწყობილობის ნიმუში."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"გასაგრძელებლად შეიყვანეთ თქვენი მოწყობილობის PIN."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"გასაგრძელებლად შეიყვანეთ თქვენი მოწყობილობის პაროლი."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"არასწორი PIN"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"არასწორი პაროლი"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"არასწორი ნიმუში"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"მოწყობილობის უსაფრთხოება"</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_wrong" msgid="4694973540770105678">"სცადეთ ხელახლა:"</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>
@@ -1183,8 +1224,7 @@
     <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" msgid="6909161623701848863">"ძალიან ბევრი არასწორი მცდელობა. სცადეთ ხელახლა <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>
@@ -1235,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"დაახარისხე ზომის მიხედვით"</string>
     <string name="show_running_services" msgid="5736278767975544570">"გაშვებული სერვის. ჩვენება"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"ქეშირებული პროცესების ჩვენება"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"საგანგებო სიტუაციების აპი"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"აპის პარამეტრების აღდგენა"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"გადავაყენო აპლიკაციის პარამეტრები?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"ამგვარად საწყის მდგომარეობას დაუბრუნდება ყველა სასურველი პარამეტრი მოცემული კომპონენტებისთვის:\n\n "<li>"გაუქმებული აპები"</li>\n" "<li>"გაუქმებული აპის შეტყობინებები"</li>\n" "<li>"გაუქმებული აპლიკაციები ქმედებებისთვის"</li>\n" "<li>"ფონური მონაცემების შეზღუდვები აპებისთვის"</li>\n" "<li>"ნებართვის ნებისმიერი შეზღუდვები"</li>\n\n" აპების მონაცემები არ დაიკარგება."</string>
@@ -1440,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ყველა bluetooth HCI პაკეტის ფაილში ჩაწერა"</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="select_logd_size_title" msgid="7433137108348553508">"ჟურნალიზაციის ბუფერის ზომები"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 საათი"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 დღე"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"სისტემის ჩვენება"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"სისტემური პროცესების დამალვა"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss-ის გამოყენება"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"სტატისტიკის ტიპი"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"ფონი"</string>
@@ -1838,7 +1876,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_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>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"მომხმარებელი"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"შეზღუდული პროფილი"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"დაემატოს ახალი მომხმარებელი?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"ეს მოწყობილობა შეგიძლიათ სხვებს გაუზიაროთ, დამატებითი მომხმარებლების შექმნით. ყოველ მომხმარებელს საკუთარი სივრცე ექნება, რომლის მორგებაც საკუთარი აპებით, ფონით და ა.შ. შეეძლებათ. მომხმარებლებს ასევე შეუძლიათ შეცვალოთ ისეთი პარამეტრები, რაც ყველას შეეხება, მაგ. Wi‑Fi.\n\nახალი მომხმარებლის დამატებისას, ამ მომხმარებელს საკუთარი სივრცის შექმნა მოუწევს.\n\nნებისმიერ მომხმარებელს შეუძლია აპები ყველა სხვა მომხმარებლისათვის განაახლოს."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"დამატებითი მომხმარებლების შექმნით, შეგიძლიათ ეს მოწყობილობა სხვებს გაუზიაროთ. თითოეულ მომხმარებელს თავისი სივრცე აქვს, რომლის პერსონალიზება მას შეუძლია საკუთარი აპებით, ფონით და ა.შ. მომხმარებლებს აგრეთვე შეუძლიათ მოწყობილობის ისეთი პარამეტრების მორგება, როგორიცაა Wi‑Fi, რაც ყველაზე გავრცელდება.\n\nახალი მომხმარებლის დამატების შემდეგ, აღნიშნულმა მომხმარებელმა საკუთარი სივრცის დაყენების პროცესი უნდა გაიაროს.\n\nნებისმიერი მომხმარებელი შეძლებს აპების ყველა სხვა დანარჩენი მომხმარებლისთვის განახლებას."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"ახალი მომხმარებლის დამატებისას, ამ მომხმარებელს საკუთარი სივრცის შექმნა მოუწევს.\n\nნებისმიერ მომხმარებელს შეუძლია აპები ყველა სხვა მომხმარებლისათვის განაახლოს."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"დავაყენო მომხმარებლის პარამეტრები?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"დარწმუნდით, რომ პირს შეუძლია მოწყობილობის აღება და საკუთარი სივრცის და დაყენება"</string>
@@ -2393,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"შეზღუდვა შეზღუდული"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"ტექსტის კორექცია შესწორება ხმა ვიბრაცია ავტო ენა ჟესტი შეთავაზება თემა შეურაცხმყოფელი სიტყვა აკრეფა emoji საერთაშორისო"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"გადაყენება პარამეტრები ნაგულისხმევი"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"სასწრაფო გადაუდებელი შემთვევების ნაგულისხმევი აპლიკაცია"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"აპები ჩამოტვირთვა აპლიკაციები სისტემა"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"აპლიკაციების ნებართვების უსაფრთხოება"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"აპები ნაგულისხმევი"</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>
@@ -2411,14 +2448,12 @@
     <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="6948120138640252732">"შეფერხებების დაბლოკვა"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"დაუშვას მხოლოდ პრიორიტეტულები"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ავტომატური წესები"</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_alarms" msgid="7380265858042606857">"დაუშვას მხოლოდ გაფრთხილებები"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"არ დაუშვა შეწყვეტა"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"მხოლოდ პრიორიტეტული"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"მხოლოდ მაღვიძარები"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"შეფერხებების გარეშე"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ტელეფონის ზარი"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"შეტყობინებების ნაგულისხმევი ზარის მელოდია"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ზარებზე ასევე ვიბრირება"</string>
@@ -2451,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"არცერთი შეტყობინებების მსმენელი არ არის დაინსტალირებული."</string>
     <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">"პირობებს არცერთი აპი არ გაწვდით"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d აპი გაწვდით პირობებს</item>
-      <item quantity="one">%d აპი გაწვდით პირობებს</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="loading_notification_apps" msgid="5031818677010335895">"აპები იტვირთება..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"ყველას დაბლოკვა"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ამ აპზე შეტყობინებები არასდროს აჩვენო"</string>
@@ -2473,17 +2499,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"წესის სახელი"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"წესის დამატება"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"წესის წაშლა"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"წაიშალოს წესი „<xliff:g id="RULE">%1$s</xliff:g>“?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"წაშლა"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"წესის ტიპი"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"უცნობი"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"წესის კონფიგურაცია"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"განრიგის წესი"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"წესი ვერ მოიძებნა."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"დღეები"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"არცერთი"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"ყოველდღე"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"არასოდეს"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>-დან <xliff:g id="END">%2$s</xliff:g>-მდე"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"ზარები"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"შეტყობინებები"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"ზარები/შეტყობინებები ავტორისგან:"</string>
@@ -2493,15 +2525,66 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"მაღვიძარები"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"შეხსენებები"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ღონისძიებები"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"არჩეული აბონენტები"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"აბონენტების გამეორება"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"თუ პიროვნება <xliff:g id="MINUTES">%d</xliff:g> წუთის მანძილზე მეორედ დარეკავს, დაიშვას"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"შემდეგი დღის <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"შეწყვეტები"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"ზარებისა და შეტყობინებების შემოსვლისას"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"როდის გსურთ შეწყვეტა?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"რამდენი ხნით?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"შეწყვეტა ყოველთვის"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"გამორთული,ყველა,ყველაფერი"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"მხოლოდ პრიორიტეტული შეწყვეტების დაშვება"</string>
+    <string name="zen_mode_option_voice_important_synonyms" msgid="6120004096615029102">"მნიშვნელოვანი,პრიორიტეტული,პრიორიტეტული შეტყობინებები"</string>
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"მხოლოდ გაფრთხილებების დაშვება"</string>
+    <string name="zen_mode_option_voice_alarms_synonyms" msgid="7463720676061371446">"გაფრთხილებები"</string>
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"არ დაუშვა შეწყვეტა"</string>
+    <string name="zen_mode_option_voice_no_interruptions_synonyms" msgid="6196235656198436233">"არცერთი,არაფერი,შეწყვეტის გარეშე"</string>
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"განუსაზღვრელი დროით"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> წუთი</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> წუთი</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> საათი</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> საათი</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"პრიორიტეტულ შეტყობინებებზე მხოლოდ განუსაზღვრელი დროით გადაყვანა"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">პრიორიტეტულ შეტყობინებებზე გადაყვანა მხოლოდ <xliff:g id="DURATION">%1$d</xliff:g> წუთით <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>-მდე</item>
+      <item quantity="one">პრიორიტეტულ შეტყობინებებზე გადაყვანა მხოლოდ ერთი წუთით <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>-მდე</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">პრიორიტეტულ შეტყობინებებზე გადაყვანა მხოლოდ <xliff:g id="DURATION">%1$d</xliff:g> საათით (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>-მდე)</item>
+      <item quantity="one">პრიორიტეტულ შეტყობინებებზე გადაყვანა მხოლოდ ერთი საათით <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>-მდე</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"მაღვიძარებზე მხოლოდ განუსაზღვრელი დროით გადაყვანა"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">მაღვიძარებზე მხოლოდ <xliff:g id="DURATION">%1$d</xliff:g> წუთით გადაყვანა (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>-მდე)</item>
+      <item quantity="one">მაღვიძარებზე მხოლოდ ერთი წუთით გადაყვანა <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>-მდე</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">მაღვიძარებზე მხოლოდ <xliff:g id="DURATION">%1$d</xliff:g> საათით გადაყვანა <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>-მდე</item>
+      <item quantity="one">მაღვიძარებზე მხოლოდ ერთი საათით გადაყვანა <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>-მდე</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"„შეწყვეტის გარეშე“ რეჟიმზე განუსაზღვრელი დროით გადაყვანა"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">„შეწყვეტის გარეშე“ რეჟიმზე <xliff:g id="DURATION">%1$d</xliff:g> წუთით გადაყვანა (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>-მდე)</item>
+      <item quantity="one">„შეწყვეტის გარეშე“ რეჟიმზე ერთი წუთით გადაყვანა <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>-მდე</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">„შეწყვეტის გარეშე“ რეჟიმზე გადაყვანა <xliff:g id="DURATION">%1$d</xliff:g> საათით <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>-მდე</item>
+      <item quantity="one">„შეწყვეტის გარეშე“ რეჟიმზე ერთი საათით გადაყვანა <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>-მდე</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"„მუდმივად შეწყვეტის“ რეჟიმზე გადაყვანა"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"სამუდამოდ"</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>
@@ -2566,7 +2649,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ნებართვა გაცემულია</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ნებართვა გაცემულია</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_3">%d</xliff:g>-დან <xliff:g id="COUNT_2">%d</xliff:g> ნებართვა გაცემულია</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>-დან <xliff:g id="COUNT_0">%d</xliff:g> ნებართვა გაცემულია</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"ზოგიერთი ნაგულისხმევი პარამეტრი დაყენებულია"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"ნაგულისხმევი პარამეტრები არ არის დაყენებული."</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"ყველა აპი"</string>
@@ -2577,8 +2663,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"პრიორიტული"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"სენსიტიური"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"დომენის URL-ებით"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"ყველა აპის პარამეტრების ნაგულისხმევზე გადაყენება"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"დაყენებულია <xliff:g id="COUNT">%d</xliff:g> აპი, სისტემური და ჩამოტვირთული აპების ჩათვლით"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"გათიშულია ადმინისტრატორის მიერ"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"გაფართოებული"</string>
     <string name="unknown_app" msgid="5275921288718717656">"უცნობი აპი"</string>
     <string name="choose_profile" msgid="8229363046053568878">"პროფილის არჩევა"</string>
@@ -2593,4 +2678,10 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> აპლიკაციებს შეუძლიათ გახსნან მათი დომენი URL-ები</item>
       <item quantity="one">ერთ აპლიკაციას შეუძლია გახსნას მისი დომენი URL-ები</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"არ არის ამოცნობილი"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"ნაგულისხმევი აპები"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"ბრაუზერის აპი"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"ნაგულისხმები ბრაუზერი არ არის"</string>
+    <string name="default_app" msgid="6864503001385843060">"(ნაგულისხმევი)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"აპების საცავი"</string>
 </resources>
diff --git a/res/values-kk-rKZ/arrays.xml b/res/values-kk-rKZ/arrays.xml
index be8500c..01aa2f5 100644
--- a/res/values-kk-rKZ/arrays.xml
+++ b/res/values-kk-rKZ/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD (басу жұмысының жолы)"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Итеру түймесі"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"төмен"</item>
     <item msgid="4212263919458209842">"өте төмен"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Өшірулі"</item>
-    <item msgid="5656544177755411222">"Шектеулі үзілістер"</item>
-    <item msgid="8735337502532332056">"Нөл үзілістер"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Қалыпты"</item>
     <item msgid="866544120205026771">"Орташа"</item>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 8f636ba..9b1be4d 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD картасы"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Прокси параметрлері"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ИӘ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"ЖОҚ"</string>
-    <string name="forget" msgid="7267115980248732932">"ҰМЫТУ"</string>
+    <string name="forget" msgid="1400428660472591263">"Ұмыту"</string>
+    <string name="save" msgid="879993180139353333">"Сақтау"</string>
+    <string name="done" msgid="6942539184162713160">"Дайын"</string>
     <string name="settings_label" msgid="1626402585530130914">"Параметрлер"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Параметрлер"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Параметрлердің төте пернелері"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Зарядтағышты жалғап, қайта әрекеттеніңіз."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Экран бекіту PIN коды немесе кілтсөзі жоқ"</string>
     <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>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Қосымша"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Жетілдірілген Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetooth қос. б., құр. басқа маң. Bluetooth құр-мен байл. алады."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"Аймақ нақтылығын арттыру үшін, Google қызметтері Bluetooth өшірулі кезде де Bluetooth құрылғыларын тексереді. Мұны LINK_BEGINтексеру параметрлеріLINK_END ішінен өзгерте аласыз."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Орналасу жақсарту үшін тіпті Bluetooth өшірулі кезде де, қолданбалар мен қызметтер Bluetooth құрылғыларын іздейді. Бұны <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>іздеу параметрлерінен<xliff:g id="LINK_END_1">LINK_END</xliff:g> өзгерте аласыз."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"…қосылу"</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>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"Аймақ нақтылығын арттыру үшін, Google қызметтері Wi-Fi өшірулі кезде де, Wi-Fi желілерін тексереді. Мұны LINK_BEGINтексеру параметрлеріLINK_END ішінен өзгерте аласыз."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Орналасу дәлдігін жақсарту үшін тіпті Wi-Fi өшірулі кезде де, қолданбалар мен қызметтерге Wi-Fi желілерін іздейді. Бұны <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>іздеу параметрлерінен<xliff:g id="LINK_END_1">LINK_END</xliff:g> өзгерте аласыз."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Қайта көрсетпеңіз"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Ұйқы кезінде Wi‑Fi қосулы болсын"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Ұйқы режимінде Wi‑Fi қосулы"</string>
@@ -604,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Тікелей"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Скандеу"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Қосымша"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Қолданбалар. көрсету"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Wi-Fi күшін көрсету"</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>
@@ -663,6 +658,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ҚОСЫЛУ"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Бұл желі арқылы интернетке кіру мүмкін емес. Бәрібір осы желіні пайдаланасыз ба?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Осы желі үшін енді сұралмасын"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Жалғау"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Желіге қосылу орындалмады"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Ұмыту"</string>
@@ -729,21 +726,17 @@
     <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> жиналмалы Wi‑Fi хотспот"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android хот-споты"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi қоңыраулары"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Қоңырау шалу қалауы"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi қоңырау шалу режимі"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi ұсынылған"</item>
     <item msgid="5267397515594230396">"Ұялы байланыс ұсынылған"</item>
-    <item msgid="3132912693346866895">"Тек Wi-Fi желісі"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wi-Fi қоңырау шалу қосулы кезде қалауыңызға және қайсы сигнал күштілігіне байланысты телефоныңыз қоңырауларды Wi-Fi желілері не жабдықтаушы желісі арқылы бағыттауы мүмкін. Бұл мүмкіндікті қосудан бұрын жабдықтаушыңыздың қатысты алымдары мен басқа мәліметтерді тексеріңіз."</string>
     <string name="home_settings" msgid="212375129455718176">"Негізгі"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Дыбыс"</string>
@@ -915,12 +908,12 @@
     <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="5128673488173839077">"Қолданбалар мен қолданба деректері"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Meдиа"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Жүктеулер"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Фотосуреттер, видеолар"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Aудио (музыка, әуендер, подкастар, т.б.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Басқалар"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Басқа файлдар"</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>
@@ -953,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Шығару әрекеті орныдалуда"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Жад кеңістігі азайып барады"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Синхрондау сияқты кейбір жүйе функциялары дұрыс жұмыс істемеуі мүмкін. Қолданбалар немесе медиа мазмұны сияқты нәрселерді алып, орын босатып көріңіз."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Атауын өзгерту"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"мазмұнды картадан жүктеу"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Шығару"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Өшіру және пішімдеу"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Өшіру және ішкі жад рет.піш-у"</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>
@@ -963,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"MIDI қолдайтын қолданбалар компьютеріңізде MIDI бағдарламасы көмегімен USB арқылы жұмыс істейді."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Басқа пайдаланушылар"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Құрылғы жады"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Алынбалы жад"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> бос орын (жалпы <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> орнатылған"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g> орнату мүмкін емес"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> қауіпсіз шығарылды"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g> қауіпсіз шығару мүмкін емес"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> пішімделген"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> пішімдеу мүмкін емес"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Жад атауын өзгерту"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Пішімдегеннен кейін бұл <xliff:g id="NAME_0">^1</xliff:g> басқа құрылғыларда пайдаланыла алады. \n\nОсы <xliff:g id="NAME_1">^1</xliff:g> ішіндегі барлық деректер жойылады. Алдымен сақтық көшірмесін жасап алған жөн. \n\n"<b>"Фотосуреттер мен басқа медиа түрлерінің сақтық көшірмесін жасау"</b>\n"Медиа файлдарыңызды осы құрылғыдағы басқа жадқа аударып қойыңыз немесе USB кабелінің көмегімен компьютерге жіберіңіз. \n\n"<b>"Қолданбалардың сақтық көшірмесін жасау"</b>\n"Осы <xliff:g id="NAME_6">^1</xliff:g> ішінде сақталған барлық қолданбалар жойылып, деректері өшіріледі. Бұл қолданбаларды сақтап қалу үшін осы құрылғыдағы басқа бір жадқа аудару керек."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Бұл <xliff:g id="NAME_0">^1</xliff:g> шығарылғанда, ондағы қолданбалар жұмысын тоқтатып, қайта енгізілмейінше, ішінде сақталған медиа файлдар қолжетімсіз болады."</b>\n\n"Бұл <xliff:g id="NAME_1">^1</xliff:g> осы құрылғыда ғана жұмыс істеу үшін пішімделген. Басқаларында жұмыс істемейді."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> орнату"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Портативті жад ретінде пайдалану"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Құрылғылар арасында фотосуреттер мен басқа медиа файлдарын тасымалдау үшін."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Ішкі жад ретінде пайдалану"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Қолданбалар мен фотосуреттерді қоса, барлық деректі тек осы құрылғыға сақтау үшін. Оның басқа құрылғылармен жұмыс істеуіне жол бермейтін пішімдеуді орындау талап етіледі."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Ішкі жад ретінде пішімдеу"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Қауіпсіздік үшін <xliff:g id="NAME_0">^1</xliff:g> пішімделуі керек. \n\nПішімделгеннен кейін бұл <xliff:g id="NAME_1">^1</xliff:g> тек осы құрылғыда жұмыс істейтін болады. \n\n"<b>"Пішімдеген кезде <xliff:g id="NAME_2">^1</xliff:g> ішінде сақталған барлық дерек өшеді."</b>" Деректер жоғалып қалмауы үшін сақтық көшірмесін жасап қойған жөн."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Өшіру және пішімдеу"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> пішімделуде…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Пішімделіп жатқан <xliff:g id="NAME">^1</xliff:g> ұясынан шығарылмауы тиіс."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Деректерді жаңа жадқа аудару"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Фотосуреттеріңізді, файлдарыңызды және қолданба деректеріңізді осы жаңа <xliff:g id="NAME">^1</xliff:g> құрылғысына аударып қоюға болады. \n\nОған шамамен <xliff:g id="TIME">^2</xliff:g> уақыт жұмсалып, ішкі жадтың <xliff:g id="SIZE">^3</xliff:g> орны босайды. Кейбір қолданбалар пайдаланылып жатқанда жұмыс істемейді."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Қазір аудару"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Кейінірек аудару"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Деректерді қазір аудару"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Аудару үшін шамамен <xliff:g id="TIME">^1</xliff:g> уақыт жұмсалады. Нәтижесінде ішкі жадтың <xliff:g id="SIZE">^2</xliff:g> орны босайды."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Аудару"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Деректер аударылуда…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Деректер аударылып жатқанда: \n• <xliff:g id="NAME">^1</xliff:g> ұясынан шығарылмауы керек. \n• Кейбір қолданбалар дұрыс жұмыс істемейді. \n• Құрылғыны зарядталған күйде сақтаңыз."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> дайын"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> құрылғыңыз тек фотосуреттер мен басқа медиа файлдарын сақтауға арналған."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Жаңа <xliff:g id="NAME">^1</xliff:g> жұмыс істеп тұр. \n\nФотосуреттерді, файлдарды және қолданба деректерін осы құрылғыға аудару үшін Параметрлер &gt; Жад тармағына өтіңіз."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> қолданбасын аудару"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<xliff:g id="APP">^1</xliff:g> және оның деректерін <xliff:g id="NAME_0">^2</xliff:g> құрылғысына аударуға көп уақыт кетпейді. Деректер аударылып болмайынша, қолданба пайдаланылмайды. \n\nАудару барысында <xliff:g id="NAME_1">^2</xliff:g> ұясынан шығарылмауы керек."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> аударылуда…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Аудару барысында <xliff:g id="NAME">^1</xliff:g> ұясынан шығарылмауы керек. \n\nОсы құрылғыдағы <xliff:g id="APP">^2</xliff:g> аударылып біткенше істемей тұрады."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Аударудан бас тарту"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Батарея күйі"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Батарея деңгейі"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN (Apple хабар жіберу қызметі)"</string>
@@ -1007,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Бастапқы параметрлеріне қайта реттеу"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Бастапқы қол жетімділік нүктесі атауының параметрлерін қайта орнату аяқталды."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Желі параметрлерін қалпына келтіру"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Бұл желі жасауға байланысты төмендегілерді қоса барлық параметрлерді зауыттық мәндерге қалпына келтіреді:\n\n"<li>"Wifi"</li>\n<li>"Ұялы деректер"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Бұл келесілерді қоса барлық желі параметрлерін қалпына келтіреді:\n\n"<li>"Wi‑Fi"</li>\n<li>"Ұялы байланыс деректері"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Параметрлерді қалпына келтіру"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Барлық желі параметрлерін қалпына келтіресіз бе? Бұл әрекетті кері қайтару мүмкін емес!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Барлық желі параметрлерін қалпына келтіресіз бе? Бұл әрекетті болдырмау мүмкін емес!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Параметрлерді қалпына келтіру"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Желі параметрлерін қалпына келтіру үшін құлыптан босату үлгісін салуыңыз керек."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Қалпына келтіру қажет пе?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Желі параметрлерін қалпына келтіру"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Желі параметрлері қалпына келтірілген"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Құрылғыны ысыру"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Зауыттық деректерді қалпына келтіру"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Бұл сіздің планшетіңіздің "<b>"ішкі жадынан"</b>" барлық дерекқорды өшіреді, келесі деректерді қоса:\n\n"<li>"Google есептік жазбаңыз"</li>\n<li>"Жүйе және қолданба дерекқоры және параметрлері"</li>\n<li>"Жүктелген қолданбалар"</li></string>
@@ -1029,9 +1065,8 @@
     <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="1062841478823409667">"Барлық жеке ақпаратыңыз бен жүктелген қолданбаларды өшіресіз бе? Бұл әрекетті болдырмау мүмкін емес!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Барлығын өшіру"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Зауыттық параметрлерді қалпына келтіру бұл пайдаланушы үшін қол жетімді емес"</string>
@@ -1048,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Дауыс хабары, қоңырауды басқа нөмірге бағыттау, күту және қоңырау шалушының жеке анықтағышын орнату"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB тетеринг"</string>
@@ -1081,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Көмек"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Ұялы желілер"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Ұялы жоспар"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Бастапқы SMS қолданбасы"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS қолданбасы"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS қолданбасы өзгертілсін бе?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"<xliff:g id="NEW_APP">%1$s</xliff:g> қолданбасы <xliff:g id="CURRENT_APP">%2$s</xliff:g> орнына SMS қолданбасы ретінде қолданылсын ба?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g> қолданбасы SMS қолданбасы ретінде қолданылсын ба?"</string>
@@ -1112,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Орынды анықтау үшін GPS пайдаланыңыз"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Тексеруде"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Тексеруде"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi іздеу"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Тіпті Wi-Fi өшірулі кезде де, қолданбалар мен қызметтерге Wi-Fi желілерін іздеу рұқсатын беру арқылы орналасуды жақсартыңыз"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth іздеу"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Тіпті Bluetooth өшірулі кезде де, жүйелік қызметтерut Bluetooth құрылғыларын іздеуге рұқсат беру арқылы орналасуды жақсартыңыз"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi және ұялы желі арқылы орынды анықтау"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Аймағыңызды жылдамырақ анықтау үшін қолданбаларға Google\' аймақтар қызметін қолдануға рұқсат етіңіз. Аймақ туралы деректер анонимді түрде жинақталып, Google-ға жіберіледі."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Аймақ Wi‑Fi арқылы анықталды"</string>
@@ -1157,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Кілтсөз тағайындалды"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN тағайындалды"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Кескін реттелді"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Жалғастыру үшін құрылғыңыз үлгісін пайдаланыңыз."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Жалғастыру үшін құрылғыңыз PIN кодын енгізіңіз."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Жалғастыру үшін құрылғыңыз құпия сөзін енгізіңіз."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Қате PIN"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Қате құпия сөз"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Қате үлгі"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Құрылғы қауіпсіздігі"</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_wrong" msgid="4694973540770105678">"Қайта әрекеттену:"</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>
@@ -1183,8 +1224,7 @@
     <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" msgid="6909161623701848863">"Тым көп қате талпыныстар. <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>
@@ -1235,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Өлшемі бойынша сұрыптау"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Қосылған қызметтерді көрсету"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Кэштелген үрдістерді көрсету"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Төтенше жағдай қолданбасы"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Қолданба қалаулыларын қайта реттеу"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Қолданба қалаулы әрекеттері өзгертілсін бе?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Бұл келесі нәрселерге қатысты қалаулы әрекеттерді өзгертеді: \n\n "<li>"Өшірілген қолданбалар"</li>\n" "<li>"Өшірілген қолданба хабарлары"</li>\n" "<li>"Әрекеттерге арналған бастапқы қолданбалар"</li>\n" "<li>"Қолданбалар туралы жалпы мәліметті шектеу"</li>\n" "<li>"Қандай да рұқсат шектеулері"</li>\n\n" Қолданба дерекқорын жоғалтпайсыз."</string>
@@ -1440,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Барлық bluetooth HCI жинақтарын файлға сақтаңыз"</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="select_logd_size_title" msgid="7433137108348553508">"Журналға тіркеуші буферінің өлшемдері"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 сағат"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 күн"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Жүйені көрсету"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Жасыру жүйесі"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss (бірегей реттеу өлшемі) қолдану"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Статистикалар түрі"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Жалпы мәлімет"</string>
@@ -1838,7 +1876,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_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>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Пайдаланушы"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Шектелген профайл"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Жаңа пайд-ны қосу керек пе?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Қосымша пайдаланушыларды жасау арқылы осы құрылғыны басқа адамдармен бөлісуге болады. Әр пайдаланушыда өз кеңістігі бар. Пайдаланушы оны жеке қолданбалармен, экранның артқы фонымен және т.с.с. теңшей алады. Сондай-ақ, пайдаланушылар барлығына әсер ететін Wi‑Fi сияқты құрылғы параметрлерін реттей алады.\n\nЖаңа пайдаланушыны қосқанда сол адам өз кеңістігін реттеуі керек.\n\nКез келген пайдаланушы барлық басқа пайдаланушылар үшін қолданбаларды жаңарта алады."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Қосымша пайдаланушыларды жасау арқылы осы құрылғыны басқа адамдармен бөлісуге болады. Әр пайдаланушыда өз кеңістігі бар. Пайдаланушы оны жеке қолданбалармен, экранның артқы фонымен және т.с.с. теңшей алады. Сондай-ақ, пайдаланушылар барлығына әсер ететін Wi‑Fi сияқты құрылғы параметрлерін реттей алады.\n\nЖаңа пайдаланушыны қосқанда сол адам өз кеңістігін реттеуі керек.\n\nBREAK_2BREAK_3Кез келген пайдаланушы барлық басқа пайдаланушылар үшін қолданбаларды жаңарта алады."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Жаңа пайдаланушыны қосқанда сол адам өз кеңістігін реттеуі керек.\n\nКез келген пайдаланушы барлық басқа пайдаланушылар үшін қолданбаларды жаңарта алады."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Пайдаланушы қазір тағайындалсын ба?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Құрылғыны алатын және кеңістігін реттейтін адам бар екенін тексеріңіз"</string>
@@ -2393,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"шектеу шектелген"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"мәтінді түзету түзету дыбыс дірілдету авто тіл қимыл ұсыну ұсыныс тақырып тіл тигізетін сөз түрі эмодзи халықаралық"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"әдепкі параметрлерді қалпына келтіру"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"төтенше мұз қолданбасының әдепкі мәні"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"қолданбаларды жүктеу қолданбалар жүйесі"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"қолданбалар рұқсаттарының қауіпсіздігі"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"әдепкі қолданбалар"</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>
@@ -2411,14 +2448,12 @@
     <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="6948120138640252732">"Кедергілерді бұғаттау"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Тек басымдық рұқсат береді"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Автоматты ережелер"</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_alarms" msgid="7380265858042606857">"Тек дабылдарға рұқсат ету"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Үзбеу"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Тек басымдық"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Тек дабылдар"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Кедергілерсіз"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Телефон әуені"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Әдепкі хабарландыр. қоң. әуені"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Сондай-ақ, қоңыраулар үшін дірілдету"</string>
@@ -2451,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Хабар тыңдаушылар орнатылмаған."</string>
     <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">"Ешбір қолданба шарттарды қамтамасыз етпейді"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d қолданба шарттарды қамтамасыз етеді</item>
-      <item quantity="one">%d қолданба шарттарды қамтамасыз етеді</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="loading_notification_apps" msgid="5031818677010335895">"Қолданбаларды жүктеу…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Барлығын бұғаттау"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Осы қолданбадан келген хабарландыруларды ешқашан көрсетпеу"</string>
@@ -2473,17 +2499,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"Ереже атауы"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Ереже қосу"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Ережені жою"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"«<xliff:g id="RULE">%1$s</xliff:g>» ережесін жоясыз ба?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Жою"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Ереже түрі"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Белгісіз"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Ережені конфигурациялау"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Ережені жоспарлау"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Ереже табылмады."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Күндер"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Ешқандай"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Күн сайын"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Ешқашан"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Қоңыраулар"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Хабарлар"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Мынадан қоңыраулар/хабарлар"</string>
@@ -2493,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Дабылдар"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Еске салғыштар"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Оқиғалар"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Таңдалған қоңырау шалушылар"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Қайта қоңырау шалушылар"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Сол адам <xliff:g id="MINUTES">%d</xliff:g> минуттың ішінде қайта қоңырау шалса, бұл мүмкіндікті іске қосыңыз"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> келесі күні"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Қай кезде үзіліс алғыңыз келеді?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Қанша уақыт бойы?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Белгісіз уақыт бойы"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> минут</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> минут</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> сағат</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> сағат</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Тек шексіз басымдық хабарландыруларына өзгерту"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> дейін <xliff:g id="DURATION">%1$d</xliff:g> минутқа басымдық хабарландыруларына ғана өзгерту</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> дейін бір минутқа басымдық хабарландыруларына ғана өзгерту</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> сағатқа басымдық хабарландыруларына ғана өзгерту (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> дейін)</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> дейін бір сағатқа басымдық хабарландыруларына ғана өзгерту</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Шексіз дабылдарға ғана өзгерту"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Дабылдарды (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> дейін) <xliff:g id="DURATION">%1$d</xliff:g> минутқа ғана өзгерту</item>
+      <item quantity="one">Дабылдарды <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> дейін дейін бір минутқа ғана өзгерту</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Дабылдарды <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> дейін <xliff:g id="DURATION">%1$d</xliff:g> сағатқа ғана өзгерту</item>
+      <item quantity="one">Дабылдарды <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> дейін бір сағатқа ғана өзгерту</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Шексіз тоқтатпауға өзгерту"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> минут кедергі жасамауға өзгерту (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> дейін)</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> дейін бір минут кедергі жасамауға өзгерту</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> дейін <xliff:g id="DURATION">%1$d</xliff:g> сағат кедергі жасамауға өзгерту</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> дейін бір сағат кедергі жасамауға өзгерту</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Әрқашан тоқтатуға өзгерту"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"мәңгілік"</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>
@@ -2566,7 +2659,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> рұқсат берілген</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> рұқсат берілген</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g>/<xliff:g id="COUNT_3">%d</xliff:g> рұқсат берілген</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g> рұқсат берілген</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Кейбір әдепкі параметрлер орнатылған"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Әдепкі параметрлер орнатылмаған"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Барлық қолданбалар"</string>
@@ -2577,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Басымдық"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Құпия"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Домен URL мекенжайларымен"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Параметрлерді барлық қолданбалар арқылы әдепкі мәндерге орнату"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> қолданбаларымен қоса, жүйе мен жүктелген қолданбалар орнатылды"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Әкімші өшірген"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Кеңейтілген"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Белгісіз қолданба"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Профильді таңдау"</string>
@@ -2593,4 +2688,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> қолданба олардың домен URL мекенжайын ашуы мүмкін</item>
       <item quantity="one">Бір қолданба оның домен URL мекенжайларын ашуы мүмкін</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Анықталмаған"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Әдепкі қолданбалар"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Браузер қолданбасы"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Әдепкі браузер жоқ"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Әдепкі)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-km-rKH/arrays.xml b/res/values-km-rKH/arrays.xml
index c71c64f..a9248cb 100644
--- a/res/values-km-rKH/arrays.xml
+++ b/res/values-km-rKH/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"ប៊ូតុង​ចុច"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"ទាប"</item>
     <item msgid="4212263919458209842">"សំខាន់​"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"បិទ"</item>
-    <item msgid="5656544177755411222">"ការ​រំខាន​បាន​កំណត់"</item>
-    <item msgid="8735337502532332056">"ការ​រំខាន​សូន្យ"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"ធម្មតា"</item>
     <item msgid="866544120205026771">"មធ្យម"</item>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 6764863..2a5c373 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -268,12 +268,10 @@
     <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_all_caps" msgid="3183966387632229461">"បោះបង់"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"បន្ត"</string>
     <string name="okay" msgid="1997666393121016642">"យល់ព្រម"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"បាទ/ចាស"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"ទេ"</string>
-    <string name="forget" msgid="7267115980248732932">"បំភ្លេច"</string>
+    <string name="forget" msgid="1400428660472591263">"បំភ្លេច"</string>
+    <string name="save" msgid="879993180139353333">"រក្សាទុក"</string>
+    <string name="done" msgid="6942539184162713160">"រួចរាល់"</string>
     <string name="settings_label" msgid="1626402585530130914">"ការ​កំណត់"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"ការ​កំណត់"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"កំណត់​ផ្លូវកាត់"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"បញ្ចូល​ថ្ម ហើយ​ព្យាយាម​ម្ដង​ទៀត។"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"គ្មាន​ពាក្យ​សម្ងាត់ ឬ​​កូដ PIN ចាក់​សោ​អេក្រង់"</string>
     <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>
@@ -521,7 +518,7 @@
     <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="ble_scan_notify_text" msgid="9019985398053764737">"ដើម្បីធ្វើឲ្យទីតាំងមានភាពសុក្រិត សេវាកម្ម Google នឹងស្កេនរកឧបករណ៍ប៊្លូធូស បើទោះបីជាប៊្លូធូសនោះបិទក៏ដោយ។ អ្នកអាចប្តូរវានៅក្នុង LINK_BEGINការកំណត់ការស្កេនLINK_END។"</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"ដើម្បីធ្វើឲ្យភាពសុក្រិតនៃទីតាំងមានភាពប្រសើរឡើង កម្មវិធី និងសេវាកម្មនឹងស្កេនរកឧបករណ៍ប៊្លូធូស បើទោះបីជាប៊្លូធូសបិទក៏ដោយ។ អ្នកអាចប្តូរវានៅក្នុង<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ការកំណត់ការស្កេន<xliff:g id="LINK_END_1">LINK_END</xliff:g>។"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"តភ្ជាប់​ជា​មួយ…"</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>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"ដើម្បីធ្វើឲ្យទីតាំងមានភាពសុក្រិត សេវាកម្ម Google នឹងស្កេនរកបណ្តាញ Wi-Fi បើទោះបីជា Wi-Fi នោះបិទក៏ដោយ។ អ្នកអាចប្តូរវានៅក្នុង LINK_BEGINការកំណត់ការស្កេនLINK_END។"</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"ដើម្បីធ្វើឲ្យភាពសុក្រិតនៃទីតាំងមានភាពប្រសើរឡើង កម្មវិធី និងសេវាកម្មនឹងស្កេនរកបណ្តាញ Wi-Fi បើទោះបីជា Wi-Fi បិទក៏ដោយ។ អ្នកអាចប្តូរវានៅក្នុង<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ការកំណត់ការស្កេន<xliff:g id="LINK_END_1">LINK_END</xliff:g>។"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"កុំ​បង្ហាញ​ម្ដង​ទៀត"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"បើក​វ៉ាយហ្វាយ​​អំឡុង​ពេល​ដេក"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"បើក​វ៉ាយហ្វាយ​អំឡុង​ពេល​ដេក"</string>
@@ -604,8 +601,6 @@
     <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_apps" msgid="6003687912727859577">"បង្ហាញ​កម្មវិធី"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"បង្ហាញកម្រិត​វ៉ាយហ្វាយ"</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>
@@ -663,6 +658,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ភ្ជាប់"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"បណ្តាញនេះមិនមានអ៊ីនធឺណិតនោះទេ។ ប្រើបណ្តាញនេះទោះយ៉ាងណាក៏ដោយ?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"កុំសួរម្តងទៀតអំពីបណ្តាញនេះ"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"តភ្ជាប់"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"បាន​បរាជ័យ​ក្នុង​ការ​តភ្ជាប់​បណ្ដាញ"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"បំភ្លេច"</string>
@@ -734,12 +731,10 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"គួរប្រើ Wi-Fi"</item>
     <item msgid="5267397515594230396">"គួរប្រើប្រព័ន្ធទូរស័ព្ទ"</item>
-    <item msgid="3132912693346866895">"Wi-Fi តែប៉ុណ្ណោះ"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"នៅពេលការហៅតាម Wi-Fi បានបើក ទូរស័ព្ទរបស់អ្នកអាចធ្វើការហៅចេញតាមរយៈបណ្តាញ Wi-Fi ឬបណ្តាញរបស់ក្រុមហ៊ុនរបស់អ្នក ដោយផ្អែកលើចំណូលចិត្តរបស់អ្នក និងថាតើ signal ណាមួយខ្លាំងជាង។ មុនពេលបើកលក្ខណៈពិសេសនេះ សូមត្រួតពិនិត្យជាមួយក្រុមហ៊ុនរបស់អ្នកពាក់ព័ន្ធនឹងតម្លៃ និងព័ត៌មានលម្អិតផ្សេងទៀត។"</string>
     <string name="home_settings" msgid="212375129455718176">"ដើម"</string>
@@ -913,12 +908,12 @@
     <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">"កម្មវិធី (ទិន្នន័យ​កម្មវិធី &amp; មាតិកា​មេឌៀ)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"កម្មវិធី និងទិន្នន័យកម្មវិធី"</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_media_misc_usage" msgid="235452944021647124">"ផ្សេងៗ"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"ឯកសារផ្សេងទៀត"</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">"ផ្ដាច់​កាត​អេសឌី"</string>
@@ -951,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"ការ​ផ្ដាច់​​កំពុង​ដំណើរការ"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"អស់​ទំហំផ្ទុក"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"មុខងារ​ប្រព័ន្ធ​មួយ​ចំនួន​ដូច​ជា ការ​ធ្វើ​សម​កាល​កម្ម​អាច​ដំណើរការ​មិន​ត្រឹមត្រូវ។ ព្យាយាម​បង្កើត​ទំហំ ដោយ​លុប​ ឬ​​ដោះ​ខ្ទាស់​ធាតុ​មួយ​ចំនួន​ដូច​ជា កម្មវិធី ឬ​មាតិកា​មេឌៀ។"</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"ប្ដូរឈ្មោះ"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"ភ្ជាប់"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"ដកចេញ"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"លុប និងសម្អាត"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"លុប និងសម្អាតឧបករណ៍ផ្ទុកខាងក្នុង"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"ការ​តភ្ជាប់​កុំព្យូទ័រ​តាម​យូអេសប៊ី"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"ការ​តភ្ជាប់​កុំព្យូទ័រ​តាម​យូអេសប៊ី"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"តភ្ជាប់​ជា"</string>
@@ -961,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"មីឌី"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"អនុញ្ញាតឲ្យកម្មវិធីដែលគាំទ្រមីឌីដំណើរកាលើ USB ជាមួយកម្មវិធីមីឌីនៅលើកុំព្យូទ័របស់អ្នក។"</string>
     <string name="storage_other_users" msgid="808708845102611856">"អ្នក​ប្រើ​ផ្សេង"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"ឧបករណ៍ផ្ទុក"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"ឧបករណ៍ផ្ទុកចល័ត"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"ទំនេរ <xliff:g id="FREE">%1$s</xliff:g> (សរុប <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"បានភ្ជាប់ <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"មិនអាចដក <xliff:g id="NAME">%1$s</xliff:g> ចេញបានទេ"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"បានដក <xliff:g id="NAME">%1$s</xliff:g> ចេញដោយសុវត្ថិភាព"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"មិនអាចដក <xliff:g id="NAME">%1$s</xliff:g> ចេញដោយសុវត្ថិភាពបានទេ"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"បានសម្អាត <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"មិនអាចសម្អាត <xliff:g id="NAME">%1$s</xliff:g> បានទេ"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"ប្តូរឈ្មោះឧបករណ៍ផ្ទុក"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"បន្ទាប់ពីសម្អាត អ្នកអាចប្រើ <xliff:g id="NAME_0">^1</xliff:g> នេះនៅក្នុងឧបករណ៍ផ្សេងទៀត។ \n\nទិន្នន័យទាំងអស់នៅលើ <xliff:g id="NAME_1">^1</xliff:g> នេះនឹងត្រូវបានលុប។ គួរពិចារណាធ្វើការបម្រុងទុកជាមុន។ \n\n"<b>"បម្រុងទុករូបភាព និងមេឌៀផ្សេងទៀត"</b>" \nផ្លាស់ទីឯកសារមេឌៀរបស់អ្នកទៅចន្លោះផ្ទុកជម្រើសនៅលើឧបករណ៍នេះ ឬផ្ទេរពួកវាទៅកុំព្យូទ័ររបស់អ្នកដោយប្រើខ្សែ USB។ \n\n"<b>"កម្មវិធីបម្រុងទុក"</b>" \nរាល់កម្មវិធីដែលបានផ្ទុកនៅលើ <xliff:g id="NAME_6">^1</xliff:g> នេះទាំងអស់នឹងត្រូវបានលុបការដំឡើង ហើយទិន្នន័យរបស់វានឹងត្រូវបានលុប។ ដើម្បីរក្សាកម្មវិធីទាំងនេះ ផ្លាស់ទីពួកវាទៅចន្លោះផ្ទុកជម្រើសនៅក្នុងឧបករណ៍នេះ។"</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"នៅពេលដែលអ្នកដក <xliff:g id="NAME_0">^1</xliff:g> នេះចេញ កម្មវិធីដែលបានផ្ទុកនៅក្នុងនោះនឹងឈប់ដំណើរការ ហើយឯកសារមេឌៀដែលបានផ្ទុកនៅលើនោះនឹងមានទេ រហូតទាល់តែអ្នកដោតចូលវិញ។"</b>" \n\nការសម្អាត <xliff:g id="NAME_1">^1</xliff:g> នេះត្រូវបានកំណត់ឲ្យដំណើរការនៅលើឧបករណ៍នេះតែប៉ុណ្ណោះ។ វានឹងមិនដំណើរការនៅលើឧបករណ៍ដ៏ទៃទៀតឡើយ។"</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"ដំឡើង <xliff:g id="NAME">^1</xliff:g> របស់អ្នក"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"ប្រើជាឧបករណ៍ផ្ទុកចល័ត"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"សម្រាប់ផ្លាស់ទីរូបភាព និងមេឌៀផ្សេងទៀតរវាងឧបករណ៍។"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"ប្រើជាឧបករណ៍ផ្ទុកខាងក្នុង"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"សម្រាប់ផ្ទុកអ្វីគ្រប់យ៉ាងនៅលើឧបករណ៍នេះ រួមបញ្ចូលទាំងកម្មវិធី និងរូបភាព។ តម្រូវឲ្យមានការសម្អាតដែលរារាំងវាពីការធ្វើដំណើការនៅលើឧបករណ៍ផ្សេងទៀត។"</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"សម្អាតឧបករណ៍ផ្ទុកខាងក្នុង"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"វាតម្រូវឲ្យសម្អាត <xliff:g id="NAME_0">^1</xliff:g> ដើម្បីធ្វើឲ្យមានសុវត្ថិភាព។ \n\nបន្ទាប់ពីសម្អាត <xliff:g id="NAME_1">^1</xliff:g> នេះនឹងដំណើរការនៅលើឧបករណ៍នេះតែប៉ុណ្ណោះ។ \n\n"<b>"ការសម្អាតនឹងលុបទិន្នន័យទាំងអស់ដែលបានផ្ទុកនៅលើ <xliff:g id="NAME_2">^1</xliff:g> ពេលបច្ចុប្បន្ន។"</b>" ដើម្បីជៀងវាងបាត់បង់ទិន្នន័យ សូមពិចារណាធ្វើការបម្រុងទុក។"</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"លុប និងសម្អាត"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"កំពុងសម្អាត <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"កុំដក <xliff:g id="NAME">^1</xliff:g> ចេញខណៈពេលកំពុងធ្វើការសម្អាត។"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ផ្លាស់ទីទិន្នន័យទៅឧបករណ៍ផ្ទុកថ្មី"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"អ្នកអាចផ្លាស់ទីទិន្នន័យកម្មវិធី រូបភាព និងឯកសារទៅ <xliff:g id="NAME">^1</xliff:g> ថ្មីនេះ។ \n\nការផ្លាស់ទីនេះចំណាយពេលប្រហែល <xliff:g id="TIME">^2</xliff:g> ហើយនឹងធ្វើឲ្យឧបករណ៍ផ្ទុកខាងក្នុងទំនេរ <xliff:g id="SIZE">^3</xliff:g>។ កម្មវិធីមួយចំនួននឹងមិនដំណើរការទេ ខណៈពេលដែលវាកំពុងផ្លាស់ទី។"</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"ផ្លាស់ទីឥឡូវនេះ"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"ផ្លាស់ទីពេលក្រោយ"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"ផ្លាស់ទីទិន្នន័យឥឡូវនេះ"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"ការផ្លាស់ទីនេះចំណាយពេលប្រហែល <xliff:g id="TIME">^1</xliff:g>។ វានឹងធ្វើឲ្យឧបករណ៍ផ្ទុកខាងក្នុងទំនេរ  <xliff:g id="SIZE">^2</xliff:g>។"</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"ផ្លាស់ទី"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"កំពុងផ្លាស់ទីទិន្នន័យ…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"អំឡុងពេលធ្វើការផ្លាស់ទី \n• កុំដកចេញ <xliff:g id="NAME">^1</xliff:g>។ \n• កម្មវិធីមួយចំនួននឹងដំណើរការមិនត្រឹមត្រូវទេ។ \n• បន្តសាកថ្មឧបករណ៍"</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> រួចរាល់ហើយ"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> របស់អ្នកត្រូវបានកំណត់ឲ្យប្រើជាមួយរូបភាព និងមេឌៀផ្សេងទៀត។"</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> ថ្មីរបស់អ្នកកំពុងដំណើរការ។ \n\nដើម្បីផ្លាស់ទីទិន្នន័យកម្មវិធី រូបភាព ឯកសារទៅឧបករណ៍នេះ សូមចូលទៅកាន់ ការកំណត់ &gt; ឧបករណ៍ផ្ទុក។"</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"ផ្លាស់ទី <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"ការផ្លាស់ទី <xliff:g id="APP">^1</xliff:g> និងទិន្នន័យរបស់វាទៅ <xliff:g id="NAME_0">^2</xliff:g> នឹងចំណាយតែបន្តិចប៉ុណ្ណោះ។ អ្នកនឹងមិនអាចប្រើកម្មវិធីនេះទេ រហូតដល់ការផ្លាស់ទីនេះបញ្ចប់។ \n\nកុំដក <xliff:g id="NAME_1">^2</xliff:g> ចេញអំឡុងពេលធ្វើការផ្លាស់ទី។"</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"កំពុងផ្លាស់ទី <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"កុំដក <xliff:g id="NAME">^1</xliff:g> ចេញអំឡុងពេលធ្វើការផ្លាស់ទី។ \n\nកម្មវិធី <xliff:g id="APP">^2</xliff:g> នៅលើឧបករណ៍នេះនឹងមិនមានទេ រហូតដល់ការផ្លាស់ទីបញ្ចប់។"</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"បោះបង់ការផ្លាស់ទី"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"ស្ថានភាព​ថ្ម"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"កម្រិត​ថ្ម"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1005,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"កំណត់​ទៅ​លំនាំដើម​ឡើងវិញ"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"បាន​បញ្ចប់​ការ​កំណត់​នៃ​ការកំណត់​ APN លំនាំដើម។"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"បានកំណត់ការកំណត់បណ្តាញឡើងវិញ"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"វានឹងកំណត់ការកំណត់ទាំងអស់ដែលទាក់ទងនឹងបណ្តាញឡើងវិញទៅលំនាំដើមទាំងស្រុង \n\n"<li>"Wifi"</li>\n<li>"ទិន្នន័យទូរស័ព្ទ"</li>\n<li>"ប៊្លូធូស"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"វានឹងកំណត់ការកំណត់បណ្តាញទាំងអស់ឡើងវិញ រួមបញ្ចូលទាំង៖\n\n"<li>"Wi‑Fi"</li>\n<li>"ទិន្នន័យចល័ត"</li>\n<li>"ប៊្លូធូស"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"កំណត់ការកំណត់ឡើងវិញ"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"កំណត់ការកំណត់បណ្តាញទាំងអស់ឡើងវិញ? អ្នកមិនអាចផ្លាស់ប្តូរសកម្មភាពនេះវិញបានទេ!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"កំណត់ការកំណត់បណ្តាញទាំងអស់ឡើងវិញ? អ្នកមិនអាចធ្វើសកម្មភាពនេះវិញបានទេ!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"កំណត់ការកំណត់ឡើងវិញ"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"អ្នកត្រូវគូសលំនាំដោះសោរបស់អ្នកដើម្បីបញ្ជាក់ពីការកំណត់បណ្តាញឡើងវិញ។"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"កំណត់ឡើងវិញ?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"បានកំណត់ការកំណត់បណ្តាញឡើងវិញ"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"បានកំណត់ការកំណត់បណ្តាញឡើងវិញ"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"កំណត់​ឧបករណ៍​ឡើងវិញ"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"កំណត់​ទិន្នន័យ​ដូច​ចេញពី​រោងចក្រ"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"វា​នឹង​លុប​ទិន្នន័យ​ពី​ "<b>"ឧបករណ៍​ផ្ទុក​ខាង​ក្នុង"</b>"នៃ​កុំព្យូទ័រ​បន្ទះ​របស់​អ្នក រួម​មាន៖\n\n"<li>"គណនី Google របស់​អ្នក"</li>\n<li>"ការកំណត់ និង​ទិន្នន័យ​កម្មវិធី និង​ប្រព័ន្ធ"</li>\n<li>"កម្មវិធី​បាន​ទាញ​យក"</li></string>
@@ -1027,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"លុប​ទិន្នន័យ​ទាំងអស់​លើ​កាត​អេសឌី ដូច​ជា​តន្ត្រី ឬ​រូបថត"</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="1062841478823409667">"លុបព័ត៌មានផ្ទាល់ខ្លួន និងកម្មវិធីដែលបានទាញយករបស់អ្នកទាំងអស់? អ្នកមិនអាចធ្វើសកម្មភាពនេះវិញបានទេ!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"លុប​អ្វីៗ​ទាំងអស់"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"ការ​កំណត់​ដូច​ចេញ​ពី​រោងចក្រ​ឡើង​វិញ​មិន​អាច​ប្រើ​បាន​សម្រាប់​អ្នក​ប្រើ​ម្នាក់​នេះ"</string>
@@ -1046,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"រៀបចំ​សារ​ជា​សំឡេង បញ្ជូន​ការ​ហៅ​បន្ត រង់ចាំ​ការ​ហៅ លេខ​សម្គាល់​អ្នក​ហៅ"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"ការ​ភ្ជាប់​យូអេសប៊ី"</string>
@@ -1079,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"ជំនួយ"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"បណ្ដាញ​ចល័ត"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"ផែនការ​ទិន្នន័យ​ចល័ត"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"កម្មវិធី​ផ្ញើ​សារ SMS ​លំនាំ​ដើម"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"កម្មវិធីផ្ញើសារ SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"ប្ដូរ​កម្មវិធី​សារ SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"ប្រើ <xliff:g id="NEW_APP">%1$s</xliff:g> ជំនួស​ឲ្យ <xliff:g id="CURRENT_APP">%2$s</xliff:g> ជា​កម្មវិធី​សារ SMS របស់​អ្នក?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"ប្រើ <xliff:g id="NEW_APP">%s</xliff:g> ជា​កម្មវិធី​សារ SMS របស់​អ្នក?"</string>
@@ -1110,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ប្រើ GPS ដើម្បីកំណត់ទីតាំងរបស់អ្នក"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"ការស្កេន"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"ការស្កេន"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"ការស្កេន Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"ធ្វើឲ្យទីតាំងមានភាពប្រសើរឡើងដោយអនុញ្ញាតឲ្យកម្មវិធី និងសេវាកម្មស្កេនរកបណ្តាញ Wi-Fi បើទោះបីជា Wi-Fi បិទក៏ដោយ។"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ការស្កេនប៊្លូធូស"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"ធ្វើឲ្យទីតាំងមានភាពប្រសើរឡើងដោយអនុញ្ញាតឲ្យសេវាកម្មប្រព័ន្ធស្កេនរកឧបករណ៍ប៊្លូធូស បើទោះបីជាប៊្លូធូសបិទក៏ដោយ។"</string>
     <string name="location_network_based" msgid="6010456018401296590">"ទីតាំងបណ្ដាញចល័ត &amp; វ៉ាយហ្វាយ"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"ឲ្យ​កម្មវិធី​ប្រើ​សេវាកម្ម​ទីតាំង​របស់ Google ដើម្បី​ស្មាន​ទីតាំង​របស់​អ្នក​កាន់តែ​លឿន។ ទិន្នន័យ​ទីតាំង​អនាមិក​នឹង​ត្រូវ​បាន​ប្រមូល​ រួច​ផ្ញើ​ទៅ Google ។"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"ទីតាំង​បាន​កំណត់​ដោយ​វ៉ាយហ្វាយ"</string>
@@ -1155,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"បាន​កំណត់​ពាក្យ​សម្ងាត់"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"បាន​កំណត់​កូដ PIN"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"បាន​កំណត់​លំនាំ"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"ប្រើលំនាំឧបករណ៍របស់អ្នកដើម្បីបន្ត។"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"បញ្ចូលកូដ PIN របស់អ្នកដើម្បីបន្ត។"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"បញ្ចូលពាក្យសម្ងាត់ឧបករណ៍របស់អ្នកដើម្បីបន្ត។"</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"កូដ PIN មិនត្រឹមត្រូវ"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"ពាក្យសម្ងាត់មិនត្រឹមត្រូវ"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"លំនាំមិនត្រឹមត្រូវ"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"សុវត្ថិភាពឧបករណ៍"</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_wrong" msgid="4694973540770105678">"ព្យាយាម​ម្ដង​ទៀត៖"</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>
@@ -1181,8 +1224,7 @@
     <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" msgid="6909161623701848863">"ការព្យាយាមចូលខុសច្រើនពេក។ សូមព្យាយាមម្តងទៀតក្នុងពេល <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>
@@ -1233,7 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"តម្រៀប​តាម​ទំហំ"</string>
     <string name="show_running_services" msgid="5736278767975544570">"បង្ហាញ​សេវាកម្ម​កំពុង​ដំណើរការ"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"បង្ហាញ​ដំណើរការ​ដែល​បាន​ដាក់​ក្នុង​ឃ្លាំង"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"កម្មវិធីគ្រាអាសន្នលំនាំដើម"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"កម្មវិធីអាសន្ន"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"កំណត់​ចំណូល​ចិត្ត​កម្មវិធី​ឡើងវិញ"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"កំណត់​ចំណូលចិត្ត​កម្មវិធី​ឡើងវិញ?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"វា​នឹង​កំណត់​ចំណូល​ចិត្ត​ទាំង​អស់​ឡើងវិញ​សម្រាប់៖\n\n "<li>"កម្មវិធី​បាន​បិទ"</li>\n" "<li>"ការ​ជូន​ដំណឹង​កម្មវិធី​បាន​បិទ"</li>\n" "<li>"កម្មវិធី​លំនាំដើម​សម្រាប់​សកម្មភាព"</li>\n" "<li>"ការ​ដាក់​កម្រិត​ទិន្នន័យ​ផ្ទៃ​ខាង​ក្រោយ​សម្រាប់​កម្មវិធី"</li>\n" "<li>"ការ​ដាក់​កម្រិត​សិទ្ធិ​ណា​មួយ"</li>\n\n" អ្នក​នឹង​មិន​បាត់បង់​ទិន្នន័យ​កម្មវិធី​ណាមួយ​ទេ។"</string>
@@ -1437,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ចាប់​យក​​​កញ្ចប់​ HCI​ ប៊្លូ​ធូ​ស ទាំង​អស់​នៅ​ក្នុង​ឯកសារ"</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="select_logd_size_title" msgid="7433137108348553508">"ទំហំ buffer របស់ Logger"</string>
@@ -1739,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"១២ ម៉ោង"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"១ ថ្ងៃ"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"បង្ហាញ​ប្រព័ន្ធ"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"លាក់ប្រព័ន្ធ"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"ប្រើ Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"ប្រភេទ​ស្ថានភាព"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"ផ្ទៃ​ខាង​ក្រោយ"</string>
@@ -1835,7 +1876,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_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>
@@ -2210,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"អ្នក​ប្រើ"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"ប្រវត្តិ​បាន​ដាក់កម្រិត"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"បន្ថែម​អ្នកប្រើ​ថ្មី?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"អ្នក​អាច​ចែករំលែក​ឧបករណ៍​​ជា​មួយ​មនុស្ស​ផ្សេង​ដោយ​បង្កើត​អ្នកប្រើ​បន្ថែម។ អ្នក​ប្រើ​ម្នាក់ៗ​មាន​ទំហំ​ផ្ទាល់​របស់​ពួកគេ​ ដែល​ពួកគេ​អាច​ប្ដូរ​តាម​តម្រូវ​ការ​ជាមួយ​កម្មវិធី, ផ្ទាំង​រូបភាព និង​អ្វី​ផ្សេងៗ​ទៀត​ផ្ទាល់​របស់​ពួកគេ។ អ្នកប្រើ​ក៏​អាច​កែ​ការ​កំណត់​ឧបករណ៍​ដូច​ជា វ៉ាយហ្វាយ​ដែល​ប៉ះពាល់​ដល់​អ្នក​គ្រប់គ្នា។\n\nពេល​អ្នក​បន្ថែម​អ្នកប្រើ​ថ្មី អ្នកប្រើ​នោះ​ត្រូវ​កំណត់​ទំហំ​ផ្ទាល់​របស់​គេ។\n\nអ្នកប្រើ​​​ណា​ម្នាក់​ក៏​អាច​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី​​​សម្រាប់​អ្នកប្រើ​ផ្សេង​ទាំងអស់។"</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"អ្នកអាចចែករំលែកឧបករណ៍នេះជាមួយមនុស្សផ្សេងទៀតដោយការបង្កើតអ្នកប្រើបន្ថែម។ អ្នកប្រើនីមួយៗមានចន្លោះប្រើផ្ទាល់ខ្លួន ដែលពួកគេអាចប្តូរតាមបំណងជាមួយកម្មវិធី ផ្ទាំងរូបភាព និងរបស់ផ្សេងទៀត។ អ្នកប្រើក៏អាចកែតម្រូវការកំណត់ឧបករណ៍ដូចជា Wi-Fi ផងដែរ ដែលវាប៉ះពាល់ដល់អ្នកប្រើផ្សេងទៀត។\n\nនៅពេលដែលអ្នកបន្ថែមអ្នកប្រើថ្មី បុគ្គលនោះត្រូវដំឡើងចន្លោះប្រើផ្ទាល់ខ្លួនរបស់គេ។\n\nអ្នកប្រើទាំងអស់អាចធ្វើបច្ចុប្បន្នភាពកម្មវិធីសម្រាប់អ្នកប្រើប្រាស់ផ្សេងទៀត។"</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"ពេល​អ្នក​បន្ថែម​អ្នកប្រើ​ថ្មី អ្នកប្រើ​នោះ​ត្រូវ​កំណត់​ទំហំ​ផ្ទាល់​របស់​គេ។\n\nអ្នកប្រើ​ណា​ម្នាក់​អាច​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី​សម្រាប់​អ្នកប្រើ​ផ្សេង​ទាំងអស់។"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"រៀបចំ​អ្នក​ប្រើ​ឥឡូវ?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"សូម​ប្រាកដ​ថា​​អ្នក​ប្រើ​នេះ​អាច​យក​​ឧបករណ៍ ​និង​រៀបចំ​​ទំហំ​របស់​គេ"</string>
@@ -2393,6 +2433,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"កម្មវិធីក្នុងគ្រាមានអាសន្នលំនាំដើម"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"កម្មវិធីទាញយកប្រព័ន្ធកម្មវិធី"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"សុវត្ថិភាពសិទ្ធិកម្មវិធី"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"លំនាំដើមកម្មវិធី"</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>
@@ -2407,14 +2448,12 @@
     <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="6948120138640252732">"រារាំងការរំខាន"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"អនុញ្ញាតអាទិភាពប៉ុណ្ណោះ"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ច្បាប់ស្វ័យប្រវត្តិ"</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_alarms" msgid="7380265858042606857">"អនុញ្ញាតតែសំឡេងរោទិ៍ប៉ុណ្ណោះ"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"កុំ​ផ្អាក"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"អាទិភាពប៉ុណ្ណោះ"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"សម្លេងរោទ៍ប៉ុណ្ណោះ"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"គ្មានការរំខាន"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>៖ <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"សំឡេង​រោទ៍​ទូរស័ព្ទ"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"សំឡេង​រោទ៍​ការ​ជូនដំណឹង​លំនាំដើម"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ញ័រ​សម្រាប់​ការ​ហៅ​ដែរ"</string>
@@ -2447,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"គ្មាន​កម្មវិធី​ស្ដាប់ការ​ជូន​ដំណឹង​បាន​ដំឡើង។"</string>
     <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">"គ្មាន​កម្មវិធី​ផ្ដល់​លក្ខខណ្ឌ"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">កម្មវិធី %d ត្រូវបានផ្តល់លក្ខខណ្ឌ</item>
-      <item quantity="one">កម្មវិធី %d ត្រូវបានផ្តល់លក្ខខណ្ឌ</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="loading_notification_apps" msgid="5031818677010335895">"កំពុង​ផ្ទុក​កម្មវិធី..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"រារាំងទាំងអស់"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"កុំ​បង្ហាញ​ការ​ជូន​ដំណឹង​សម្រាប់​កម្មវិធី​នេះ"</string>
@@ -2469,17 +2499,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"ឈ្មោះច្បាប់"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"បន្ថែមច្បាប់"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"លុបច្បាប់"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"លុបច្បាប់ \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"លុប"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"ប្រភេទច្បាប់"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"មិនស្គាល់"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"កំណត់រចនាសម្ព័ន្ធច្បាប់"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"កំណត់កាលវិភាគច្បាប់"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"រកមិនឃើញច្បាប់ទេ។"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"ថ្ងៃ"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"គ្មាន"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"រាល់ថ្ងៃ"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"កុំ"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> ទៅ <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"ហៅ"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"សារ"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"ការ​ហៅ​ទូរស័ព្ទ/​ផ្ញើ​សារ​ពី"</string>
@@ -2489,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"សំឡេងរោទ៍"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"កម្មវិធីរំលឹក"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ព្រឹត្តិការណ៍"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"អ្នកហៅចូលបានជ្រើស"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"អ្នកហៅចូលសារជាថ្មី"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"ប្រសិនបើមនុស្សតែមួយហៅចូលមកលើកទីពីរនៅក្នុងរយៈពេល <xliff:g id="MINUTES">%d</xliff:g> នាទី អនុញ្ញាតចំពោះការហៅចូលនេះ។"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"ថ្ងៃបន្ទាប់ <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"តើអ្នកចង់ឲ្យមានការរំខាននៅពេលណា?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"សម្រាប់រយៈពេលប៉ុន្មាន?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"គ្មានកំណត់"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> នាទី</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> នាទី</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ម៉ោង</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ម៉ោង</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"ប្តូរទៅការជូនដំណឹងអាទិភាពប៉ុណ្ណោះដោយគ្មានកំណត់"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">ប្តូរទៅការជូនដំណឹងអាទិភាពរយៈពេល <xliff:g id="DURATION">%1$d</xliff:g> នាទីប៉ុណ្ណោះរហូតដល់ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">ប្តូរទៅការជូនដំណឹងអាទិភាពរយៈពេលមួយនាទីប៉ុណ្ណោះរហូតដល់ <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">ប្តូរទៅការជូនដំណឹងអាទិភាពរយៈពេល <xliff:g id="DURATION">%1$d</xliff:g> ម៉ោងប៉ុណ្ណោះ (រហូតដល់ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">ប្តូរទៅការជូនដំណឹងអាទិភាពរយៈពេលមួយម៉ោងប៉ុណ្ណោះរហូតដល់ <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"ប្តូរទៅសំឡេងរោទិ៍ប៉ុណ្ណោះដោយគ្មានកំណត់"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">ប្តូរទៅសំឡេងរោទិ៍តែ <xliff:g id="DURATION">%1$d</xliff:g> នាទីប៉ុណ្ណោះ (រហូតដល់ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">ប្តូរទៅសំឡេងរោទិ៍តែមួយនាទីប៉ុណ្ណោះរហូតដល់ <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">ប្តូរទៅសំឡេងរោទិ៍តែ <xliff:g id="DURATION">%1$d</xliff:g> ម៉ោងប៉ុណ្ណោះរហូតដល់ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">ប្តូរទៅសំឡេងរោទិ៍តែមួយម៉ោងប៉ុណ្ណោះរហូតដល់ <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"ប្តូរទៅកុំរំខានដោយគ្មានកំណត់"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">ប្តូរទៅកុំរំខានរយៈពេល <xliff:g id="DURATION">%1$d</xliff:g> នាទី (រហូតដល់ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">ប្តូរទៅកុំរំខានរយៈពេលមួយនាទីរហូតដល់ <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">ប្តូរទៅកុំរំខានរយៈពេល <xliff:g id="DURATION">%1$d</xliff:g> ម៉ោងរហូតដល់ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">ប្តូរទៅកុំរំខានរយៈពេលមួយម៉ោងរហូតដល់ <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"ប្តូរទៅរំខានជានិច្ច"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ជានិច្ច"</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>
@@ -2562,7 +2659,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>ការអនុញ្ញាតដែលទទួលបាន</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>ការអនុញ្ញាតដែលទទួលបាន</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other">បានទទួលការអនុញ្ញាត <xliff:g id="COUNT_2">%d</xliff:g> នៃ <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="one">បានទទួលការអនុញ្ញាត <xliff:g id="COUNT_0">%d</xliff:g> នៃ <xliff:g id="COUNT_1">%d</xliff:g></item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"លំនាំដើមមួយចំនួនត្រូវបានកំណត់"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"គ្មានការកំណត់លំនាំដើម"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"កម្មវិធីទាំងអស់"</string>
@@ -2573,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"អាទិភាព"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"រសើប"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ដោយមានដែន URLs"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"កំណត់ចំណូលចិត្តនៅលើកម្មវិធីទាំងអស់ឡើងវិញទៅលំនាំដើម"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"បានដំឡើងកម្មវិធី <xliff:g id="COUNT">%d</xliff:g> រួមបញ្ចូលទាំងកម្មវិធីប្រព័ន្ធ និងកម្មវិធីដែលបានទាញយក"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"បាន​បិទ​ដោយ​អ្នក​គ្រប់គ្រង"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"កម្រិតខ្ពស់"</string>
     <string name="unknown_app" msgid="5275921288718717656">"កម្មវិធីមិនស្គាល់"</string>
     <string name="choose_profile" msgid="8229363046053568878">"ជ្រើសប្រវត្តិរូប"</string>
@@ -2589,4 +2688,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> កម្មវិធីអាចបើកដែន URLs របស់ពួកវា</item>
       <item quantity="one">កម្មវិធីមួយអាចបើកដែន URLs របស់ខ្លួន</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"មិនអាចសម្គាល់បានទេ"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"កម្មវិធីលំនាំដើម"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"កម្មវិធីរុករក"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"គ្មានកម្មវិធីលំនាំដើមទេ"</string>
+    <string name="default_app" msgid="6864503001385843060">"(លំនាំដើម)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-kn-rIN/arrays.xml b/res/values-kn-rIN/arrays.xml
index 4b6818d..b644c92 100644
--- a/res/values-kn-rIN/arrays.xml
+++ b/res/values-kn-rIN/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"ಸಿಮ್"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"ಒತ್ತುವ ಬಟನ್"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"ಮಾಧ್ಯಮ"</item>
     <item msgid="7924928667052300589">"ಸಾಧನ"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"ಒರಟು ಸ್ಥಾನ"</item>
+    <item msgid="5789673140227507995">"ಉತ್ಕೃಷ್ಟ ಸ್ಥಾನ"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"ಕಂಪನ"</item>
+    <item msgid="3434165993711230924">"ಓದುವ ಸಂಪರ್ಕಗಳು"</item>
+    <item msgid="616161687718081936">"ಸಂಪರ್ಕಗಳನ್ನು ಮಾರ್ಪಡಿಸಿ"</item>
+    <item msgid="7638002295329050091">"ಕರೆಯ ಲಾಗ್‌ ಓದಿ"</item>
+    <item msgid="6546959730920410907">"ಕರೆಯ ಲಾಗ್‌ ಮಾರ್ಪಡಿಸಿ"</item>
+    <item msgid="446877710771379667">"ಕ್ಯಾಲೆಂಡರ್‌ ಓದಿ"</item>
+    <item msgid="7674458294386319722">"ಕ್ಯಾಲೆಂಡರ್‌ ಮಾರ್ಪಡಿಸಿ"</item>
+    <item msgid="8281201165558093009">"wi-fi ಸ್ಕ್ಯಾನ್‌"</item>
+    <item msgid="8694611243479480497">"ಅಧಿಸೂಚನೆ"</item>
+    <item msgid="7776439107987345446">"ಸೆಲ್ ಸ್ಕ್ಯಾನ್"</item>
+    <item msgid="514615766544675057">"ಫೋನ್‌‌ಗೆ ಕರೆಮಾಡಿ"</item>
+    <item msgid="8181415497109310680">"SMS ಓದಿ"</item>
+    <item msgid="6816551144382117307">"SMS ಬರೆಯಿರಿ"</item>
+    <item msgid="4600463921908905030">"SMS ಸ್ವೀಕರಿಸಿ"</item>
+    <item msgid="5958926493289432745">"ತುರ್ತು SMS ಸ್ವೀಕರಿಸಿ"</item>
+    <item msgid="4945269495221089540">"MMS ಸ್ವೀಕರಿಸಿ"</item>
+    <item msgid="5570472453573929087">"WAP ಪುಶ್‌ ಸ್ವೀಕರಿಸಿ"</item>
+    <item msgid="7125408150230860501">"SMS ಕಳುಹಿಸು"</item>
+    <item msgid="7080337936612188061">"ICC SMS ಓದಿ"</item>
+    <item msgid="587124103118495063">"ICC SMS ಬರೆಯಿರಿ"</item>
+    <item msgid="2320577158869025503">"ಸೆಟ್ಟಿಂಗ್‌‌ಗಳನ್ನು ಮಾರ್ಪಡಿಸಿ"</item>
+    <item msgid="1545733463471924009">"ಮೇಲಕ್ಕೆ ಎಳೆಯಿರಿ"</item>
+    <item msgid="3609046903962454582">"ಅಧಿಸೂಚನೆಗಳನ್ನು ಪ್ರವೇಶಿಸಿ"</item>
+    <item msgid="4671646036128214513">"ಕ್ಯಾಮರಾ"</item>
+    <item msgid="1097324338692486211">"ಆಡಿಯೋ ರೆಕಾರ್ಡ್‌ ಮಾಡಿ"</item>
+    <item msgid="5031552983987798163">"ಆಡಿಯೋ ಪ್ಲೇ ಮಾಡಿ"</item>
+    <item msgid="8374996688066472414">"ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ ಓದಿ"</item>
+    <item msgid="3045529469061083747">"ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ ಮಾರ್ಪಡಿಸಿ"</item>
+    <item msgid="5124443975763747838">"ಮಾಧ್ಯಮ ಬಟನ್‌ಗಳು"</item>
+    <item msgid="4547883971364273343">"ಆಡಿಯೋ ಫೋಕಸ್"</item>
+    <item msgid="2603878814882344450">"ಮಾಸ್ಟರ್‌ ವಾಲ್ಯೂಮ್"</item>
+    <item msgid="7136963238377062018">"ಧ್ವನಿ ವಾಲ್ಯೂಮ್"</item>
+    <item msgid="4270236897655923007">"ರಿಂಗ್‌ ವಾಲ್ಯೂಮ್"</item>
+    <item msgid="6325739889222559394">"ಮಾಧ್ಯಮ ವಾಲ್ಯೂಮ್"</item>
+    <item msgid="5762123934816216821">"ಎಚ್ಚರಿಕೆ ವಾಲ್ಯೂಮ್"</item>
+    <item msgid="785049718065337473">"ಅಧಿಸೂಚನೆ ವಾಲ್ಯೂಮ್"</item>
+    <item msgid="6700305533746877052">"bluetooth ವಾಲ್ಯೂಮ್"</item>
+    <item msgid="2029227495214047094">"ಎಚ್ಚರವಹಿಸಿ"</item>
+    <item msgid="26109888160231211">"ಪರಿವೀಕ್ಷಣೆ ಸ್ಥಾನ"</item>
+    <item msgid="5753382310468855812">"ಪರಿವೀಕ್ಷಣೆಯ ಹೆಚ್ಚಿನ ಸಾಮರ್ಥ್ಯದ ಸ್ಥಾನ"</item>
+    <item msgid="3356591542543137332">"ಬಳಕೆ ಅಂಕಿಅಂಶಗಳನ್ನು ಪಡೆಯಿರಿ"</item>
+    <item msgid="3073734345226842233">"ಮೈಕ್ರೋಫೋನ್ ಮ್ಯೂಟ್/ಅನ್‌ಮ್ಯೂಟ್ ಮಾಡಿ"</item>
+    <item msgid="1148142988678569310">"ಪ್ರಾಜೆಕ್ಟ್ ಮೀಡಿಯಾ"</item>
+    <item msgid="9130014005474445273">"VPN ಸಕ್ರಿಯಗೊಳಿಸಿ"</item>
+    <item msgid="1165192162975045562">"ವಾಲ್‌ಪೇಪರ್‌ ಬರೆಯಿರಿ"</item>
+    <item msgid="7129487923652967258">"ವಿನ್ಯಾಸಕ್ಕೆ ಸಹಾಯ"</item>
+    <item msgid="1069023208100114540">"ಸ್ಕ್ರೀನ್‌ಶಾಟ್‌‌ಗೆ ಸಹಾಯ"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"ಸ್ಥಾನ"</item>
+    <item msgid="8677040780775113033">"ಸ್ಥಾನ"</item>
+    <item msgid="1660743989948992916">"ಸ್ಥಾನ"</item>
+    <item msgid="8791172739860195290">"ವೈಬ್ರೇಟ್‌"</item>
+    <item msgid="383413555642128046">"ಓದುವ ಸಂಪರ್ಕಗಳು"</item>
+    <item msgid="3654594895269697313">"ಸಂಪರ್ಕಗಳನ್ನು ಮಾರ್ಪಡಿಸಿ"</item>
+    <item msgid="7928393476362362538">"ಕರೆಯ ಲಾಗ್‌ ಓದಿ"</item>
+    <item msgid="6248591205254641116">"ಕರೆಯ ಲಾಗ್‌ ಮಾರ್ಪಡಿಸಿ"</item>
+    <item msgid="6093344633066170692">"ಕ್ಯಾಲೆಂಡರ್ ಓದಿ"</item>
+    <item msgid="1334886368750347692">"ಕ್ಯಾಲೆಂಡರ್ ಮಾರ್ಪಡಿಸಿ"</item>
+    <item msgid="1638204101698708656">"ಸ್ಥಾನ"</item>
+    <item msgid="2154671955760380322">"ಪೋಸ್ಟ್‌ ಅಧಿಸೂಚನೆ"</item>
+    <item msgid="4282477730595931828">"ಸ್ಥಾನ"</item>
+    <item msgid="4891423912898525905">"ಫೋನ್‌ ಕರೆ"</item>
+    <item msgid="2623604824935968113">"SMS/MMS ಓದಿ"</item>
+    <item msgid="4420177125221176306">"SMS/MMS ಬರೆಯಿರಿ"</item>
+    <item msgid="3986142739951490025">"SMS/MMS ಸ್ವೀಕರಿಸಿ"</item>
+    <item msgid="3984213795861739778">"SMS/MMS ಸ್ವೀಕರಿಸಿ"</item>
+    <item msgid="3656243523752472788">"SMS/MMS ಸ್ವೀಕರಿಸಿ"</item>
+    <item msgid="8105802370238551510">"SMS/MMS ಸ್ವೀಕರಿಸಿ"</item>
+    <item msgid="1407766984645388488">"SMS/MMS ಕಳುಹಿಸಿ"</item>
+    <item msgid="3527273606643794973">"SMS/MMS ಓದಿ"</item>
+    <item msgid="4370895547001583812">"SMS/MMS ಬರೆಯಿರಿ"</item>
+    <item msgid="4218544235221631789">"ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮಾರ್ಪಡಿಸಿ"</item>
+    <item msgid="736541391767350377">"ಮೇಲಕ್ಕೆ ಎಳೆಯಿರಿ"</item>
+    <item msgid="5530815681721654194">"ಅಧಿಸೂಚನೆಗಳನ್ನು ಪ್ರವೇಶಿಸಿ"</item>
+    <item msgid="781213371706962767">"ಕ್ಯಾಮರಾ"</item>
+    <item msgid="1720492593061838172">"ಆಡಿಯೋ ರೆಕಾರ್ಡ್‌ ಮಾಡಿ"</item>
+    <item msgid="3493046322001257041">"ಆಡಿಯೋ ಪ್ಲೇ ಮಾಡಿ"</item>
+    <item msgid="136815868796597058">"ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ ಓದಿ"</item>
+    <item msgid="5238692940326972503">"ಕ್ಲಿಪ್‌ಬೋರ್ಡ್ ಮಾರ್ಪಡಿಸಿ"</item>
+    <item msgid="5753789168376302997">"ಮಾಧ್ಯಮ ಬಟನ್‌ಗಳು"</item>
+    <item msgid="3265262911688671938">"ಆಡಿಯೊ ಫೋಕಸ್"</item>
+    <item msgid="2098976479485046797">"ಮಾಸ್ಟರ್ ವಾಲ್ಯೂಮ್"</item>
+    <item msgid="5660213838861789350">"ಧ್ವನಿ ವಾಲ್ಯೂಮ್"</item>
+    <item msgid="7983336752371254444">"ರಿಂಗ್ ವಾಲ್ಯೂಮ್"</item>
+    <item msgid="7878027809189330917">"ಮಾಧ್ಯಮ ವಾಲ್ಯೂಮ್"</item>
+    <item msgid="7260546305036218513">"ಎಚ್ಚರಿಕೆ ವಾಲ್ಯೂಮ್"</item>
+    <item msgid="9103719301075748925">"ಅಧಿಸೂಚನೆ ವಾಲ್ಯೂಮ್"</item>
+    <item msgid="7025966722295861512">"ಬ್ಲೂಟೂತ್‌‌ ವಾಲ್ಯೂಮ್"</item>
+    <item msgid="4665183401128289653">"ಎಚ್ಚರದಿಂದಿರಿಸಿ"</item>
+    <item msgid="8584357129746649222">"ಸ್ಥಾನ"</item>
+    <item msgid="7669257279311110599">"ಸ್ಥಾನ"</item>
+    <item msgid="3459320345690097795">"ಬಳಕೆ ಅಂಕಿಅಂಶಗಳನ್ನು ಪಡೆದುಕೊಳ್ಳಿ"</item>
+    <item msgid="1312534577834048535">"ಮೈಕ್ರೋಫೋನ್ ಮ್ಯೂಟ್/ಅನ್‌ಮ್ಯೂಟ್ ಮಾಡಿ"</item>
+    <item msgid="5906017727368097853">"ಪ್ರಾಜೆಕ್ಟ್ ಮೀಡಿಯಾ"</item>
+    <item msgid="2486614710846178542">"VPN ಸಕ್ರಿಯಗೊಳಿಸಿ"</item>
+    <item msgid="5586547561693629602">"ವಾಲ್‌ಪೇಪರ್‌ ರೈಟ್‌ ಮಾಡಿ"</item>
+    <item msgid="32794179825485062">"ವಿನ್ಯಾಸಕ್ಕೆ ಸಹಾಯ"</item>
+    <item msgid="7872852746938272552">"ಸ್ಕ್ರೀನ್‌ಶಾಟ್‌ಗೆ ಸಹಾಯ"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"ಚಿಕ್ಕದು"</item>
     <item msgid="2560532955514699713">"ಮಧ್ಯಮ"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"ಕಡಿಮೆ"</item>
     <item msgid="4212263919458209842">"ವಿಷಮಸ್ಥಿತಿ"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"ಆಫ್ ಆಗಿದೆ"</item>
-    <item msgid="5656544177755411222">"ಕರೆ ಹಾಗೂ ಸಂದೇಶಗಳನ್ನು ಆಗಾಗ ತಡೆಹಾಕು"</item>
-    <item msgid="8735337502532332056">"ಕರೆ ಹಾಗೂ ಸಂದೇಶಗಳಿಗೆ ತಡೆಹಾಕದಿರು"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"ಸಾಮಾನ್ಯ"</item>
     <item msgid="866544120205026771">"ಮಧ್ಯಮ"</item>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 1da8c51..f34c616 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD ಕಾರ್ಡ್"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"ಪ್ರಾಕ್ಸಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ಹೌದು"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"ಇಲ್ಲ"</string>
-    <string name="forget" msgid="7267115980248732932">"ಮರೆತುಬಿಡು"</string>
+    <string name="forget" msgid="1400428660472591263">"ಮರೆತುಬಿಡಿ"</string>
+    <string name="save" msgid="879993180139353333">"ಉಳಿಸು"</string>
+    <string name="done" msgid="6942539184162713160">"ಮುಗಿದಿದೆ"</string>
     <string name="settings_label" msgid="1626402585530130914">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಶಾರ್ಟ್‌ಕಟ್‌"</string>
@@ -374,7 +372,6 @@
     <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_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>
@@ -419,8 +416,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"ನಮೂನೆ"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"ಪಿನ್‌"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"ಪಾಸ್‌ವರ್ಡ್"</string>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"ಒಮ್ಮೆ ನೀವು ಪರದೆ ಲಾಕ್‌ ಹೊಂದಿಸಿದರೆ, ನೀವು ಸೆಟ್ಟಿಂಗ್‌ಗಳು &gt; ಭದ್ರತೆಯಲ್ಲಿ ನಿಮ್ಮ ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್‌ ಕೂಡಾ ಹೊಂದಿಸಬಹುದಾಗಿರುತ್ತದೆ."</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>
@@ -522,8 +518,7 @@
     <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>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"ಬ್ಲೂಟೂತ್ ಆಫ್ ಆಗಿರುವಾಗಲೂ, ಸ್ಥಳ ಸುಧಾರಣೆ ಮಾಡಲು ಬ್ಲೂಟೂತ್‌ಗೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಸೇವೆಗಳು ಸ್ಕ್ಯಾನ್ ಮಾಡುತ್ತವೆ. ನೀವು ಇದನ್ನು <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ಸ್ಕ್ಯಾನ್‌ ಮಾಡುವಿಕೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು<xliff:g id="LINK_END_1">LINK_END</xliff:g> ನಲ್ಲಿ ಬದಲಾಯಿಸಬಹುದು."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"ಇದಕ್ಕೆ ಸಂಪರ್ಕಪಡಿಸಲಾಗಿದೆ..."</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>
@@ -589,8 +584,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"ವೈ-ಫೈ ಆಫ್‌ ಇದ್ದಾಗಲೂ ಕೂಡಾ ಸ್ಥಳ ನಿಖರತೆ, ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಸೇವೆಗಳನ್ನು ಸುಧಾರಿಸಲು ವೈ-ಫೈ ಸಾಧನಗಳನ್ನು ಸ್ಕ್ಯಾನ್‌ ಮಾಡುತ್ತವೆ. ನೀವು ಇದನ್ನು <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ಸ್ಕ್ಯಾನ್‌ ಮಾಡುವಿಕೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು<xliff:g id="LINK_END_1">LINK_END</xliff:g> ನಲ್ಲಿ ಬದಲಾಯಿಸಬಹುದು."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"ಮತ್ತೊಮ್ಮೆ ತೋರಿಸಬೇಡ"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"ನಿದ್ರಾವಸ್ಥೆಯಲ್ಲಿ Wi‑Fi ಆನ್‌ ಇರುವಂತೆ ಇರಿಸಿ"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"ನಿದ್ರಾವಸ್ಥೆಯಲ್ಲಿ Wi‑Fi ಆನ್‌"</string>
@@ -607,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi ಡೈರೆಕ್ಟ್"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"ಸ್ಕ್ಯಾನ್"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"ಸುಧಾರಿತ"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"ಅಪ್ಲಿ. ತೋರಿಸು"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"ವೈಫೈ ಸಾಮರ್ಥ್ಯ ತೋರಿಸು"</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>
@@ -666,6 +658,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ಸಂಪರ್ಕಿಸಿ"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"ಈ ನೆಟ್‌ವರ್ಕ್‌ ಯಾವುದೇ ಇಂಟರ್ನೆಟ್ ಪ್ರವೇಶವನ್ನು ಹೊಂದಿಲ್ಲ. ಹೇಗಾದರೂ ಈ ನೆಟ್‌ವರ್ಕ್‌ ಬಳಸುವುದೇ?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"ಈ ನೆಟ್‌ವರ್ಕ್ ಅನ್ನು ಮತ್ತೆ ಕೇಳಬೇಡಿ"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"ಸಂಪರ್ಕಪಡಿಸು"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ನೆಟ್‌ವರ್ಕ್‌ ಸಂಪರ್ಕಿಸಲು ವಿಫಲವಾಗಿದೆ"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"ಮರೆತುಬಿಡು"</string>
@@ -737,12 +731,10 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"ವೈ-ಫೈಗೆ ಆದ್ಯತೆ ನೀಡಲಾಗಿದೆ"</item>
     <item msgid="5267397515594230396">"ಸೆಲ್ಯುಲಾರ್‌ಗೆ ಆದ್ಯತೆ ನೀಡಲಾಗಿದೆ"</item>
-    <item msgid="3132912693346866895">"ವೈ-ಫೈ ಮಾತ್ರ"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆ ಆನ್‌ ಆದಾಗ, ನಿಮ್ಮ ಫೋನ್‌ ನಿಮ್ಮ ಆದ್ಯತೆ ಮತ್ತು ಯಾವ ಸಿಗ್ನಲ್ ಬಲವಾಗಿದೆ ಎಂಬುದರ ಅನುಗುಣವಾಗಿ, ಕರೆಗಳನ್ನು ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ಗಳು ಅಥವಾ ನಿಮ್ಮ ವಾಹಕದ ನೆಟ್‌ವರ್ಕ್ ಮೂಲಕ ರವಾನಿಸುತ್ತದೆ. ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಆನ್‌ ಮಾಡವ ಮೊದಲು, ಶುಲ್ಕಗಳು  ಮತ್ತು ಇತರ ವಿವರಗಳಿಗೆ ಸಂಬಂಧಿಸಿದಂತೆ ನಿಮ್ಮ ವಾಹಕವನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
     <string name="home_settings" msgid="212375129455718176">"ಮುಖಪುಟ"</string>
@@ -916,12 +908,12 @@
     <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">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು (ಅಪ್ಲಿಕೇಶನ್‌ ಡೇಟಾ &amp; ಮಾಧ್ಯಮ ವಿಷಯ)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು &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_music_usage" msgid="1363785144783011606">"ಆಡಿಯೋ (ಸಂಗೀತ, ರಿಂಗ್‌ಟೋನ್‌ಗಳು, ಪೋಡ್‌ಕ್ಯಾಸ್ಟ್‌ಗಳು, ಇತರೆ.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"ಇತರೆ."</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"ಇತರ ಫೈಲ್‌ಗಳು"</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>
@@ -954,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"ಅಳವಡಿಕೆ ತೆಗೆದುಹಾಕುವಿಕೆ ಪ್ರಗತಿಯಲ್ಲಿದೆ"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"ಸಂಗ್ರಹಣೆ ಸ್ಥಳವು ತುಂಬಿದೆ"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"ಸಿಂಕ್‌ ಮಾಡುವುದರಂತಹ ಕೆಲವು ಸಿಸ್ಟಂ ಕ್ರಿಯೆಗಳು ಸೂಕ್ತ ರೀತಿಯಲ್ಲಿ ಕಾರ್ಯನಿರ್ವಹಿಸದೇ ಇರಬಹುದು. ಅಪ್ಲಿಕೇಶನ್‌ ಅಥವಾ ಮಾಧ್ಯಮ ವಿಷಯದಂತಹ ಐಟಂಗಳನ್ನು ಅಳಿಸಿಹಾಕಿ ಅಥವಾ ಅನ್‌ಪಿನ್‌ ಮಾಡುವ ಮೂಲಕ ಸ್ಥಳವನ್ನು ಖಾಲಿಯಾಗಿರಿಸುವಂತೆ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿ."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"ಮರುಹೆಸರಿಸು"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"ಅಳವಡಿಸಿ"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"ತೆಗೆದುಹಾಕು"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"ಅಳಿಸಿ &amp; ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಿ"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯಂತೆ ಅಳಿಸಿ &amp; ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಿ"</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>
@@ -964,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"ನಿಮ್ಮ ಕಂಪ್ಯೂಟರ್‌ನಲ್ಲಿ MIDI ಸಕ್ರಿಯಗೊಳಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು MIDI ಸಾಫ್ಟ್‌ವೇರ್‌ನೊಂದಿಗೆ USB ಮೂಲಕ ಕಾರ್ಯನಿರ್ವಹಿಸಲು ಅನುಕೂಲ ಕಲ್ಪಿಸಿ."</string>
     <string name="storage_other_users" msgid="808708845102611856">"ಇತರ ಬಳಕೆದಾರರು"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"ಸಾಧನ ಸಂಗ್ರಹಣೆ"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"ತೆಗೆದು ಹಾಕಬಹುದಾದ ಸಂಗ್ರಹಣೆ"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> ಉಚಿತ (ಒಟ್ಟು <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> ಅಳವಡಿಸಲಾಗಿದೆ"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g> ಅಳವಡಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> ಸುರಕ್ಷಿತವಾಗಿ ತೆಗೆದುಹಾಕಲಾಗಿದೆ"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g> ಸುರಕ್ಷಿತವಾಗಿ ತೆಗೆದುಹಾಕಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> ಅನ್ನು ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> ಅನ್ನು ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"ಸಂಗ್ರಹಣೆಯನ್ನು ಮರುಹೆಸರಿಸಿ"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಿದ ನಂತರ, ನೀವು ಈ <xliff:g id="NAME_0">^1</xliff:g> ಅನ್ನು ಇತರ ಸಾಧನಗಳಲ್ಲಿ ಬಳಸಬಹುದು. \n\n<xliff:g id="NAME_1">^1</xliff:g> ರಲ್ಲಿನ ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು. ಮೊದಲು ಬ್ಯಾಕಪ್ ಮಾಡುವುದನ್ನು ಪರಿಗಣಿಸಿ. \n\n"<b>"ಫೋಟೋಗಳು &amp; ಇತರ ಮಾಧ್ಯಮವನ್ನು ಬ್ಯಾಕಪ್ ಮಾಡಿ"</b>" \nನಿಮ್ಮ ಮಾಧ್ಯಮ ಫೈಲ್‌ಗಳನ್ನು ಈ ಸಾಧನದಲ್ಲಿ ಪರ್ಯಾಯ ಸಂಗ್ರಹಣೆಗೆ ಸರಿಸಿ ಅಥವಾ USB ಕೇಬಲ್ ಬಳಸುವ ಮೂಲಕ ಅವುಗಳನ್ನು ಕಂಪ್ಯೂಟರ್‌ಗೆ ವರ್ಗಾಯಿಸಿ. \n\n"<b>"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಬ್ಯಾಕಪ್ ಮಾಡಿ"</b>" \nಈ <xliff:g id="NAME_6">^1</xliff:g> ರಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾಗಿರುವ ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಅಸ್ಥಾಪಿಸಲಾಗುವುದು ಮತ್ತು ಅವುಗಳ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು. ಈ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಇರಿಸಿಕೊಳ್ಳಲು, ಅವುಗಳನ್ನು ಈ ಸಾಧನದಲ್ಲಿ ಪರ್ಯಾಯ ಸಂಗ್ರಹಣೆಗೆ ಸರಿಸಿ."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"ನೀವು <xliff:g id="NAME_0">^1</xliff:g> ಅನ್ನು ಎಜೆಕ್ಟ್ ಮಾಡಿದಾಗ, ಅದರಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದನ್ನು ನಿಲ್ಲಿಸುತ್ತವೆ ಮತ್ತು ಅದರಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾಗಿರುವ ಮಾಧ್ಯಮ ಫೈಲ್‌ಗಳು ಅದನ್ನು ಮರು ಸೇರಿಸುವವರಗೆ ಲಭ್ಯವಿರುವುದಿಲ್ಲ."</b>" \n\n<xliff:g id="NAME_1">^1</xliff:g> ಇದನ್ನು ಈ ಸಾಧನದಲ್ಲಿ ಮಾತ್ರ ಕಾರ್ಯನಿರ್ವಹಿಸಲು ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಲಾಗಿದೆ. ಇದು ಯಾವುದೇ ಇತರ ಸಾಧನಗಳಲ್ಲಿ ಕೆಲಸ ಮಾಡುವುದಿಲ್ಲ."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"ನಿಮ್ಮ <xliff:g id="NAME">^1</xliff:g> ಅನ್ನು ಹೊಂದಿಸಿ"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"ಪೋರ್ಟಬಲ್ ಸಂಗ್ರಹಣೆಯಂತೆ ಬಳಸಿ"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"ಸಾಧನಗಳ ನಡುವೆ ಫೋಟೋಗಳು ಮತ್ತು ಇತರ ಮಾಧ್ಯಮವನ್ನು ಸರಿಸಲು."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯಂತೆ ಬಳಸಿ"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಫೋಟೋಗಳು ಸೇರಿದಂತೆ, ಈ ಸಾಧನದಲ್ಲಿ ಮಾತ್ರ ಏನಾದರೂ ಸಂಗ್ರಹಿಸಲು. ಅದನ್ನು ಇತರ ಸಾಧನಗಳೊಂದಿಗೆ ಕೆಲಸ ಮಾಡುವುದನ್ನು ತಡೆಯುವ ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡುವ ಅಗತ್ಯವಿದೆ."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯಂತೆ ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಿ"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"ಅದನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದಕ್ಕೆ <xliff:g id="NAME_0">^1</xliff:g> ಗೆ ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡುವ ಅಗತ್ಯವಿದೆ. \n\nಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಿದ ನಂತರ, ಈ ಸಾಧನದಲ್ಲಿ ಮಾತ್ರ <xliff:g id="NAME_1">^1</xliff:g> ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತದೆ. \n\n"<b>"ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡುವುದು <xliff:g id="NAME_2">^1</xliff:g> ದಲ್ಲಿ ಪ್ರಸ್ತುತ ಸಂಗ್ರಹಿಸಲಾಗಿರುವ ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ."</b>" ಡೇಟಾವನ್ನು ನಷ್ಟವಾಗುವುದನ್ನು ತಪ್ಪಿಸಲು, ಅದನ್ನು ಬ್ಯಾಕಪ್ ಮಾಡಲು ಪರಿಗಣಿಸಿ."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"ಅಳಿಸು &amp; ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡು"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> ಅನ್ನು ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"<xliff:g id="NAME">^1</xliff:g> ಫಾರ್ಮ್ಯಾಟ್ ಆಗುತ್ತಿರುವಾಗ ಅದನ್ನು ತೆಗೆದುಹಾಕಬೇಡಿ."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ಡೇಟಾವನ್ನು ಹೊಸ ಸಂಗ್ರಹಣೆಗೆ ಸರಿಸಿ"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"ನಿಮ್ಮ ಫೋಟೋಗಳು, ಫೈಲ್‌ಗಳು ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು ನೀವು ಈ ಹೊಸ <xliff:g id="NAME">^1</xliff:g> ಗೆ ಸರಿಸಬಹುದು. \n\nಸರಿಸಲು <xliff:g id="TIME">^2</xliff:g> ಸಮಯವನ್ನು ತೆಗೆದುಕೊಳ್ಳಬಹುದು ಮತ್ತು ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯಲ್ಲಿ <xliff:g id="SIZE">^3</xliff:g> ನಷ್ಟು ತೆರವುಗೊಳಿಸುತ್ತದೆ. ಅದು ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತಿರುವಾಗ ಕೆಲವು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಕೆಲಸ ಮಾಡುವುದಿಲ್ಲ."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"ಇದೀಗ ಸರಿಸಿ"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"ನಂತರ ಸರಿಸಿ"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"ಇದೀಗ ಡೇಟಾವನ್ನು ಸರಿಸಿ"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"ಸರಿಸಲು <xliff:g id="TIME">^1</xliff:g> ಸಮಯ ತೆಗೆದುಕೊಳ್ಳಬಹುದು. ಅದು ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯ <xliff:g id="SIZE">^2</xliff:g> ನಷ್ಟು ತೆರವುಗೊಳಿಸುತ್ತದೆ."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"ಸರಿಸು"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"ಡೇಟಾವನ್ನು ಸರಿಸಲಾಗುತ್ತಿದೆ…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"ಸರಿಸುವಾಗ: \n• <xliff:g id="NAME">^1</xliff:g> ಅನ್ನು ತೆಗೆದುಹಾಕಬೇಡಿ. \n• ಕೆಲವು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಸರಿಯಾಗಿ ಕೆಲಸ ಮಾಡುವುದಿಲ್ಲ. \n• ಸಾಧನವನ್ನು ಚಾರ್ಜ್ ಮಾಡಿ ಇರಿಸಿ."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> ಸಿದ್ಧವಾಗಿದೆ"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"ಫೋಟೋಗಳು ಮತ್ತು ಇತರ ಮಾಧ್ಯಮದೊಂದಿಗೆ ಬಳಸಲು ನಿಮ್ಮ <xliff:g id="NAME">^1</xliff:g> ಸಿದ್ಧವಾಗಿದೆ."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"ನಿಮ್ಮ ಹೊಸ <xliff:g id="NAME">^1</xliff:g> ಕೆಲಸ ಮಾಡುತ್ತಿದೆ. \n\nಈ ಸಾಧನಕ್ಕೆ ಫೋಟೋಗಳು, ಫೈಲ್‌ಗಳು ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು ಸರಿಸಲು, ಸೆಟ್ಟಿಂಗ್‌ಗಳು &gt; ಸಂಗ್ರಹಣೆಗೆ ಹೋಗಿ."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> ಅನ್ನು ಸರಿಸಿ"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<xliff:g id="APP">^1</xliff:g> ಮತ್ತು ಅದರ ಡೇಟಾವನ್ನು <xliff:g id="NAME_0">^2</xliff:g> ಗೆ ಸರಿಸಲು ಕೆಲವು ಕ್ಷಣಗಳನ್ನು ತೆಗೆದುಕೊಳ್ಳಬಹುದು. ಸರಿಸುವುದು ಪೂರ್ಣಗೊಳ್ಳುವವರೆಗೆ ನಿಮಗೆ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಸರಿಸುವಾಗ <xliff:g id="NAME_1">^2</xliff:g> ಅನ್ನು ತೆಗೆದುಹಾಕಬೇಡಿ."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> ಅನ್ನು ಸರಿಸಲಾಗುತ್ತಿದೆ…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"ಸರಿಸುವಾಗ <xliff:g id="NAME">^1</xliff:g> ಅನ್ನು ತೆಗೆದುಹಾಕಬೇಡಿ. \n\nಈ ಸಾಧನದಲ್ಲಿರುವ <xliff:g id="APP">^2</xliff:g> ಅಪ್ಲಿಕೇಶನ್ ಸರಿಸುವುದು ಪೂರ್ಣಗೊಳ್ಳುವವರೆಗೆ ಲಭ್ಯವಿರುವುದಿಲ್ಲ."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ಸರಿಸುವುದನ್ನು ರದ್ದುಮಾಡಿ"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"ಬ್ಯಾಟರಿ ಸ್ಥಿತಿ"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ಬ್ಯಾಟರಿ ಮಟ್ಟ"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN ಗಳು"</string>
@@ -1008,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"ಡೀಫಾಲ್ಟ್‌ಗೆ  ಮರುಹೊಂದಿಸು"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ಡೀಫಾಲ್ಟ್ APN ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಮರುಹೊಂದಿಕೆಯು ಪೂರ್ಣಗೊಂಡಿದೆ."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"ನೆಟ್‌ವರ್ಕ್‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಮರುಹೊಂದಾಣಿಕೆ"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"ಇದು ನೆಟ್‌ವರ್ಕಿಂಗ್‌ಗೆ ಸಂಬಂಧಿಸಿದ ಎಲ್ಲಾ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಫ್ಯಾಕ್ಟರಿ ಡೀಫಾಲ್ಟ್‌ಗೆ ಮರುಹೊಂದಿಸುತ್ತದೆ, ಉದಾಹರಣೆಗೆ:\n\n"<li>"ವೈಫೈ"</li>\n<li>"ಮೊಬೈಲ್‌ ಡೇಟಾ"</li>\n<li>"ಬ್ಲೂಟೂತ್‌"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"ಇವುಗಳನ್ನು ಸೇರಿದಂತೆ ಇದು ಎಲ್ಲಾ ನೆಟ್‌ವರ್ಕ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸುತ್ತದೆ:\n\n"<li>"ವೈ-ಫೈ"</li>\n<li>"ಸೆಲ್ಯುಲಾರ್‌ ಡೇಟಾ"</li>\n<li>"ಬ್ಲೂಟೂತ್‌"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸಿ"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"ಎಲ್ಲಾ ನೆಟ್‌ವರ್ಕ್‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸುವುದೇ? ನೀವು ಈ ಕ್ರಮವನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"ಎಲ್ಲಾ ನೆಟ್‌ವರ್ಕ್‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸುವುದೇ? ನಿಮಗೆ ಈ ಕ್ರಮವನ್ನು ರದ್ದುಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸಿ"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"ನೆಟ್‌ವರ್ಕ್‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಮರುಹೊಂದಿಸುವಿಕೆಯನ್ನು ದೃಢೀಕರಿಸಲು ನಿಮ್ಮ ಅನ್‌ಲಾಕ್‌ ನಮೂನೆಯನ್ನು ನೀವು ಎಳೆಯುವ ಅಗತ್ಯವಿರುತ್ತದೆ."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"ಮರುಹೊಂದಿಸುವುದೇ?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"ನೆಟ್‌ವರ್ಕ್‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಮರುಹೊಂದಾಣಿಕೆ"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"ನೆಟ್‌ವರ್ಕ್‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸಲಾಗಿದೆ"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"ಸಾಧನವನ್ನು ಮರುಹೊಂದಿಸಿ"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ಮರುಹೊಂದಿಕೆ"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ಇದು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ನ "<b>"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯ"</b>" ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ, ಅವುಗಳೆಂದರೆ:\n\n"<li>"ನಿಮ್ಮ Google ಖಾತೆ"</li>\n<li>"ಸಿಸ್ಟಂ ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾ ಹಾಗೂ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</li>\n<li>"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</li></string>
@@ -1030,9 +1065,8 @@
     <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="1062841478823409667">"ನಿಮ್ಮ ಎಲ್ಲ ವೈಯಕ್ತಿಕ ಮಾಹಿತಿ ಮತ್ತು ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಅಳಿಸಬೇಕೇ? ನೀವು ಈ ಕ್ರಿಯೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ಎಲ್ಲವನ್ನೂ ಅಳಿಸು"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"ಈ ಬಳಕೆದಾರರಿಗೆ ಫ್ಯಾಕ್ಟರಿ ಮರುಹೊಂದಿಕೆ ಲಭ್ಯವಿಲ್ಲ"</string>
@@ -1049,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"ಧ್ವನಿಮೇಲ್, ಕರೆ ಫಾರ್ವರ್ಡ್ ಮಾಡುವಿಕೆ, ಕರೆ ನಿರೀಕ್ಷೆ, ಕರೆಮಾಡುವವರ ID ಅನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB ಟೆಥರಿಂಗ್"</string>
@@ -1082,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"ಸಹಾಯ"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"ಸೆಲ್ಯುಲಾರ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳು"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"ಮೊಬೈಲ್ ಯೋಜನೆ"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"ಡೀಫಾಲ್ಟ್ SMS ಅಪ್ಲಿಕೇಶನ್"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS ಅಪ್ಲಿಕೇಶನ್"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS ಅಪ್ಲಿಕೇಶನ್‌ ಬದಲಾಯಿಸುವುದೇ?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"<xliff:g id="CURRENT_APP">%2$s</xliff:g> ಬದಲಾಗಿ <xliff:g id="NEW_APP">%1$s</xliff:g> ಅನ್ನು ನಿಮ್ಮ SMS ಅಪ್ಲಿಕೇಶನ್‌ ಆಗಿ ಬಳಸುವುದೇ?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g> ಅನ್ನು ನಿಮ್ಮ SMS ಅಪ್ಲಿಕೇಶನ್‌ ಆಗಿ ಬಳಸುವುದೇ?"</string>
@@ -1113,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು GPS ಬಳಸಿ"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"ಸ್ಕ್ಯಾನ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"ಸ್ಕ್ಯಾನ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"ವೈ-ಫೈ ಸ್ಕ್ಯಾನಿಂಗ್"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"ವೈ-ಫೈ ಆಫ್ ಆಗಿರುವಾಗಲೂ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗೆ ಸ್ಕ್ಯಾನ್ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಸೇವೆಗಳಿಗೆ ಅನುಮತಿಸುವುದರ ಮೂಲಕ ಸ್ಥಳ ಸುಧಾರಣೆ ಮಾಡಿ"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ಬ್ಲೂಟೂತ್ ಸ್ಕ್ಯಾನಿಂಗ್"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"ಬ್ಲೂಟೂತ್ ಆಫ್ ಆಗಿರುವಾಗಲೂ, ಬ್ಲೂಟೂತ್‌ಗೆ ಸ್ಕ್ಯಾನ್ ಮಾಡಲು ಸಿಸ್ಟಮ್ ಸೇವೆಗಳಿಗೆ ಅನುಮತಿಸುವುದರ ಮೂಲಕ ಸ್ಥಳ ಸುಧಾರಣೆ ಮಾಡಿ"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; ಸೆಲ್ಯುಲಾರ್ ನೆಟ್‌ವರ್ಕ್ ಸ್ಥಾನ"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"ನಿಮ್ಮ ಸ್ಥಾನವನ್ನು ಅತಿ ವೇಗವಾಗಿ ಅಂದಾಜು ಮಾಡಲು Google ನ ಸ್ಥಾನ ಸೇವೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಬಳಸಿ. ಅನಾಮಧೇಯ ಸ್ಥಳದ ಡೇಟಾವನ್ನು ಸಂಗ್ರಹಿಸಲಾಗುವುದು ಮತ್ತು Google ಗೆ ಕಳುಹಿಸಲಾಗುವುದು."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi ಮೂಲಕ ನಿರ್ಧರಿಸಲಾಗಿರುವ ಸ್ಥಳ"</string>
@@ -1158,11 +1194,15 @@
     <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="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"ಮುಂದುವರಿಸಲು ನಿಮ್ಮ ಸಾಧನದ ನಮೂನೆಯನ್ನು ಬಳಸಿ."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"ಮುಂದುವರಿಸಲು ನಿಮ್ಮ ಸಾಧನದ ಪಿನ್‌ ನಮೂದಿಸಿ."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"ಮುಂದುವರಿಸಲು ನಿಮ್ಮ ಸಾಧನದ ಪಾಸ್‌ವರ್ಡ್‌ ನಮೂದಿಸಿ."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"ತಪ್ಪಾದ ಪಿನ್‌"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"ತಪ್ಪಾದ ಪಾಸ್‌ವರ್ಡ್‌"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"ತಪ್ಪಾದ ನಮೂನೆ"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"ಸಾಧನ ಭದ್ರತೆ"</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>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"ಸಹಾಯಕ್ಕಾಗಿ ಮೆನು ಒತ್ತಿರಿ."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"ಮುಗಿಸಿದ ನಂತರ ಬೆರಳನ್ನು ಮೇಲೆತ್ತಿರಿ"</string>
@@ -1184,8 +1224,7 @@
     <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" msgid="6909161623701848863">"ಹಲವಾರು ತಪ್ಪು ಪ್ರಯತ್ನಗಳು. ಮತ್ತೆ <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>
@@ -1236,7 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"ಗಾತ್ರದ ಪ್ರಕಾರ ವಿಂಗಡಿಸಿ"</string>
     <string name="show_running_services" msgid="5736278767975544570">"ಚಾಲನೆಯಲ್ಲಿರುವ ಸೇವೆಗಳನ್ನು ತೋರಿಸು"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"ಸಂಗ್ರಹಿಸಲಾದ ಪ್ರಕ್ರಿಯೆಗಳನ್ನು ತೋರಿಸು"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"ಡೀಫಾಲ್ಟ್ ತುರ್ತು ಅಪ್ಲಿಕೇಶನ್"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"ತುರ್ತು ಅಪ್ಲಿಕೇಶನ್"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"ಅಪ್ಲಿಕೇಶನ್ ಪ್ರಾಶಸ್ತ್ಯಗಳನ್ನು ಮರುಹೊಂದಿಸಿ"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"ಅಪ್ಲಿಕೇಶನ್ ಪ್ರಾಶಸ್ತ್ಯಗಳನ್ನು ಮರುಹೊಂದಿಸುವುದೇ?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"ಎಲ್ಲ ಪ್ರಾಶಸ್ತ್ಯಗಳಿಗಾಗಿ ಇದಕ್ಕಾಗಿ ಮರುಹೊಂದಿಸುತ್ತದೆ:\n\n "<li>"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</li>\n" "<li>"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ ಅಧಿಸೂಚನೆಗಳು"</li>\n" "<li>"ಕ್ರಮಗಳಿಗಾಗಿ ಡೀಫಾಲ್ಟ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</li>\n" "<li>"ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗಾಗಿ ಹಿನ್ನೆಲೆ ಡೇಟಾ ನಿರ್ಬಂಧಗಳು"</li>\n" "<li>"ಯಾವುದೇ ಅನುಮತಿ ನಿರ್ಬಂಧಗಳು"</li>\n\n" ನೀವು ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು ಕಳೆದುಕೊಳ್ಳುವುದಿಲ್ಲ."</string>
@@ -1308,7 +1347,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"ಅಪ್ಲಿಕೇಶನ್‌ ಕಾರ್ಯಾಚರಣೆಗಳು"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"ಚಾಲನೆಯಲ್ಲಿದೆ"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(ಎಂದಿಗೂ ಬಳಸಿಲ್ಲ)"</string>
-    <string name="no_default_apps" msgid="2915315663141025400">"ಡೀಫಾಲ್ಟ್‌ ಅಪ್ಲಿ.ಗಳಿಲ್ಲ"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"ಡೀಫಾಲ್ಟ್‌ ಆಪ್‌ಗಳಿಲ್ಲ"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"ಸಂಗ್ರಹಣೆ ಬಳಕೆ"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಬಳಸಿರುವ ಸಂಗ್ರಹಣೆಯನ್ನು ವೀಕ್ಷಿಸಿ"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"ಚಾಲನೆಯಲ್ಲಿರುವ ಸೇವೆಗಳು"</string>
@@ -1440,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ಫೈಲ್‌ನಲ್ಲಿ ಎಲ್ಲ bluetooth HCI ಪ್ಯಾಕೆಟ್‌ಗಳನ್ನು ಸೆರೆಹಿಡಿಯಿರಿ"</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="select_logd_size_title" msgid="7433137108348553508">"ಲಾಗರ್ ಬಫರ್ ಗಾತ್ರಗಳು"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 ಗಂಟೆಗಳು"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 ದಿನ"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"ಸಿಸ್ಟಂ ತೋರಿಸು"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"ಸಿಸ್ಟಮ್ ಮರೆಮಾಡು"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss ಬಳಸಿ"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"ಅಂಕಿಅಂಶಗಳ ಪ್ರಕಾರ"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"ಹಿನ್ನೆಲೆ"</string>
@@ -1838,7 +1876,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_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>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"ಬಳಕೆದಾರ"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"ನಿರ್ಬಂಧಿಸಿದ ಪ್ರೊಫೈಲ್"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"ಹೊಸ ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸುವುದೇ?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"ನೀವು ಹೆಚ್ಚುವರಿ ಬಳಕೆದಾರರನ್ನು ರಚಿಸುವ ಮೂಲಕ ಇತರ ಜನರ ಜೊತೆಗೆ ಈ ಸಾಧನವನ್ನು ಹಂಚಿಕೊಳ್ಳಬಹುದು. ಪ್ರತಿ ಬಳಕೆದಾರರು ತಮ್ಮದೇ ಸ್ಥಳವನ್ನು ಹೊಂದಿರುತ್ತಾರೆ, ಇದರಲ್ಲಿ ಅವರು ತಮ್ಮದೇ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು, ವಾಲ್‌ಪೇಪರ್ ಮತ್ತು ಮುಂತಾದವುಗಳ ಮೂಲಕ ಕಸ್ಟಮೈಸ್ ಮಾಡಬಹುದು. ಎಲ್ಲರ ಮೇಲೂ ಪರಿಣಾಮ ಬೀರುವಂತೆ Wi-Fi ರೀತಿಯ ಸಾಧನ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬಳಕೆದಾರರು ಸರಿಹೊಂದಿಸಬಹುದು.\n\nನೀವು ಒಬ್ಬ ಹೊಸ ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಿದಾಗ, ಆ ವ್ಯಕ್ತಿಯು ಅವರ ಸ್ಥಳವನ್ನು ಹೊಂದಿಸಬೇಕಾಗುತ್ತದೆ.\n\nಯಾವುದೇ ಬಳಕೆದಾರರು ಎಲ್ಲಾ ಇತರೆ ಬಳಕೆದಾರರಿಗಾಗಿ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ನವೀಕರಿಸಬಹುದು."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"ನೀವು ಹೆಚ್ಚುವರಿ ಬಳಕೆದಾರರನ್ನು ರಚಿಸುವ ಮೂಲಕ ಇತರ ಜನರ ಜೊತೆಗೆ ಈ ಸಾಧನವನ್ನು ಹಂಚಿಕೊಳ್ಳಬಹುದು. ಪ್ರತಿ ಬಳಕೆದಾರರು ತಮ್ಮದೇ ಸ್ಥಳವನ್ನು ಹೊಂದಿರುತ್ತಾರೆ, ಇದರಲ್ಲಿ ಅವರು ತಮ್ಮದೇ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು, ವಾಲ್‌ಪೇಪರ್ ಮತ್ತು ಮುಂತಾದವುಗಳ ಮೂಲಕ ಕಸ್ಟಮೈಸ್ ಮಾಡಿಕೊಳ್ಳಬಹುದು. ಎಲ್ಲರ ಮೇಲೂ ಪರಿಣಾಮ ಬೀರುವಂತೆ ವೈ-ಫೈ ರೀತಿಯ ಸಾಧನ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬಳಕೆದಾರರು ಸರಿಹೊಂದಿಸಬಹುದು.\n\nನೀವು ಒಬ್ಬ ಹೊಸ ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಿದಾಗ, ಆ ವ್ಯಕ್ತಿಯು ಅವರ ಸ್ಥಳವನ್ನು ಹೊಂದಿಸಬೇಕಾಗುತ್ತದೆ.\n\nಯಾವುದೇ ಬಳಕೆದಾರರು ಎಲ್ಲಾ ಇತರೆ ಬಳಕೆದಾರರಿಗೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ನವೀಕರಿಸಬಹುದು."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"ನೀವು ಒಬ್ಬ ಹೊಸ ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಿದಾಗ, ಆ ವ್ಯಕ್ತಿಯು ಅವರ ಸ್ಥಳವನ್ನು ಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ.\n\nಯಾವುದೇ ಬಳಕೆದಾರರು ಎಲ್ಲಾ ಇತರೆ ಬಳಕೆದಾರರಿಗಾಗಿ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ನವೀಕರಿಸಬಹುದು."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"ಈಗ ಬಳಕೆದಾರರನ್ನು ಸೆಟಪ್‌‌ ಮಾಡುವುದೇ?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"ಸಾಧನವನ್ನು ತೆಗೆದುಕೊಳ್ಳಲು ಮತ್ತು ಅದರ ಸ್ಥಳವನ್ನು ಹೊಂದಿಸಲು ವ್ಯಕ್ತಿಯು ಲಭ್ಯವಿದ್ದಾರೆಯೇ ಎಂಬುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ"</string>
@@ -2396,6 +2433,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"ತುರ್ತು ಐಸ್ ಅಪ್ಲಿಕೇಶನ್ ಡೀಫಾಲ್ಟ್"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಡೌನ್‌ಲೋಡ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಸಿಸ್ಟಮ್"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅನುಮತಿಗಳು ಭದ್ರತೆ"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಡೀಫಾಲ್ಟ್"</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>
@@ -2410,14 +2448,12 @@
     <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="6948120138640252732">"ಅಡಚಣೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸಿ"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ಆದ್ಯತೆ ಮಾತ್ರ ಅನುಮತಿಸುತ್ತದೆ"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ಸ್ವಯಂಚಾಲಿತ ನಿಯಮಗಳು"</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_alarms" msgid="7380265858042606857">"ಅಲಾರಮ್‌ಗಳನ್ನು ಮಾತ್ರ ಅನುಮತಿಸಿ"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"ಅಡಚಣೆ ಮಾಡಬೇಡ"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"ಪ್ರಾಶಸ್ತ್ಯ ಮಾತ್ರ"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"ಅಲಾರಮ್‌ಗಳು ಮಾತ್ರ"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"ಯಾವುದೇ ಅಡಚಣೆಗಳಿಲ್ಲ"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ಫೋನ್ ರಿಂಗ್‌ಟೋನ್"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"ಡೀಫಾಲ್ಟ್ ಅಧಿಸೂಚನೆ ರಿಂಗ್‌ಟೋನ್‌"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ಕರೆಗಳಿಗೂ ಸಹ ವೈಬ್ರೇಟ್‌"</string>
@@ -2450,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"ಯಾವುದೇ ಅಧಿಸೂಚನೆಯನ್ನು ಕೇಳುಗರನ್ನು ಸ್ಥಾಪಿಸಲಾಗಿಲ್ಲ."</string>
     <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">"ಯಾವುದೇ ಪೂರೈಕೆದಾರರು ಕಂಡೀಶನ್‌‌ಗಳ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಲ್ಲ"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="one">%d ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಷರತ್ತುಗಳನ್ನು ಒದಗಿಸುತ್ತದೆ</item>
-      <item quantity="other">%d ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಷರತ್ತುಗಳನ್ನು ಒದಗಿಸುತ್ತದೆ</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="loading_notification_apps" msgid="5031818677010335895">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"ಎಲ್ಲವನ್ನೂ ನಿರ್ಬಂಧಿಸಿ"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ಈ ಅಪ್ಲಿಕೇಶನ್‌ನ ಅಧಿಸೂಚನೆಗಳನ್ನು ಎಂದಿಗೂ ತೋರಿಸಬೇಡ"</string>
@@ -2472,17 +2499,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"ನಿಯಮದ ಹೆಸರು"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"ನಿಯಮವನ್ನು ಸೇರಿಸಿ"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"ನಿಯಮವನ್ನು ಅಳಿಸಿ"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<xliff:g id="RULE">%1$s</xliff:g>\" ನಿಯಮವನ್ನು ಅಳಿಸುವುದೇ?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"ಅಳಿಸಿ"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"ನಿಯಮದ ಪ್ರಕಾರ"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"ಅಪರಿಚಿತ"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"ನಿಯಮವನ್ನು ಕಾನ್ಫಿಗರ್ ಮಾಡಿ"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"ನಿಯಮವನ್ನು ನಿಗದಿಪಡಿಸಿ"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"ನಿಯಮ ಕಂಡು ಬಂದಿಲ್ಲ."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"ದಿನಗಳು"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"ಯಾವುದೂ ಇಲ್ಲ"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"ಪ್ರತಿ ದಿನ"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"ಎಂದಿಗೂ ಬೇಡ"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> ರಿಂದ <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"ಕರೆಗಳು"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"ಸಂದೇಶಗಳು"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"ಇವರಿಂದ ಕರೆಗಳು/ಸಂದೇಶಗಳು"</string>
@@ -2492,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"ಅಲಾರಮ್‌ಗಳು"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"ಜ್ಞಾಪನೆಗಳು"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ಈವೆಂಟ್‌ಗಳು"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ಆಯ್ಕೆಮಾಡಲಾದ ಕರೆದಾರರು"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ಪುನರಾವರ್ತಿತ ಕರೆದಾರರು"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"ಒಂದು ವೇಳೆ ಅದೇ ವ್ಯಕ್ತಿ <xliff:g id="MINUTES">%d</xliff:g> ನಿಮಿಷದೊಳಗಿನ ಅವಧಿಯಲ್ಲಿ ಎರಡನೇ ಬಾರಿಗೆ ಕರೆ ಮಾಡಿದರೆ, ಅನುಮತಿಸಿ"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ಮುಂದಿನ ದಿನ"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"ನಿಮ್ಮನ್ನು ಯಾವಾಗ ಅಡಚಣೆ ಮಾಡಬಹುದು?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"ಎಷ್ಟು ಹೊತ್ತು?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"ಅನಿರ್ದಿಷ್ಟವಾಗಿ"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ನಿಮಿಷಗಳು</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ನಿಮಿಷಗಳು</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ಗಂಟೆಗಳು</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ಗಂಟೆಗಳು</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"ಪ್ರಾಶಸ್ತ್ಯದ ಸೂಚನೆಗಳನ್ನು ಅನಿರ್ದಿಷ್ಟವಾಗಿ ಮಾತ್ರ ಬದಲಾಯಿಸಿ"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">ಪ್ರಾಶಸ್ತ್ಯದ ಅಧಿಸೂಚನೆಗಳನ್ನು <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ವರೆಗೆ <xliff:g id="DURATION">%1$d</xliff:g> ನಿಮಿಷಗಳ ಕಾಲ ಮಾತ್ರ ಬದಲಾಯಿಸಬಹುದು</item>
+      <item quantity="other">ಪ್ರಾಶಸ್ತ್ಯದ ಅಧಿಸೂಚನೆಗಳನ್ನು <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ವರೆಗೆ <xliff:g id="DURATION">%1$d</xliff:g> ನಿಮಿಷಗಳ ಕಾಲ ಮಾತ್ರ ಬದಲಾಯಿಸಬಹುದು</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">ಪ್ರಾಶಸ್ತ್ಯದ ಅಧಿಸೂಚನೆಗಳನ್ನು <xliff:g id="DURATION">%1$d</xliff:g> ಗಂಟೆಗಳ ಕಾಲ ಮಾತ್ರ ಬದಲಾಯಿಸಿ (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ವರೆಗೆ)</item>
+      <item quantity="other">ಪ್ರಾಶಸ್ತ್ಯದ ಅಧಿಸೂಚನೆಗಳನ್ನು <xliff:g id="DURATION">%1$d</xliff:g> ಗಂಟೆಗಳ ಕಾಲ ಮಾತ್ರ ಬದಲಾಯಿಸಬಹುದು (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ವರೆಗೆ)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"ಅಲಾರಮ್‌ಗಳನ್ನು ಅನಿರ್ದಿಷ್ಟವಾಗಿ ಮಾತ್ರ ಬದಲಾಯಿಸಿ"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">ಅಲಾರಮ್‌ಗಳನ್ನು <xliff:g id="DURATION">%1$d</xliff:g> ನಿಮಿಷಗಳ ಕಾಲ ಮಾತ್ರ ಬದಲಾಯಿಸಬಹುದು (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ವರೆಗೆ)</item>
+      <item quantity="other">ಅಲಾರಮ್‌ಗಳನ್ನು <xliff:g id="DURATION">%1$d</xliff:g> ನಿಮಿಷಗಳ ಕಾಲ ಮಾತ್ರ ಬದಲಾಯಿಸಬಹುದು (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ವರೆಗೆ)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="one">ಅಲಾರಮ್‌ಗಳನ್ನು <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ವರೆಗೆ <xliff:g id="DURATION">%1$d</xliff:g> ಗಂಟೆಗಳ ಕಾಲ ಮಾತ್ರ ಬದಲಾಯಿಸಬಹುದು</item>
+      <item quantity="other">ಅಲಾರಮ್‌ಗಳನ್ನು <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ವರೆಗೆ <xliff:g id="DURATION">%1$d</xliff:g> ಗಂಟೆಗಳ ಕಾಲ ಮಾತ್ರ ಬದಲಾಯಿಸಬಹುದು</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"ಅನಿರ್ದಿಷ್ಟವಾಗಿ ಅಡಚಣೆ ಮಾಡಬೇಡಿಗೆ ಬದಲಾಯಿಸಿ"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one"> <xliff:g id="DURATION">%1$d</xliff:g> ನಿಮಿಷಗಳ ಕಾಲ ಅಡ್ಡಪಡಿಸಬೇಡಿಗೆ ಬದಲಾಯಿಸಿ (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ವರೆಗೆ)</item>
+      <item quantity="other"> <xliff:g id="DURATION">%1$d</xliff:g> ನಿಮಿಷಗಳ ಕಾಲ ಅಡ್ಡಪಡಿಸಬೇಡಿಗೆ ಬದಲಾಯಿಸಿ (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ವರೆಗೆ)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one"> <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ವರೆಗೆ <xliff:g id="DURATION">%1$d</xliff:g> ಗಂಟೆಗಳ ಕಾಲ ಅಡ್ಡಪಡಿಸಬೇಡಿಗೆ ಬದಲಾಯಿಸಿ</item>
+      <item quantity="other"> <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ವರೆಗೆ <xliff:g id="DURATION">%1$d</xliff:g> ಗಂಟೆಗಳ ಕಾಲ ಅಡ್ಡಪಡಿಸಬೇಡಿಗೆ ಬದಲಾಯಿಸಿ</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"ಯಾವಾಗಲೂ ಅಡಚಣೆಗೆ ಬದಲಾಯಿಸಿ"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ಎಂದೆಂದಿಗೂ"</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>
@@ -2565,7 +2659,10 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ಅನುಮತಿಗಳನ್ನು ನೀಡಲಾಗಿದೆ</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ಅನುಮತಿಗಳನ್ನು ನೀಡಲಾಗಿದೆ</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_3">%d</xliff:g> ರಲ್ಲಿ <xliff:g id="COUNT_2">%d</xliff:g> ಅನುಮತಿಗಳನ್ನು ನೀಡಲಾಗಿದೆ</item>
+      <item quantity="other"><xliff:g id="COUNT_3">%d</xliff:g> ರಲ್ಲಿ <xliff:g id="COUNT_2">%d</xliff:g> ಅನುಮತಿಗಳನ್ನು ನೀಡಲಾಗಿದೆ</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"ಕೆಲವು ಡೀಫಾಲ್ಟ್‌ಗಳನ್ನು ಹೊಂದಿಸಲಾಗಿದೆ"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"ಡೀಫಾಲ್ಟ್‌ಗಳನ್ನು ಹೊಂದಿಸಲಾಗಿಲ್ಲ"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
@@ -2576,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ಆದ್ಯತೆ"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"ಸೂಕ್ಷ್ಮ"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ಡೊಮೇನ್‌ URL ಗಳ ಜೊತೆಗೆ"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಾದ್ಯಂತ ಆದ್ಯತೆಗಳನ್ನು ಡೀಫಾಲ್ಟ್‌ಗಳಿಗೆ ಮರುಹೊಂದಿಸಿ"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"ಸಿಸ್ಟಮ್ ಮತ್ತು ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಸೇರಿದಂತೆ, <xliff:g id="COUNT">%d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"ನಿರ್ವಾಹಕರಿಂದ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"ಸುಧಾರಿತ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"ಅಜ್ಞಾತ ಅಪ್ಲಿಕೇಶನ್"</string>
     <string name="choose_profile" msgid="8229363046053568878">"ಪ್ರೊಫೈಲ್ ಆಯ್ಕೆಮಾಡಿ"</string>
@@ -2592,4 +2688,11 @@
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅದರ ಡೊಮೇನ್ URL ಗಳನ್ನು ತೆರೆಯಬಹುದು</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅದರ ಡೊಮೇನ್ URL ಗಳನ್ನು ತೆರೆಯಬಹುದು</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"ಗುರುತಿಸಲಾಗಿಲ್ಲ"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"ಡೀಫಾಲ್ಟ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"ಬ್ರೌಸರ್ ಅಪ್ಲಿಕೇಶನ್"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ ಬ್ರೌಸರ್ ಇಲ್ಲ"</string>
+    <string name="default_app" msgid="6864503001385843060">"(ಡೀಫಾಲ್ಟ್)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index c8ee3b1..f10b869 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"누름 버튼"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"낮음"</item>
     <item msgid="4212263919458209842">"심각"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"사용 안함"</item>
-    <item msgid="5656544177755411222">"제한적 중단"</item>
-    <item msgid="8735337502532332056">"중단 없음"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"보통"</item>
     <item msgid="866544120205026771">"중간"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e538a28..3b487bb 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD 카드"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"프록시 설정"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"예"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"아니요"</string>
-    <string name="forget" msgid="7267115980248732932">"삭제"</string>
+    <string name="forget" msgid="1400428660472591263">"저장 안함"</string>
+    <string name="save" msgid="879993180139353333">"저장"</string>
+    <string name="done" msgid="6942539184162713160">"완료"</string>
     <string name="settings_label" msgid="1626402585530130914">"설정"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"설정"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"설정 바로가기"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"충전기를 연결한 다음 다시 시도하세요."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"화면 잠금 PIN 또는 비밀번호 없음"</string>
     <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>
@@ -521,7 +518,7 @@
     <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="ble_scan_notify_text" msgid="9019985398053764737">"위치의 정확도를 높이기 위해 Google 서비스에서는 블루투스가 꺼져있더라고 블루투스 기기를 검색합니다. 이 설정은 LINK_BEGIN검색 설정LINK_END에서 변경할 수 있습니다."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"위치 정확도 개선을 위해 블루투스가 꺼져 있을 때에도 앱과 서비스에서 블루투스 기기를 검색합니다. 이 설정은 <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>검색 설정<xliff:g id="LINK_END_1">LINK_END</xliff:g>에서 변경할 수 있습니다."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"연결..."</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>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"위치의 정확도를 높이기 위해 Google 서비스에서는 Wi‑Fi가 꺼져있더라고 Wi‑Fi 네트워크를 검색합니다. 이 설정은 LINK_BEGIN검색 설정LINK_END에서 변경할 수 있습니다."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"위치 정확도 개선을 위해 Wi-Fi가 꺼져 있을 때에도 앱과 서비스에서 Wi-Fi 네트워크를 검색합니다. 이 설정은 <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>검색 설정<xliff:g id="LINK_END_1">LINK_END</xliff:g>에서 변경할 수 있습니다."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"다시 표시 안함"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"절전 모드 동안 Wi-Fi 연결 유지"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"절전 모드에서 Wi‑Fi 사용"</string>
@@ -604,8 +601,6 @@
     <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_apps" msgid="6003687912727859577">"앱 표시"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Wi-Fi 강도 표시"</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>
@@ -663,6 +658,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"연결"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"이 네트워크에는 인터넷이 연결되어 있지 않습니다. 그래도 이 네트워크를 사용하시겠습니까?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"이 네트워크를 다시 요청하지 마세요."</string>
     <string name="wifi_connect" msgid="1076622875777072845">"연결"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"네트워크 연결 실패"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"저장 안함"</string>
@@ -729,21 +726,17 @@
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SECURITY">%2$s</xliff:g><xliff:g id="NETWORK_SSID">%1$s</xliff:g> 휴대용 Wi-Fi 핫스팟"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi 통화"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"통화 환경설정"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi 통화 모드"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi를 기본으로 설정"</item>
     <item msgid="5267397515594230396">"모바일 데이터를 기본으로 설정"</item>
-    <item msgid="3132912693346866895">"Wi-Fi에서만"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wi-Fi 통화가 켜져 있으면 휴대전화에서 환경설정과 신호 강도에 따라 Wi-Fi 네트워크나 데이터 네트워크를 통해 통화를 연결할 수 있습니다. 이 기능을 사용하기 전에 이동통신사에 문의하여 요금과 기타 세부정보를 알아보세요."</string>
     <string name="home_settings" msgid="212375129455718176">"홈"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"디스플레이"</string>
     <string name="sound_settings" msgid="5534671337768745343">"소리"</string>
@@ -915,12 +908,12 @@
     <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="5128673488173839077">"앱 및 앱 데이터"</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">"오디오(음악, 벨소리, podcast 등)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"기타"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"기타 파일"</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>
@@ -953,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"마운트 해제 중"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"저장 공간이 부족함"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"동기화와 같은 일부 시스템 기능이 제대로 작동하지 않을 수 있습니다. 앱이나 미디어 콘텐츠와 같은 항목을 삭제하거나 고정 해제하여 여유 저장 공간을 확보하세요."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"이름 바꾸기"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"마운트"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"꺼내기"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"삭제 및 포맷"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"내부 저장소 삭제 및 포맷"</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>
@@ -963,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"MIDI가 사용 설정된 애플리케이션이 USB를 통해 컴퓨터의 MIDI 소프트웨어와 호환되도록 합니다."</string>
     <string name="storage_other_users" msgid="808708845102611856">"다른 사용자"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"기기 저장용량"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"이동식 저장소"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> 사용 가능(총 <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g>이(가) 마운트되었습니다."</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g>을(를) 마운트하지 못했습니다."</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g>이(가) 안전하게 제거되었습니다."</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g>을(를) 안전하게 제거하지 못했습니다."</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g>이(가) 포맷되었습니다."</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g>을(를) 포맷하지 못했습니다."</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"저장소 이름 바꾸기"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"포맷한 다음 <xliff:g id="NAME_0">^1</xliff:g>을(를) 다른 기기에서 사용할 수 있습니다. \n\n<xliff:g id="NAME_1">^1</xliff:g>에 있는 모든 데이터는 삭제됩니다. 먼저 백업하는 것이 좋습니다. \n\n"<b>"사진 및 기타 미디어 백업"</b>" \n미디어 파일을 이 기기에 있는 대체 저장소로 이동하거나 USB 케이블을 사용하여 컴퓨터로 전송합니다. \n\n"<b>"앱 백업"</b>" \n이 <xliff:g id="NAME_6">^1</xliff:g>에 저장된 모든 앱이 제거되고 데이터가 삭제됩니다. 앱을 계속 사용하려면 이 기기에 있는 대체 저장소로 이동합니다."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"<xliff:g id="NAME_0">^1</xliff:g>을(를) 제거하면 저장된 앱의 작동이 중단되며, 다시 삽입할 때까지 저장된 미디어 파일을 사용할 수 없습니다."</b>" \n\n<xliff:g id="NAME_1">^1</xliff:g>을(를) 포맷하면 이 기기에서만 작동하며 다른 기기에서는 작동하지 않습니다."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> 설정"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"휴대용 저장소로 사용"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"사진과 기타 미디어를 기기 간에 이동하는 데 사용합니다."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"내부 저장소로 사용"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"앱이나 사진 등을 이 기기에만 저장할 용도로 사용합니다. 다른 기기에서 작동하지 않도록 포맷해야 합니다."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"내부 저장소로 포맷"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"보안을 유지하려면 <xliff:g id="NAME_0">^1</xliff:g>을(를) 포맷해야 합니다. \n\n포맷 후 <xliff:g id="NAME_1">^1</xliff:g>은(는) 이 기기에서만 작동합니다. \n\n"<b>"포맷하면 현재 <xliff:g id="NAME_2">^1</xliff:g>에 저장되어 있는 모든 데이터가 삭제됩니다."</b>" 데이터가 손실되지 않도록 하려면 백업하는 것이 좋습니다."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"삭제 및 포맷"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> 포맷 중…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"포맷 중에 <xliff:g id="NAME">^1</xliff:g>을(를) 삭제하지 마세요."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"새로운 저장소로 데이터 이동"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"사진, 파일, 앱 데이터를 이 새로운 <xliff:g id="NAME">^1</xliff:g>(으)로 이동할 수 있습니다. \n\n이동에 소요되는 시간은 약 <xliff:g id="TIME">^2</xliff:g>이며 내부 저장소에 <xliff:g id="SIZE">^3</xliff:g>만큼의 공간이 확보됩니다. 진행 중에 일부 앱이 작동하지 않을 수 있습니다."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"지금 이동"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"나중에 이동"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"지금 데이터 이동"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"이동에 소요되는 시간은 약 <xliff:g id="TIME">^1</xliff:g>이며 내부 저장소에 <xliff:g id="SIZE">^2</xliff:g>만큼의 공간이 확보됩니다."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"이동"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"데이터 이동 중…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"이동 중 주의사항: \n• <xliff:g id="NAME">^1</xliff:g>을(를) 삭제하지 마세요. \n• 일부 앱이 제대로 작동하지 않을 수 있습니다. \n• 기기를 충전된 상태로 유지하세요."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> 준비 완료"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g>에서 사진 및 기타 미디어를 사용할 준비가 되었습니다."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"새로운 <xliff:g id="NAME">^1</xliff:g>이(가) 작동 중입니다. \n\n사진, 파일, 앱 데이터를 이 기기로 이동하려면 \'설정 &gt; 저장소\'로 이동합니다."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> 이동"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<xliff:g id="APP">^1</xliff:g> 및 데이터를 <xliff:g id="NAME_0">^2</xliff:g>(으)로 이동하는 데 소요되는 시간은 몇 분밖에 되지 않습니다. 이동을 완료할 때까지 앱을 사용할 수 없습니다. \n\n이동 중에 <xliff:g id="NAME_1">^2</xliff:g>을(를) 삭제하지 마세요."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> 이동 중…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"이동 중에 <xliff:g id="NAME">^1</xliff:g>을(를) 삭제하지 마세요. \n\n이동을 완료할 때까지 이 기기에 있는 <xliff:g id="APP">^2</xliff:g> 앱을 사용할 수 없습니다."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"이동 취소"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"배터리 상태"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"배터리 수준"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"초기화"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"기본 APN 설정을 초기화했습니다."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"네트워크 설정 초기화"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">\n\n<li>"Wi-Fi"</li>\n<li>"모바일 데이터"</li>\n<li>"블루투스"</li>" 등 네트워크와 관련된 모든 설정이 초기화됩니다."</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"다음을 포함한 모든 네트워크 설정이 재설정됩니다.\n\n"<li>"Wi‑Fi"</li>\n<li>"모바일 데이터"</li>\n<li>"블루투스"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"설정 초기화"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"모든 네트워크 설정을 초기화하시겠습니까? 수행한 후에는 되돌릴 수 없습니다."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"모든 네트워크 설정을 재설정하시겠습니까? 수행한 후에는 작업을 취소할 수 없습니다."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"설정 초기화"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"네트워크 설정 초기화를 확인하려면 잠금해제 패턴을 그려야 합니다."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"초기화하시겠습니까?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"네트워크 설정 초기화"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"네트워크 설정이 재설정되었습니다."</string>
     <string name="device_reset_title" msgid="2384019005638768076">"기기 재설정"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"공장 초기화"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"공장 초기화하면 태블릿의 "<b>"내부 저장소의 모든 데이터가 삭제됩니다."</b>\n\n<li>"Google 계정"</li>\n<li>"시스템과 앱 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string>
@@ -1029,9 +1065,8 @@
     <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="1062841478823409667">"모든 개인정보와 다운로드한 앱을 삭제하시겠습니까? 수행한 후에는 작업을 취소할 수 없습니다."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"모두 지우기"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"초기화를 수행할 권한이 없는 사용자입니다."</string>
@@ -1048,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"음성메일, 착신전환, 통화중 대기, 발신자 번호 설정"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB 테더링"</string>
@@ -1081,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"도움말"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"이동통신망"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"모바일 요금제"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"기본 SMS 앱"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS 앱"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS 앱을 변경하시겠습니까?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"SMS 앱으로 <xliff:g id="CURRENT_APP">%2$s</xliff:g> 대신 <xliff:g id="NEW_APP">%1$s</xliff:g>을(를) 사용하시겠습니까?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"SMS 앱으로 <xliff:g id="NEW_APP">%s</xliff:g>을(를) 사용하시겠습니까?"</string>
@@ -1112,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPS를 사용하여 위치를 찾습니다."</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"검색 중"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"검색 중"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi 검색 중"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Wi-Fi가 꺼져 있을 때에도 앱과 서비스에서 Wi-Fi 네트워크를 검색하도록 허용하여 위치 정확도를 개선합니다."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"블루투스 검색 중"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"블루투스가 꺼져 있을 때에도 시스템 서비스에서 블루투스 기기를 검색하도록 허용하여 위치 정확도를 개선합니다."</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi 및 이동통신망 위치"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"사용자의 위치를 빠르게 파악하도록 앱에서 Google의 위치 서비스를 사용합니다. 익명의 위치 정보가 수집되어 Google로 전송됩니다."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fi에서 측정된 위치"</string>
@@ -1157,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"비밀번호가 설정되었습니다."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN이 설정되었습니다."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"패턴이 설정되었습니다."</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"계속하려면 기기 패턴을 사용하세요."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"계속하려면 기기 PIN을 입력하세요."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"계속하려면 기기 비밀번호를 입력하세요."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"잘못된 PIN입니다."</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"잘못된 비밀번호입니다."</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"잘못된 패턴입니다."</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"기기 보안"</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_wrong" msgid="4694973540770105678">"다시 시도:"</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>
@@ -1183,8 +1224,7 @@
     <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" msgid="6909161623701848863">"잘못된 시도 횟수가 너무 많습니다. <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>
@@ -1235,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"크기순 정렬"</string>
     <string name="show_running_services" msgid="5736278767975544570">"실행 중인 서비스 표시"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"캐시된 프로세스 표시"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"긴급 앱"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"앱 환경설정 재설정"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"앱 환경설정을 재설정하시겠습니까?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"이 작업을 수행하면\n\n "<li>"사용 중지된 앱"</li>\n" "<li>"사용 중지된 앱 알림"</li>\n" "<li>"작업을 수행할 때 사용하는 기본 애플리케이션"</li>\n" "<li>"앱에 대한 백그라운드 데이터 제한"</li>\n" "<li>"그 밖의 권한 제한"</li>"에 대한 모든 환경설정이 재설정됩니다.\n\n 앱 데이터는 손실되지 않습니다."</string>
@@ -1440,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"모든 블루투스 HCI 패킷을 하나의 파일에 캡처"</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="select_logd_size_title" msgid="7433137108348553508">"로거 버퍼 크기"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12시간"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1일"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"시스템 표시"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"시스템 숨기기"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"USS(Unique Set Size) 사용"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"통계 유형"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"백그라운드"</string>
@@ -1838,7 +1876,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_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>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"사용자"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"제한된 프로필"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"새 사용자를 추가할까요?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"사용자를 추가하여 이 기기를 다른 사람들과 공유할 수 있습니다. 각 사용자는 앱, 배경화면 등으로 꾸밀 수 있는 자신만의 공간을 갖습니다. 또한 사용자는 모든 사람에게 적용되는 Wi-Fi와 같은 기기 설정도 조정할 수 있습니다. \n\n추가된 새로운 사용자는 자신의 공간을 설정해야 합니다.\n\n모든 사용자는 다른 사용자들을 위하여 앱을 업데이트할 수 있습니다."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"추가 사용자 프로필을 만들어 다른 사용자와 기기를 공유할 수 있습니다. 각 사용자는 앱, 배경화면 등으로 맞춤설정할 수 있는 자신만의 공간을 갖게 됩니다. 또한 사용자는 모든 사용자에게 적용되는 Wi‑Fi와 같은 기기 설정도 조정할 수 있습니다.\n\n추가된 새 사용자는 자신의 공간을 설정해야 합니다.\n\n누구나 다른 모든 사용자를 위해 앱을 업데이트할 수 있습니다."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"추가된 새로운 사용자는 자신의 공간을 설정해야 합니다.\n\n모든 사용자는 다른 사용자들을 위하여 앱을 업데이트할 수 있습니다."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"지금 사용자를 설정하시겠습니까?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"사용자가 기기를 사용하여 자신의 공간을 설정할 수 있는지 확인하세요."</string>
@@ -2393,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"제한 제한하다 제한됨"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"텍스트 수정 수정 사운드 진동 자동 언어 제스처 추천하기 추천 테마 불쾌감을 주는 단어 유형 그림 이모티콘 전 세계"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"환경설정 기본값 초기화"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"긴급 상황 앱(기본)"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"앱 다운로드 애플리케이션 시스템"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"앱 권한 보안"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"앱 기본"</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>
@@ -2411,14 +2448,12 @@
     <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="6948120138640252732">"알림 차단"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"중요 알림만 허용"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"자동 규칙"</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_alarms" msgid="7380265858042606857">"알람만 허용"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"소리/진동 알림 차단"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"중요 알림만"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"알람만 수신"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"방해 금지"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"전화 벨소리"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"기본 알림 벨소리"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"전화 올 때 벨소리와 함께 진동"</string>
@@ -2451,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"알림 수신기가 설치되지 않았습니다."</string>
     <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">"조건을 제공하는 앱이 없음"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d개 앱에서 조건을 제공합니다.</item>
-      <item quantity="one">%d개 앱에서 조건을 제공합니다.</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="loading_notification_apps" msgid="5031818677010335895">"앱 로드 중..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"모두 차단"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"이 앱의 알림 표시 안함"</string>
@@ -2473,17 +2499,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"규칙 이름"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"규칙 추가"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"규칙 삭제"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\'<xliff:g id="RULE">%1$s</xliff:g>\' 규칙을 삭제하시겠습니까?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"삭제"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"규칙 유형"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"알 수 없음"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"규칙 설정"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"규칙 예약"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"규칙을 찾을 수 없습니다."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"낮"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"없음"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"매일"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"사용 안함"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>~<xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>부터 <xliff:g id="END">%2$s</xliff:g>까지"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"통화"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"메시지"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"통화/메시지 발신자"</string>
@@ -2493,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"알람"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"알림"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"이벤트"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"선택한 발신자"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"반복 발신자"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"<xliff:g id="MINUTES">%d</xliff:g>분 이내에 같은 사람이 다시 전화를 걸면 통화를 허용합니다."</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> 다음 날"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"언제 알림을 받으시겠습니까?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"기간"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"무제한"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>분</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>분</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>시간</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>시간</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"무제한으로 중요 알림만 허용 모드로 변경"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>까지 <xliff:g id="DURATION">%1$d</xliff:g>분 동안 중요 알림만 허용 모드로 변경</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>까지 1분 동안 중요 알림만 허용 모드로 변경</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g>시간 동안 중요 알림만 허용 모드로 변경(<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>까지)</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>까지 1시간 동안 중요 알림만 허용 모드로 변경</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"무제한으로 알람만 수신 모드로 변경"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g>분 동안 알람만 수신 모드로 변경(<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>까지)</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>까지 1분 동안 알람만 수신 모드로 변경</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>까지 <xliff:g id="DURATION">%1$d</xliff:g>시간 동안 알람만 수신 모드로 변경</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>까지 1시간 동안 알람만 수신 모드로 변경</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"무제한으로 방해 금지 모드로 변경"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g>분 동안 방해 금지 모드로 변경(<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>까지)</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>까지 1분 동안 방해 금지 모드로 변경</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>까지 <xliff:g id="DURATION">%1$d</xliff:g>시간 동안 방해 금지 모드로 변경</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>까지 1시간 동안 방해 금지 모드로 변경</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"항상 알림 모드로 변경"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"계속"</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>
@@ -2566,7 +2659,10 @@
       <item quantity="other">권한 <xliff:g id="COUNT_1">%d</xliff:g>개 부여받음</item>
       <item quantity="one">권한 <xliff:g id="COUNT_0">%d</xliff:g>개 부여받음</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other">권한 <xliff:g id="COUNT_3">%d</xliff:g>개 중 <xliff:g id="COUNT_2">%d</xliff:g>개가 부여됨</item>
+      <item quantity="one">권한 <xliff:g id="COUNT_1">%d</xliff:g>개 중 <xliff:g id="COUNT_0">%d</xliff:g>개가 부여됨</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"일부 기본값이 설정되었습니다."</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"기본값이 설정되지 않았습니다."</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"모든 앱"</string>
@@ -2577,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"최우선"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"중요"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"도메인 URL이 있는 앱"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"모든 앱의 환경설정을 기본값으로 초기화합니다."</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"시스템 앱과 다운로드한 앱을 포함하여 <xliff:g id="COUNT">%d</xliff:g>개의 앱이 설치되었습니다."</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"관리자가 사용 중지함"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"고급"</string>
     <string name="unknown_app" msgid="5275921288718717656">"알 수 없는 앱"</string>
     <string name="choose_profile" msgid="8229363046053568878">"프로필 선택"</string>
@@ -2586,11 +2681,18 @@
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g>개 앱 추가 액세스 허용됨"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g>개 앱 허용됨"</string>
     <string name="domain_urls_title" msgid="8735310976048599572">"도메인 URL"</string>
-    <string name="domain_urls_summary_none" msgid="3517494281628717719">"도메인 URL을 열지 않음"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"도메인 URL 열지 않음"</string>
     <string name="domain_urls_summary_one" msgid="3804994599497120956">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' 열기"</string>
     <string name="domain_urls_summary_some" msgid="4859484048050301933">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' 및 관련 URL 열기"</string>
     <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g>개 앱에서 도메인 URL을 열 수 있습니다.</item>
       <item quantity="one">1개 앱에서 도메인 URL을 열 수 있습니다.</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"인식할 수 없습니다."</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"기본 앱"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"브라우저 앱"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"기본 브라우저 없음"</string>
+    <string name="default_app" msgid="6864503001385843060">"(기본)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-ky-rKG/arrays.xml b/res/values-ky-rKG/arrays.xml
index 3185191..ed49449 100644
--- a/res/values-ky-rKG/arrays.xml
+++ b/res/values-ky-rKG/arrays.xml
@@ -433,11 +433,6 @@
     <item msgid="406385694840950802">"төмөн"</item>
     <item msgid="4212263919458209842">"опурталдуу"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Өчүрүү"</item>
-    <item msgid="5656544177755411222">"Чектелген үзгүлтүктөр"</item>
-    <item msgid="8735337502532332056">"Нөл үзгүлтүк"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Кадимки"</item>
     <item msgid="866544120205026771">"Орточо"</item>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index ae4e78e..ec8effe 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -425,12 +425,10 @@
     <skip />
     <!-- no translation found for cancel (6859253417269739139) -->
     <skip />
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ЖОККО ЧЫГАРУУ"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"УЛАНТУУ"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ООБА"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"ЖОК"</string>
-    <string name="forget" msgid="7267115980248732932">"УНУТУУ"</string>
+    <string name="forget" msgid="1400428660472591263">"Унутуу"</string>
+    <string name="save" msgid="879993180139353333">"Сактоо"</string>
+    <string name="done" msgid="6942539184162713160">"Даяр"</string>
     <!-- no translation found for settings_label (1626402585530130914) -->
     <skip />
     <!-- no translation found for settings_label_launcher (8344735489639482340) -->
@@ -570,7 +568,6 @@
     <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
     <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>
@@ -760,7 +757,7 @@
     <!-- no translation found for bluetooth_advanced_titlebar (2142159726881547669) -->
     <skip />
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetooth күйгүзүлгөндө түзмөгүңүз жакын арадагы башка Bluetooth түзмөктөрү менен байланыша алат."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"Жайгашкан жердин тактыгын жакшыртуу үчүн, Google кызматтары Bluetooth түзмөктөрүн Bluetooth өчүрүлгөн учурда да издейт. Аны LINK_BEGINскандоо жөндөөлөрүнөнLINK_END өзгөртө аласыз."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Жайгашкан жердин тактыгын жакшыртуу үчүн, колдонмолор жана кызматтар Bluetooth түзмөктөрүн Bluetooth өчүрүлгөн учурда да издейт. Аны <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>скандоо жөндөөлөрүнөн<xliff:g id="LINK_END_1">LINK_END</xliff:g> өзгөртө аласыз."</string>
     <!-- no translation found for bluetooth_connect_specific_profiles_title (6952214406025825164) -->
     <skip />
     <!-- no translation found for bluetooth_disconnect_a2dp_profile (3524648279150937177) -->
@@ -847,7 +844,7 @@
     <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" msgid="8382526568324164356">"Жайгашкан жердин тактыгын жакшыртуу үчүн, Google кызматтары Wi‑Fi тармактары Wi‑Fi өчүрүлгөн учурда да издейт. Аны LINK_BEGINскандоо жөндөөлөрүнөнLINK_END өзгөртө аласыз."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Жайгашкан жердин тактыгын жакшыртуу үчүн, колдонмолор жана кызматтар Wi‑Fi тармактарын Wi‑Fi өчүрүлгөн учурда да издейт. Аны <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>скандоо жөндөөлөрүнөн<xliff:g id="LINK_END_1">LINK_END</xliff:g> өзгөртө аласыз."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Экинчи көргөзбө"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Уктап жатканда Wi‑Fi иштей берсин"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Уктап жатканда Wi‑Fi күйүк"</string>
@@ -868,8 +865,6 @@
     <skip />
     <!-- no translation found for wifi_menu_advanced (7522252991919573664) -->
     <skip />
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Колдонмолорду көрсөт"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"WiFi күчүн көрсөтүү"</string>
     <!-- no translation found for wifi_menu_connect (4996220309848349408) -->
     <skip />
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Тармакты эстеп калуу"</string>
@@ -946,6 +941,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ТУТАШУУ"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Бул тармактын Интернетке мүмкүнчүлүгү жок. Баары бир ушул тармак колдонула берсинби?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Бул тармак үчүн экинчи сураба"</string>
     <!-- no translation found for wifi_connect (1076622875777072845) -->
     <skip />
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Түйүндгө байланышкан жок"</string>
@@ -1029,21 +1026,17 @@
     <!-- no translation found for wifi_tether_configure_ssid_default (8467525402622138547) -->
     <skip />
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi чалуу"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Чалуунун жеке жөндөөлөрү"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi чалуу режими"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi тандалган"</item>
     <item msgid="5267397515594230396">"Уюлдук тармак тандалган"</item>
-    <item msgid="3132912693346866895">"Wi-Fi гана"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wi-Fi чалуу күйгүзүлгөндө, телефонуңуз, жеке жөндөөлөрүңүзгө жана сигналдын күчтүүлүгүнө жараша, чалууларды Wi-Fi тармактары же операторуңуздун тармагы аркылуу багыттай алат. Бул өзгөчөлүктү күйгүзүүдөн мурун, акылары жана башка маалымат боюнча операторуңузга кайрылыңыз."</string>
     <string name="home_settings" msgid="212375129455718176">"Үйгө"</string>
     <!-- no translation found for display_settings_title (1708697328627382561) -->
     <skip />
@@ -1306,15 +1299,14 @@
     <skip />
     <!-- no translation found for memory_calculating_size (2188358544203768588) -->
     <skip />
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Колдонмолор (берилиштери жана медиа мазмундар)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Колдонмолор жана колдонмо дайындары"</string>
     <!-- no translation found for memory_media_usage (3738830697707880405) -->
     <skip />
     <!-- no translation found for memory_downloads_usage (3755173051677533027) -->
     <skip />
     <string name="memory_dcim_usage" msgid="558887013613822577">"Сүрөттөр, видеолор"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Аудио (музыка, рингтон, подкасттар, ж.б.)"</string>
-    <!-- no translation found for memory_media_misc_usage (235452944021647124) -->
-    <skip />
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Башка файлдар"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Кэштелген берилиштер"</string>
     <!-- no translation found for sd_eject (4988563376492400073) -->
     <skip />
@@ -1363,6 +1355,11 @@
     <skip />
     <string name="storage_low_title" msgid="1388569749716225155">"Сактагычта орун түгөнүп баратат"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Кээ бир системдик функциялар, мисалы, синхрондоо, туура эмес иштеши мүмкүн. Колдонмолор же медиа мазмундарды жок кылып орун бошотконго аракет кылыңыз."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Аталышын өзгөртүү"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Кошуу"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Чыгаруу"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Тазалоо жана форматтоо"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Ички эсттм ктр тазл ж-а формтт"</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>
@@ -1373,6 +1370,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"MIDI иштетилген колдонмолор USB аркылуу компьютериңиздеги MIDI программа менен иштөөсүнө жол ачат."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Башка колдонуучулар"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Түзмөктүн сактагычы"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Ташыма сактагыч"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> акысыз (Жалпысынан <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> кошулду"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g> кошулбай койду"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> коопсуз чыгарылды"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g> коопсуз чыгарылбай койду"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> форматталды"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> форматталбай койду"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Сактагыч аталышын өзгөртүү"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Форматталгандан кийин, бул <xliff:g id="NAME_0">^1</xliff:g> башка түзмөктөрдө колдонула берет. \n\nБул <xliff:g id="NAME_1">^1</xliff:g> ичиндеги дайындардын бардыгы тазаланат. Адегенде камдык көчүрмөсүн сактоону ойлонуштуруңуз. \n\n"<b>"Сүрөттөрдүн жана башка медиалардын камдык көчүрмөсүн сактаңыз"</b>" \nМедиа файлдарыңызды ушул түзмөктөгү кошумча сактагычка жылдырыңыз же аларды USB кабель менен компьютерге өткөрүңүз. \n\n"<b>"Колдонмолордун камдык көчүрмөсүн сактаңыз"</b>" \nУшул <xliff:g id="NAME_6">^1</xliff:g> ичинде сакталган колдонмолордун баары чыгарылып салынат жана алардын дайындары тазаланат. Бул колдонмолорду калтыруу үчүн, аларды ушул түзмөктөгү кошумча сактагычка жылдырыңыз."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Бул <xliff:g id="NAME_0">^1</xliff:g> чыгарылганда, анда сакталган колдонмолор иштебей калат жана андагы медиа файлдар ал кайра салынмайынча жеткиликтүү болбой калат."</b>" \n\nБул <xliff:g id="NAME_1">^1</xliff:g> ушул түзмөктө гана иштегидей болуп форматталган. Ал башка эч бир түзмөктө иштебейт."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> түзмөгүңүздү орнотуңуз"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Ташыма эстутум катары колдонуу"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Сүрөттөрдү жана башка медианы түзмөктөргө жылдыруу үчүн."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Ички эстутум катары колдонуу"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Ушул түзмөктөгү гана нерселерди, анын ичинде колдонмолор менен сүрөттөрдү сактоо үчүн. Анын башка түзмөктөр менен иштешинен коргогудай кылып форматтоо керектелет."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Ички эстутум катары форматтоо"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Бул, <xliff:g id="NAME_0">^1</xliff:g> коопсуз болуусу үчүн, анын форматталышын талап кылат. \n\nФорматтагандан кийин, бул <xliff:g id="NAME_1">^1</xliff:g> ушул түзмөктө гана иштейт. \n\n"<b>"Форматтоо учурда <xliff:g id="NAME_2">^1</xliff:g> ичинде сакталган бардык дайындарды тазалайт."</b>" Дайындарды жоготуунун алдын алуу үчүн, алардын камдык көчүрмөсүн сактоону ойлонуштуруңуз."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Тазалоо жана форматтоо"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> форматталууда…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"<xliff:g id="NAME">^1</xliff:g> форматталып жатканда, аны чыгарбаңыз."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Дайындарды жаңы сактагычка жылдр"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Сүрөттөрүңүз, файлдарыңыз жана колдонмо дайындарын ушул жаңы <xliff:g id="NAME">^1</xliff:g> ичине жылдырсаңыз болот. \n\nЖылдыруу болжол менен <xliff:g id="TIME">^2</xliff:g> созулат жана ички эстутумдан <xliff:g id="SIZE">^3</xliff:g> бошотот. Бул аткарылып жатканда айрым колдонмолор иштебей калат."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Азыр жылдыруу"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Кийинчерээк жылдыруу"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Дайындарды азыр жылдыруу"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Жылдыруу болжол менен <xliff:g id="TIME">^1</xliff:g> созулат. Ал ички эстутумдан <xliff:g id="SIZE">^2</xliff:g> бошотот."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Жылдыруу"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Дайындар жылдырылууда…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Жылдыруу учурунда: \n• <xliff:g id="NAME">^1</xliff:g> түзмөгүн чыгарбаңыз. \n• Айрым колдонмолор туура иштебей калат. \n• Түзмөктү кубаттап туруңуз."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> даяр"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Сиздин <xliff:g id="NAME">^1</xliff:g> сүрөттөр жана башка медиа менен колдонууга дапдаяр."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Сиздин жаңы <xliff:g id="NAME">^1</xliff:g> иштеп жатат. \n\nСүрөттөр, файлдар жана колдонмо дайындарын бул түзмөккө жылдыруу үчүн, Жөндөөлөр &gt; Сактагычка өтүңүз."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> колдонмосун жылдыруу"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<xliff:g id="APP">^1</xliff:g> жана анын дайындарын <xliff:g id="NAME_0">^2</xliff:g> ичине жылдыруу бир нече көз ирмемге гана созулат. Жылдыруу аяктамайынча колдонмону пайдалана албай каласыз. \n\nЖылдыруу учурунда <xliff:g id="NAME_1">^2</xliff:g> түзмөгүн чыгарбаңыз."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> жылдырылууда…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Жылдыруу учурунда <xliff:g id="NAME">^1</xliff:g> түзмөгүн чыгарбаңыз. \n\nУшул түзмөктөгү <xliff:g id="APP">^2</xliff:g> колдонмосу жылдыруу аяктагыча жеткиликтүү болбойт."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Жылдырууну жокко чыгаруу"</string>
     <!-- no translation found for battery_status_title (9159414319574976203) -->
     <skip />
     <!-- no translation found for battery_level_title (2965679202786873272) -->
@@ -1447,13 +1483,12 @@
     <skip />
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Абалкы APN тууралоолорун кайтаруу аяктады."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Тармак жөндөөлөрү баштапкы абалга келтирилди"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Бул тармакка байланыштуу жөндөөлөрдүн баарын заводдук демейки абалына келтирет, анын ичинде:\n\n"<li>"Wifi"</li>\n<li>"Мобилдик дайындар"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Бул тармак жөндөөлөрүнүн баарын баштапкы абалга келтирет, анын ичинде:\n\n"<li>"Wi‑Fi"</li>\n<li>"Уюлдук дайындар"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Жөндөөлөрдү баштапкы абалга келтирүү"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Тармак жөндөөлөрүнүн баары баштапкы абалга келтирилсинби? Бул аракетти артка кайтара албайсыз!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Тармак жөндөөлөрүнүн баары баштапкы абалга келтирилсинби? Бул аракетти кайра кайтара албайсыз!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Жөндөөлөрдү баштапкы абалга келтирүү"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Тармак жөндөөлөрүн баштапкы абалга келтирүүнү ырасташ үчүн, үлгү ачкычты тартышыңыз керек."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Баштапкы абалга келтирилсинби?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Тармак жөндөөлөрү баштапкы абалга келтирилди"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Тармак жөндөөлөрү баштапкы абалга келтирилди"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Түзмктү баштпкы абалга келтрүү"</string>
     <!-- no translation found for master_clear_title (5907939616087039756) -->
     <skip />
@@ -1476,10 +1511,9 @@
     <skip />
     <!-- no translation found for master_clear_button_text (7550632653343157971) -->
     <skip />
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Сиздин бардык жеке маалыматтарыңыз жана жүктөп алынган колдонмолоруңуз өчүрүлсүнбү? Сиз бул аракетти артка кайтара албайсыз!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Сиздин бардык жеке маалыматтарыңыз жана жүктөп алынган колдонмолоруңуз өчүрүлсүнбү? Сиз бул аракетти кайра кайтара албайсыз!"</string>
     <!-- no translation found for master_clear_final_button_text (5390908019019242910) -->
     <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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Бул колдонуучу демейки абалга келтире албайт"</string>
@@ -1503,8 +1537,6 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Бардык сакталган файлдар өчүрүлүп, SD-карта тазалансынбы? Сиз бул аракетти артка кайтара албайсыз!"</string>
     <!-- no translation found for media_format_final_button_text (4881713344315923175) -->
     <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) -->
     <skip />
     <!-- no translation found for call_settings_summary (7291195704801002886) -->
@@ -1560,7 +1592,7 @@
     <skip />
     <string name="network_settings_title" msgid="4871233236744292831">"Уюктук тармактар"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Тарифтик план"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Абалкы SMS колдонмо"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS колдонмосу"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS колдонмо алмашсынбы?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Сиздин <xliff:g id="CURRENT_APP">%2$s</xliff:g> SMS колдонмоңуз ордуна <xliff:g id="NEW_APP">%1$s</xliff:g> колдонулсунбу?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g> SMS колдонмосу болсунбу?"</string>
@@ -1592,6 +1624,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Жайгашкан жерди аныктоо үчүн GPS колдонуңуз"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Скандалууда…"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Скандалууда…"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi изделүүдө"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Колдонмолор менен кызматтарга Wi‑Fi өчүрүлгөн учурда да Wi‑Fi тармактарын издешине уруксат берүү менен жайгашкан жерди жакшыртыңыз"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth изделүүдө"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Тутум кызматтарына Bluetooth өчүрүлгөн учурда да Bluetooth түзмөктөрүн издешине уруксат берүү менен жайгашкан жерди жакшыртыңыз"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; уюкт тарм жайг жер"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Колдонмолорго Google жайгаштыруу м-н ордуңузду тактоого жол берүү. Жайгашуу берилиштери аноним. чогултулат ж-а Google\'га берилет."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Жайгашуу Wi‑Fi аркылуу аныкталды"</string>
@@ -1666,14 +1702,17 @@
     <skip />
     <!-- no translation found for lockpassword_pattern_set_toast (6867259621331406236) -->
     <skip />
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Улантуу үчүн түзмөгүңүздүн кулпуну ачуу үлгүсүн колдонуңуз."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Улантуу үчүн түзмөгүңүздүн PIN кодун киргизиңиз."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Улантуу үчүн түзмөгүңүздүн сырсөзүн киргизиңиз."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN код туура эмес"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Сырсөз туура эмес"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Үлгү туура эмес"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Түзмөктүн коопсуздугу"</string>
     <!-- no translation found for lockpattern_change_lock_pattern_label (5679630792003440352) -->
     <skip />
     <!-- no translation found for lockpattern_change_lock_pin_label (266707138486731661) -->
     <skip />
-    <!-- no translation found for lockpattern_need_to_unlock (757935356911054465) -->
-    <skip />
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Кайра бир аракет кылыңыз:"</string>
     <!-- no translation found for lockpattern_recording_intro_header (308287052221942814) -->
     <skip />
     <!-- no translation found for lockpattern_recording_intro_footer (1118579101409152113) -->
@@ -1707,10 +1746,7 @@
     <skip />
     <!-- no translation found for lockpattern_settings_help_how_to_record (2614673439060830433) -->
     <skip />
-    <!-- no translation found for lockpattern_too_many_failed_confirmation_attempts_header (819903817323783498) -->
-    <skip />
-    <!-- no translation found for lockpattern_too_many_failed_confirmation_attempts_footer (6759029360597122873) -->
-    <skip />
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Туура эмес аракеттер өтө көп болду. <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>
@@ -1790,8 +1826,7 @@
     <skip />
     <!-- no translation found for show_background_processes (2009840211972293429) -->
     <skip />
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Өзгөчө кырдаал колдонмосу"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Колдонмолордун тандоолорун жок кылуу"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Колдонмонун тандоолору жок кылынсынбы?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Бул кийинкилерди жок кылат:\n\n "<li>"Токтотулган колдонмолор"</li>\n" "<li>"Токтотулган колдонмолордун эскертмелери"</li>\n" "<li>"Иш-аракеттердин абалкы колдонмосу"</li>\n" "<li>"Колдонмолордун фондук берилиштерине чектөө"</li>\n" "<li>"Бардык уруксат чектөөлөрү"</li>\n\n" Колдонмонун берилиштери жоголбойт."</string>
@@ -2079,8 +2114,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Бардык Bluetooth HCI пакеттерин бир файлга жазуу"</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="select_logd_size_title" msgid="7433137108348553508">"Каттагыч буферлеринин өлчөмдөрү"</string>
@@ -2447,6 +2480,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 саат"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 күн"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Системди көргөзүү"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Тутумду жашыруу"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss колдонуу"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Статистика түрлөрү"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Фондогу"</string>
@@ -2586,7 +2620,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_explanation" msgid="7408921172253634829">"Сертификат сактагычты орнотууну ырастоо үчүн, үлгү ачкычты тартышыңыз керек."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Сертификат сактагычтын сырсөзүн териңиз."</string>
     <!-- no translation found for credentials_old_password (7553393815538684028) -->
@@ -3086,7 +3119,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Колдонуучу"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Чектелген профайл"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Жаңы колдонуучу кошосузбу?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Кошумча колдонуучуларды түзүү менен, бул түзмөктү башкалар менен бөлүшө аласыз. Ар бир колдонуучунун өзүнүн мейкиндиги болуп, аны алар өз колдонмолору, тушкагазы ж.б.у.с. нерселер менен өзгөчөлөштүрүп алышат. Мындан тышкары, колдонуучулардын Wi‑Fi сыяктуу жалпы түзмөк жөндөөлөрүн да конфигурациялоо мүмкүнчүлүгү бар.\n\nЖаңы колдонуучу кошулганда, ал өз мейкиндигин түзүп алышы керек.\n\nКолдонмолорду бир колдонуучу жаңыртканда, ал калган бардык колдонуучулар үчүн да жаңырат."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Кошумча колдонуучуларды түзүү менен, бул түзмөктү башкалар менен бөлүшө аласыз. Ар бир колдонуучунун өз мейкиндиги болуп, аны алар өз колдонмолору, тушкагазы ж.б.у.с. нерселер менен ыңгайлаштырып алышат. Колдонуучулар Wi‑Fi сыяктуу, ар кимге таасирин тийгизүүчү, түзмөк жөндөөлөрүн да тууралай алышат.\n\nЖаңы колдонуучу кошулганда, ал өз мейкиндигин түзүп алышы керек.\n\nКолдонмолорду бир колдонуучу калган бардык колдонуучулар үчүн да жаңырта алат."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Жаңы колдонуучу кошулганда, ал өз мейкиндигин түзүп алышы керек.\n\nКолдонмолорду бир колдонуучу жаңыртканда, ал калган бардык колдонуучулар үчүн да жаңырат."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Колдонуучуну азыр түзөлүбү?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Түзмөктү алып, өз мейкиндигин негиздей ала турган адамдын бар экенин текшериңиз"</string>
@@ -3266,10 +3299,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"чектөө чектөө чектелген"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"текст тууралоо туура добуш дирилдөө авт тил жаңсоо сунуштоо сунуш тема адепсиз сөз түрү эмодзи эларалык"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"демейки жеке жөндөөлөрдү баштапкы абалга келтирүү"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"туруктуу өзгөчө кырдаал колдонмосунун демейки абалы"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"колдонмолор колдонмо тутумун жүктөп алат"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"колдонмолордун уруксаттарынын коопсуздугу"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"колдонмонун демейкиси"</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>
@@ -3284,14 +3317,12 @@
     <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="6948120138640252732">"Үзгүлтүккө учртлрды бөгөттөө"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Артыкчылыктууга гана уруксат"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Автоматтык эрежелер"</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_alarms" msgid="7380265858042606857">"Ойготкучтарга гана уруксат"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Үзгүлтүккө учурабасын"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Артыкчылык гана"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Ойготкучтар гана"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Үзгүлтүксүз"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <!-- no translation found for ringtone_title (5379026328015343686) -->
     <skip />
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Эскертменин демейки шыңгыры"</string>
@@ -3326,15 +3357,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Эскертме алуучу колдонмолор орнотулган эмес."</string>
     <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">"Бир да колдонмо шарттарды түзбөйт"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d колдонмо шарттар менен камсыз кылат</item>
-      <item quantity="one">%d колдонмо шарттар менен камсыз кылат</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="loading_notification_apps" msgid="5031818677010335895">"Колдонмолор жүктөлүүдө…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Баарын бөгөттөө"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Бул колдонмодо эскертмелер эч качан көрсөтүлбөсүн"</string>
@@ -3348,17 +3370,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"Эреженин аталышы"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Эреже кошуу"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Эрежени жок кылуу"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<xliff:g id="RULE">%1$s</xliff:g>\" эрежеси жок кылынсынбы?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Жок кылуу"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Эреженин түрү"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Белгисиз"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Эрежени конфигурациялоо"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Эреженин иш тартибин түзүү"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Эреже табылган жок."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Күндөр"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Эч бири"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Күн сайын"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Эч качан"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> баштап <xliff:g id="END">%2$s</xliff:g> чейин"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Чалуулар"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Билдирүүлөр"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Төмөнкүдөн келген чалуулар/билдирүүлөр"</string>
@@ -3368,15 +3396,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Ойготкучтар"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Эстеткичтер"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Окуялар"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Тандалган чалуучулар"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Кайталанма чалуучулар"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Эгер бир эле киши <xliff:g id="MINUTES">%d</xliff:g> мүнөт ичинде экинчи жолу чалса, уруксат берилсин"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> кийинки күнү"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Качан үзгүлтүккө учуратса болот?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Канча убакытка?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Белгисиз"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> мүнөт</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> мүнөт</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> саат</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> саат</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Артыкчылыктуу эскертмелер гана режимине белгисиз убакытка өзгөртүү"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> чейин <xliff:g id="DURATION">%1$d</xliff:g> мүнөткө артыкчылыктуу эскертмелер гана режимине өзгөртүү</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> чейин бир мүнөткө артыкчылыктуу эскертмелер гана режимине өзгөртүү</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> саатка артыкчылыктуу эскертмелер гана режимине өзгөртүү (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> чейин)</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> чейин бир саатка артыкчылыктуу эскертмелер гана режимине өзгөртүү</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Ойготкучтар гана режимине белгисиз убакытка өзгөртүү"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> мүнөткө ойготкучтар гана режимине өзгөртүү (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> чейин)</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> чейин бир мүнөткө ойготкучтар гана режимине өзгөртүү</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> чейин <xliff:g id="DURATION">%1$d</xliff:g> саатка ойготкучтар гана режимине өзгөртүү</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> чейин бир саатка ойготкучтар гана режимине өзгөртүү</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Үзгүлтүккө учурабасын режимине белгисиз убакытка өзгөртүү"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> мүнөткө үзгүлтүккө учурабасын режимине өзгөртүү (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> чейин)</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> чейин бир мүнөткө үзгүлтүккө учурабасын режимине өзгөртүү</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> чейин <xliff:g id="DURATION">%1$d</xliff:g> саатка үзгүлтүккө учурабасын режимине өзгөртүү</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> чейин бир саатка үзгүлтүккө учурабасын режимине өзгөртүү</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Ар дайым үзгүлтүккө учуратуу режимине өзгөртүү"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"түбөлүк"</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>
@@ -3441,7 +3530,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> уруксат берилди</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> уруксат берилди</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_3">%d</xliff:g> ичинен <xliff:g id="COUNT_2">%d</xliff:g> уруксат берилди</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ичинен <xliff:g id="COUNT_0">%d</xliff:g> уруксат берилди</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Айрым демейкилер коюлду"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Демейкилер коюлган жок"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Бардык колдонмолор"</string>
@@ -3452,8 +3544,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Артыкчылыктуу"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Астейдил"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Домен URL\'дери менен"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Бардык колдонмолордогу жеке жөндөөлөрдү демейки абалга келтирүү"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> колдонмо орнотулду, анын ичинде тутумдук жана жүктөлүп алынган колдонмолор бар"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Администратор тарабынан өчүрүлгөн"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Өркүндөтүлгөн"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Белгисиз колдонмо"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Профиль тандоо"</string>
@@ -3468,4 +3559,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> колдонмо өз домен URL\'дерин ача алат</item>
       <item quantity="one">Бир колдонмо өз домен URL\'дерин ача алат</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Таанылган жок"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Демейки колдонмолор"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Серепчи колдонмосу"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Демейки серепчи жок"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Демейки)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-land/themes.xml b/res/values-land/themes.xml
new file mode 100644
index 0000000..8f407c6
--- /dev/null
+++ b/res/values-land/themes.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2015 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+    <style name="Theme.ConfirmDeviceCredentials" parent="Theme.SubSettings">
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowNoTitle">true</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/res/values-lo-rLA/arrays.xml b/res/values-lo-rLA/arrays.xml
index 03914af..21e1780 100644
--- a/res/values-lo-rLA/arrays.xml
+++ b/res/values-lo-rLA/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"ປຸ່ມ Push"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"ຕໍ່າ"</item>
     <item msgid="4212263919458209842">"ຈຳເປັນ"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"ປິດ"</item>
-    <item msgid="5656544177755411222">"​ມີ​ການ​ລົບ​ກວນ​ຈຳ​ກັດ"</item>
-    <item msgid="8735337502532332056">"ບໍ່​ມີ​ການ​ລົບ​ກວນ"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"ປົກ​ກະ​ຕິ"</item>
     <item msgid="866544120205026771">"ປານກາງ"</item>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index d780800..ad22b51 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD card"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"ການຕັ້ງຄ່າ Proxy"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ຕົກລົງ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"ບໍ່"</string>
-    <string name="forget" msgid="7267115980248732932">"​ລືມ"</string>
+    <string name="forget" msgid="1400428660472591263">"ລືມ"</string>
+    <string name="save" msgid="879993180139353333">"ບັນທຶກ"</string>
+    <string name="done" msgid="6942539184162713160">"ແລ້ວໆ"</string>
     <string name="settings_label" msgid="1626402585530130914">"ການຕັ້ງຄ່າ"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"ການຕັ້ງຄ່າ"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"ທາງລັດການຕັ້ງຄ່າ"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"ສຽບສາຍສາກຂອງທ່ານ ແລ້ວລອງໃໝ່ອີກຄັ້ງ."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"ບໍ່ໄດ້ຕັ້ງ PIN ຫຼືລະຫັດລັອກໜ້າຈໍ"</string>
     <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>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"ຂັ້ນສູງ"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth ລະດັບສູງ"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ເມື່ອ Bluetooth ຖືກ​ເປີດ​ນຳ​ໃຊ້, ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ຈະ​ສາ​ມາດ​ສື່​ສານ​ກັບ​ອຸ​ປະ​ກອນ Bluetooth ອື່ນ​ທີ່​ຢູ່​ໃກ້​ຄຽງ​ໄດ້."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"ເພື່ອ​ປັບ​ປຸງ​ຄວາມ​ຖືກ​ຕ້ອງ​ຂອງ​ທີ່​ຕັ້ງ, ການ​ບໍ​ລິ​ການ Google ຈະ​ສະ​ແກນ​ຫາ​ອຸ​ປະ​ກອນ Bluetooth, ແມ້​ວ່າ ເມື່ອ Bluetooth ປິດ. ທ່ານ​ສາ​ມາດ​ປ່ຽນ​ແປງ​ອັນ​ນີ້​ຢູ່​ໃນ LINK_BEGINການ​ຕັ້ງ​ຄ່າ​ການ​ສະ​ແກນLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"ເພື່ອ​ປັບ​ປຸງ​ຄວາມ​ຖືກ​ຕ້ອງ​ຂອງ​ທີ່​ຕັ້ງ, ແອັບ ແລະການ​ບໍ​ລິ​ການຈະ​ສະ​ແກນ​ຫາ​ອຸ​ປະ​ກອນ Bluetooth, ແມ້​ວ່າ ເມື່ອ Bluetooth ປິດ. ທ່ານ​ສາ​ມາດ​ປ່ຽນ​ແປງ​ອັນ​ນີ້​ຢູ່​ໃນ <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ການ​ຕັ້ງ​ຄ່າ​ການ​ສະ​ແກນ<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"ເຊື່ອມຕໍ່ກັບ..."</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>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"ເພື່ອ​ປັບ​ປຸງ​ຄວາມ​ຖືກ​ຕ້ອງ​ຂອງ​ທີ່​ຕັ້ງ, ການ​ບໍ​ລິ​ການ Google ຈະ​ສະ​ແກນ​ຫາເຄືອ​ຂ່າຍ Wi‑Fi, ແມ້​ວ່າ ເມື່ອ Wi‑Fi ປິດ. ທ່ານ​ສາ​ມາດ​ປ່ຽນ​ແປງ​ອັນ​ນີ້​ຢູ່​ໃນ LINK_BEGINການ​ຕັ້ງ​ຄ່າ​ການ​ສະ​ແກນLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"ເພື່ອ​ປັບ​ປຸງ​ຄວາມ​ຖືກ​ຕ້ອງ​ຂອງ​ທີ່​ຕັ້ງ, ແອັບ ແລະການ​ບໍ​ລິ​ການຈະ​ສະ​ແກນ​ຫາເຄືອ​ຂ່າຍ Wi‑Fi, ແມ້​ວ່າ​ເມື່ອ Wi‑Fi ປິດ. ທ່ານ​ສາ​ມາດ​ປ່ຽນ​ແປງ​ອັນ​ນີ້​ໄດ້​ຢູ່​ໃນ <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ການ​ຕັ້ງ​ຄ່າ​ການ​ສະ​ແກນ<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"ບໍ່ຕ້ອງສະແດງອີກ"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"ເປີດໃຊ້ WiFi ໃນຂະນະໜ້າຈໍປິດ"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"ເປີດ Wi‑Fi ໃນ​ລະ​ຫວ່າງ​ໜ້າ​ຈ​ໍ​ປິດ​ຢູ່"</string>
@@ -604,8 +601,6 @@
     <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_apps" msgid="6003687912727859577">"ສະ​ແດງ​ແອັບຯ"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"​ສະ​ແດງຄວາມ​ແຮງສັນ​ຍານ WiFi"</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>
@@ -663,6 +658,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ເຊື່ອມຕໍ່"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"ເຄືອ​ຂ່າຍ​ນີ້​ບໍ່​ມີ​ການ​ເຊື່ອມ​ຕໍ່​ກັບອິນ​ເຕີ​ເນັດ. ແນວ​ໃດ​ກໍ່​ໃຊ້​ເຄືອ​ຂ່າຍ​ນີ້​ບໍ?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"ຢ່າ​ຖາມ​ອີກ​ສຳ​ລັບ​ເຄືອ​ຂ່າຍ​ນີ້"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"ເຊື່ອມຕໍ່"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ລົ້ມເຫລວໃນການເຊື່ອມຕໍ່ເຄືອຂ່າຍ"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"ລືມ"</string>
@@ -734,12 +731,10 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"ເລືອກໃຊ້ Wi​-Fi ກ່ອນ"</item>
     <item msgid="5267397515594230396">"ເລືອກໃຊ້ເຊລລູລາກ່ອນ"</item>
-    <item msgid="3132912693346866895">"Wi​-Fi ເທົ່າ​ນັ້ນ"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"ເມື່ອ​ການ​ໂທ Wi-Fi ເປີດ, ໂທ​ລະ​ສັບ​ຂອງ​ທ່ານ​ສາ​ມາດ​ໃຫ້​ທິດ​ທາງ​ການ​ໂທ​ຜ່ານ​ເຄືອ​ຂ່າຍ Wi-Fi ຫຼື​ເຄືອ​ຂ່າຍ​ຂອງ​ຜູ້​ໃຫ້​ບໍ​ລິ​ການ​ຂອງ​ທ່ານ, ຂຶ້ນ​ກັບ​ຄວາມ​ມັກ​ຂອງ​ທ່ານ ແລະ​ສັນ​ຍານ​ໃດ​ແຮງ​ກ່ວາ. ກ່ອນ​ເປີດ​ຄຸນ​ສ​ົມ​ບັດ​ນີ້, ກວດ​ເບິ່ງ​ກັບ​ຜູ້​ໃຫ້​ບໍ​ລິ​ການ​ເຄືອ​ຂ່າຍ​ຂອງ​ທ່ານ​ໃນ​ເລື່ອງ​ຄ່າ​ບໍ​ລິ​ການ ແລະ​ລາຍ​ລະ​ອຽດ​ອື່ນໆ."</string>
     <string name="home_settings" msgid="212375129455718176">"ໜ້າຫຼັກ"</string>
@@ -913,12 +908,12 @@
     <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">"ແອັບຯ (ຂໍ້ມູນແອັບຯ &amp; ເນື້ອຫາສື່)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"ແອັບ &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_music_usage" msgid="1363785144783011606">"ສຽງ (ເພງ, ຣິງໂທນ, ພອດແຄສ ແລະອື່ນໆ...)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"ອື່ນໆ."</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"ໄຟລ໌ອື່ນ"</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 card"</string>
@@ -951,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"ກຳລັງຍົກເລີກການເຊື່ອມຕໍ່"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"ພື້ນທີ່ຈັດເກັບຂໍ້ມູນກຳລັງຈະໝົດ"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"ບາງຟັງຊັນຂອງລະບົບ ເຊັ່ນ: ການຊິ້ງຂໍ້ມູນ ອາດເຮັດວຽກໄດ້ບໍ່ປົກກະຕິ. ລອງລຶບຂໍ້ມູນທີ່ບໍ່ຈຳເປັນອອກ ເຊັ່ນ: ແອັບຯ ຫຼືເນື້ອຫາຕ່າງໆທີ່ບໍ່ໄດ້ໃຊ້ແລ້ວ."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"ປ່ຽນຊື່"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"ຕໍ່​ໃສ່"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"ເອົາ​ອອກ"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"ລຶບ &amp; ຟໍ​ແມັດ"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"ລຶບ &amp; ຟໍ​ແມັດ​ເປັນ​ບ່ອນ​ຈັດ​ເກັບ​ພາຍ​ໃນ"</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>
@@ -961,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"ໃຫ້ MIDI ເປີດ​ໃຊ້​ງານ​ແອັບ​ພ​ລິ​ເຄ​ຊັນເຮັດ​ວຽກ​ຢູ່​ເທິງ USB ກັບ​ຊອບ​ແວ MIDI ຢູ່​ເທິງ​ຄອມ​ພິວ​ເຕີ​ຂອງ​ທ່ານ."</string>
     <string name="storage_other_users" msgid="808708845102611856">"ຜູ່ໃຊ້ອື່ນໆ"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"ບ່ອນຈັດເກັບຂໍ້ມູນອຸປະກອນ"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"ໜ່ວຍຈັດເກັບຂໍ້ມູນທີ່ຖອດອອກໄດ້"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> ວ່າງ (ທັງ​ໝົດ <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> ຖືກ​ເອົາ​ຕໍ່​ໃສ່​ແລ້ວ"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"ບໍ່​ສາ​ມາດ​ຕໍ່​ໃສ່​ໄດ້ <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"ເອົາ <xliff:g id="NAME">%1$s</xliff:g> ອອກ​ໄປ​ຢ່າງ​ປອດ​ໄພ​ແລ້ວ"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"ບໍ່​ສາ​ມາດ​ເອົາ <xliff:g id="NAME">%1$s</xliff:g> ອອກ​ໄດ້​ຢ່າງ​ປອດ​ໄພ"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> ຖືກ​ຟໍ​ແມັດ​ແລ້ວ"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"ບໍ່​ສາ​ມາດ​ຟໍ​ແມ​ັດ <xliff:g id="NAME">%1$s</xliff:g> ໄດ້"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"ປ່ຽນ​ຊື່​ບ່ອນ​ຈັດ​ເກັບຂໍ້​ມູນ"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"ຫຼັງ​ຈາກ​ການ​ຟໍ​ແມັດ, ທ່ານ​ສາ​ມາດ​ໃຊ້ <xliff:g id="NAME_0">^1</xliff:g> ນີ້​​ໃນ​ອຸ​ປະ​ກອນ​ອື່ນ​ໄດ້. \n\nທຸກ​ຂໍ້​ມູນ​ຢູ່​ໃນ <xliff:g id="NAME_1">^1</xliff:g> ນີ້​ຈະ​ຖືກ​ລຶບ. ໃຫ້​ພິ​ຈາ​ລະ​ນາ​ສຳ​ຮອງໄວ້​ກ່ອນ. \n\n"<b>"ສຳ​ຮອງ​ຮູບ &amp; ມີ​ເດຍ​ອື່ນໆ"</b>" \nຍ້າຍ​ໄຟ​ລ໌​ມີ​ເດຍ​ໄປ​ໄສ່ບ່​ອນ​ຈັດ​ເກັບ​ຂໍ້​ມູນ​ອື່ນ​ເທິງ​ອຸ​ປະ​ກອນ​ນີ້, ຫຼື​ໂອນ​ພວກ​ມັນ​ໄປ​ຫາ​ຄອມ​ພິວ​ເຕີ​ດ້ວຍ​ການ​ໃຊ້​ສາຍ USB. \n\n"<b>"ສຳ​ຮອງ​ແອັບ"</b>" \nທຸກ​ແອັບ​ເກັບ​ໄວ້​ຢູ່​ໃນ <xliff:g id="NAME_6">^1</xliff:g> ນີ້​ຈະ​ຖືກ​ຖອນ​ຕິດ​ຕັ້ງ ແລະ​ຂໍ້​ມູນ​ຂອງ​ພວກ​ມັນ​ຈະ​ຖືກ​ລຶບ. ເພື່ອ​ຮັກ​ສາ​ແອັບ​ເຫຼົ່າ​ນີ້​ໄວ້, ຍ້າຍ​ພວກ​ມັນ​ໄປໃສ່​ບ່ອນ​ຈັດ​ເກັບ​ຂໍ້​ມູນ​ອື່ນ​ໃນ​ອຸ​ປະ​ກອນ​ນີ້."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"ເມື່ອ​ທ່ານ​ເອົາ <xliff:g id="NAME_0">^1</xliff:g> ນີ້​ອອກ, ແອັບ​ທີ່​ເກັບ​ໄວ້​ຢູ່​ໃນ​ຕົວ​ມັນ​ນັ້ນ​ຈະ​ຢຸດ​ເຮັດ​ວຽກ, ແລະ​ໄຟ​ລ໌​ມີ​ເດຍ​ທີ່​ເກັບ​ໄວ້​ຢູ່​ໃນ​ມັນ​ນັ້ນ​ຈະ​ບໍ່​ມີ​ໃຫ້​ຈົນ​ກ່​ວາ​ທີ່​ຈະ​ໃສ່​ມັນ​ເຂົ້າ​ໃໝ່."</b>" \n\n <xliff:g id="NAME_1">^1</xliff:g> ນີ້​ຖືກ​ຟໍ​ແມັດ​ໄປ ເພື່ອ​ໃຫ້​ເຮັດ​ວຽກ​ຢູ່​ໃນ​ອຸ​​ປະ​ກອນ​ນີ້​ເທົ່າ​ນັ້ນ. ມັນ​ບໍ່​ເຮັດ​ວຽກ​ຢູ່​ໃນ​ອັນ​ອື່ນ."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"ຕັ້ງ <xliff:g id="NAME">^1</xliff:g> ຂອງ​ທ່ານ"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"ໃຊ້​ເປັນບ່ອນ​ຈັດ​ເກັບຂໍ້ມູນແບບພົກພາ"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"ສຳ​ລັບ​ການຍ້າຍຮູບຖ່າຍ ແລະ​ມີ​ເດຍ​ອື່ນ​ລະ​ຫວ່າງ​ອຸ​ປະ​ກອນ."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"ໃຊ້​ເປັນບ່ອນ​ຈັດ​ເກັບ​ຂໍ້ມູນພາຍ​ໃນເຄື່ອງ"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"ສຳ​ລັບ​ເກັບ​ອັນ​ໃດ​ໜຶ່ງ​ຢູ່​ໃນ​ອຸ​ປະ​ກອນ​ນີ້​ເທົ່າ​ນັ້ນ, ລວມ​ທັງ​ແອັບ ແລະ​ຮູບ. ຈຳ​ເປັນ​ຕ້ອງ​ໄດ້​ຟໍ​ແມັດ ເພື່ອ​ປ້ອງ​ກັນ​ບໍ່​ໃຫ້​ມັນ​ໃຊ້​ກັບ​ອຸ​ປະ​ກອນ​ອື່ນ​ໄດ້."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"ຟໍ​ແມັດ​ເປັນ​ບ່ອນ​ຈັດ​ເກັບຂໍ້​ມູນ​ພາຍ​ໃນເຄື່ອງ"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"ອັນ​ນີ້​ຕ້ອງ​ການ​ໃຫ້​ຟໍ​ແມັດ <xliff:g id="NAME_0">^1</xliff:g> ເພື່ອ​ເຮັດ​ໃຫ້​ມັນ​ປອດ​ໄພ. \n\nຫຼັງ​ຈາກ​ການ​ຟໍ​ແມັດ, <xliff:g id="NAME_1">^1</xliff:g> ນີ້​ຈະ​ເຮັດ​ວຽກ​ຢູ່​ແຕ່​ໃນ​ອຸ​ປະ​ກອນ​ນີ້​ເທົ່າ​ນັ້ນ. \n\n"<b>"ການ​ຟໍ​ແມັດ​ລຶບ​ທຸກ​ຂໍ້​ມູນ​ທີ່​ປະ​ຈຸ​ບັນ​ໄດ້​ເກັບ​ໄວ້​ຢູ່​ໃນ <xliff:g id="NAME_2">^1</xliff:g>."</b>" ເພື່ອ​ຫຼີກ​ເວັ້ນ​ການ​ເສຍ​ຂໍ້​ມູນ, ໃຫ້ພິ​ຈາ​ລະ​ນາ​ສຳ​ຮອງ​ມັນ​ໄວ້."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"ລຶບ &amp; ຟໍ​ແມັດ"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"ກຳ​ລັງ​ຟໍ​ແມັດ <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"ຢ່າຖອດ <xliff:g id="NAME">^1</xliff:g> ອອກ ໃນ​ຂະ​ນະ​ທີ່​ກຳ​ລັງ​ຟໍ​ແມັດ."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ຍ້າຍ​ຂໍ້​ມູນ​ໄປ​ບ່ອນ​ຈັດ​ເກັບ​ໃໝ່"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"ທ່ານ​ສາ​ມາດ​ຍ້າຍ​ຮູບ, ໄຟ​ລ໌, ແລະ​ແອັບ​ຂອງ​ທ່ານ​ໄປ​ໃສ່ <xliff:g id="NAME">^1</xliff:g> ໃໝ່​ນີ້​ໄດ້. \n\nການ​ຍ້າຍ​ໃຊ້​ເວ​ລາ​ປະ​ມານ <xliff:g id="TIME">^2</xliff:g> ແລະ​ຈະ​​ເຮັດ​ໃຫ້​ຫວ່າງ <xliff:g id="SIZE">^3</xliff:g> ຢູ່​ໃນ​ບ່ອນ​ຈັດ​ເກັບ​ຂໍ້​ມູນ​ພາຍ​ໃນເຄື່ອງ. ບາງ​ແອັບ​ຈະ​ບໍ່​ເຮັດ​ວຽກ​ໃນ​ຂະ​ນະ​ທີ່​ມັນ​ດຳ​ເນີນ​ການ​ຢູ່."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"ຍ້າຍ​ດຽວ​ນີ້"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"ຍ້າຍ​ພາຍ​ຫຼັງ"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"ຍ້າຍ​ຂໍ້​ມູນ​ດຽວ​ນີ້"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"ການ​ຍ້າຍ​ໃຊ້​ເວ​ລາ​ປະ​ມານ <xliff:g id="TIME">^1</xliff:g>. ມັນ​ຈະ​ເຮັດ​ໃຫ້​ບ່ອນຈັດ​ເກັບ​ພາຍ​ໃນເຄື່ອງ <xliff:g id="SIZE">^2</xliff:g> ວ່າງ."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"ຍ້າຍ"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"ກຳ​ລັງ​ຍ້າຍ​ຂໍ້​ມູນ…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"ໃນ​ລະ​ຫວ່າງ​ການ​ຍ້າຍ: \n• ຢ່າ​ເອົາ <xliff:g id="NAME">^1</xliff:g> ອອກ. \n• ບາງ​ແອັບ​ຈະ​ບໍ່​ເຮັດ​ວຽກ​ໄດ້​ຢ່າງ​ຖືກ​ຕ້ອງ. \n• ໃຫ້​ສາກ​ອຸ​ປະ​ກອນ​ໄວ້."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> ພ້ອມ​ແລ້ວ"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> ຂອງ​ທ່ານ​ພ້ອມ​ໃຊ້​ກັບ​ຮູບ ແລະ​ມີ​ເດຍ​ອື່ນ​ແລ້ວ."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> ໃໝ່​ຂອງ​ທ່ານ​ກຳ​ລັງ​ເຮັດ​ວຽກ​ຢູ່. \n\nເພື່ອ​ຍ້າຍ​ຮູບ,ໄຟ​ລ໌ ແລະ​ຂໍ້​ມູນ​ແອັບ​ໄປ​ໃສ່​ອຸ​ປະ​ກອນ​ນີ້, ໄປ​ທີ່​ການ​ຕັ້ງ​ຄ່າ &gt; ບ່ອນ​ຈັດ​ເກັບ​ຂໍ້​ມູນ."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"ຍ້າຍ <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"ການ​ຍ້າຍ <xliff:g id="APP">^1</xliff:g> ແລະ​ຂໍ້​ມູນ​ຂອງ​ມັນ​ໃສ່ <xliff:g id="NAME_0">^2</xliff:g> ຈະ​ໃຊ້​ເວ​ລາ​ພຽງ​ບຶ​ດດຽວ. ທ່ານ​ຈະ​ບໍ່​ສາ​ມາດ​ໃຊ້​ແອັບ​ໄດ້​ຈົນ​ກ່​ວາ​ຈະ​ຍ້າຍ​ສຳ​ເລັດ. \n\nຢ່າ​ຍ້າຍ <xliff:g id="NAME_1">^2</xliff:g> ໃນ​ລະ​ຫວ່າງ​ການ​ຍ້າຍ."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"ກຳ​ລັງ​ຍ້າຍ <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"ຢ່າ​ເອົາ <xliff:g id="NAME">^1</xliff:g> ອອກ​ໄປ​ໃນ​ລະ​ຫວ່າງ​ການ​ຍ້າຍ. \n\nແອັບ <xliff:g id="APP">^2</xliff:g> ຢູ່​ໃນ​ອຸ​ປະ​ກອນ​ຈະ​ບໍ່​ມີ​ໃຫ້​ຈົນ​ກ່​ວາ​ສຳ​ເລັດ​ການ​ຍ້າຍ."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ຍົກ​ເລີກ​ການ​ຍ້າຍ"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"ສະຖານະແບັດເຕີຣີ"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ລະດັບແບັດເຕີຣີ"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1005,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"ຕັ້ງກັບຄືນໄປໃຊ້ຄ່າເລີ່ມຕົ້ນ"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ການຕັ້ງຄ່າ APN ເລີ່ມຕົ້ນຄືນໃໝ່ສຳເລັດແລ້ວ."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"ການຕັ້ງຄ່າເຄືອຂ່າຍຖືກຕັ້ງຄືນແລ້ວ"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"ນີ້ຈະຕັ້ງຄືນທຸກການຕັ້ງຄ່າທີ່ກ່ຽວຂ້ອງກັບການສ້າງເຄືອຂ່າຍເປັນຄ່າເດີມຂອງໂຮງງານ ລວມທັງ:\n\n"<li>"Wifi"</li>\n<li>"ຂໍ້ມູນມືຖື"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"ອັນ​ນີ້​ຈະ​ຕັ້ງ​ການ​ຕັ້ງ​ຄ່າ​ເຄືອ​ຂ່າຍ​ທັງ​ໝົດ​ຄືນ​ໃໝ່, ລວມ​ທັງ:\n\n"<li>"Wi‑Fi"</li>\n<li>"ຂໍ້​ມູນ​ໂທ​ລະ​ສັບ​ມື​ຖື"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"ຕັ້ງຄືນການຕັ້ງຄ່າ"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"ຕັ້ງຄືນທຸກການຕັ້ງຄ່າເຄືອຂ່າຍບໍ? ທ່ານບໍ່ສາມາດປີ້ນຄືນການດຳເນີນການນີ້ໄດ້!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"ຕັ້ງຄືນທຸກການຕັ້ງຄ່າເຄືອຂ່າຍບໍ? ທ່ານບໍ່ສາມາດບໍ່​ເຮັດການດຳເນີນການນີ້ໄດ້!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"ຕັ້ງຄືນການຕັ້ງຄ່າ"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"ທ່ານຈໍາເປັນຕ້ອງແຕ້ມແບບຮູບປົດລັອກຂອງທ່ານເພື່ອຢືນຢັນການຕັ້ງຄືນການຕັ້ງຄ່າເຄືອຂ່າຍ."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"ຕັ້ງຄືນບໍ?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"ການຕັ້ງຄ່າເຄືອຂ່າຍຖືກຕັ້ງຄືນແລ້ວ"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"​ການ​ຕັ້ງ​ຄ່າ​ເຄືອ​ຂ່າຍ​ຖືກຕັ້ງ​ຄ່າ​ຄືນ​ໃໝ່​ແລ້ວ."</string>
     <string name="device_reset_title" msgid="2384019005638768076">"​ຣີ​ເຊັດ​ອຸ​ປະ​ກອນ"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"ຣີເຊັດຄ່າຈາກໂຮງງານ"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ນີ້ຈະເປັນການລຶບຂໍ້ມູນທັງໝົດຈາກ "<b>"ໜ່ວຍຄວາມຈຳພາຍໃນ"</b>" ຂອງແທັບເລັດທ່ານ, ຮວມເຖິງ:\n\n"<li>"ບັນຊີ Google ຂອງທ່ານ"</li>\n<li>"ຂໍ້ມູນລະບົບ ແລະແອັບພລິເຄຊັນ ແລະການຕັ້ງຄ່າ"</li>\n<li>"ແອັບຯທີ່ດາວໂຫລດມາ"</li></string>
@@ -1027,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"ລຶບຂໍ້ມູນທັງໝົດໃນ SD card ເຊັ່ນ: ເພງ ແລະຮູບພາບ"</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="1062841478823409667">"​ລຶບ​ຂໍ້​ມູນ​ສ່ວນ​ໂຕ ແລະ​ແອັບທີ່​ດາວ​ໂຫລດ​ມາ​ທັງໝົດ​ບໍ? ທ່ານ​ຈະ​ບໍ່​ສາມາດບໍ່​ເຮັດ​ການ​ກະ​ທຳ​ນີ້ໄດ້​ອີກ!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ລຶບທຸກສິ່ງທຸກຢ່າງ"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"ຜູ່​ໃຊ້​ນີ້​ບໍ່​ສາ​ມາດ​ຣີ​ເຊັດ​ຄ່າ​ໂຮງ​ງານ​​ໄດ້"</string>
@@ -1046,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"ຕັ້ງຄ່າຂໍ້ຄວາມສຽງ, ການໂອນສາຍ, ສາຍຊ້ອນ, ID ຜູ່ໂທ"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"ການປ່ອຍສັນຍານຜ່ານ USB"</string>
@@ -1079,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"ຊ່ວຍເຫຼືອ"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"ເຄືອ​ຂ່າຍ​ມື​ຖື"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"ແພັກເກດມືຖື"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"ແອັບຯ SMS ເລີ່ມຕົ້ນ"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"ປ່ຽນແອັບຯສົ່ງ SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"ໃຊ້ <xliff:g id="NEW_APP">%1$s</xliff:g> ແທນ <xliff:g id="CURRENT_APP">%2$s</xliff:g> ໃຫ້ເປັນແອັບຯ SMS ຂອງທ່ານ?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"ໃຊ້ <xliff:g id="NEW_APP">%s</xliff:g> ເປັນແອັບຯ SMS ຂອງທ່ານ?"</string>
@@ -1110,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ໃຊ້ GPS ເພື່ອກຳ​ນົດ​ທີ່​ຕັ້ງຂອງທ່ານ"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"ກຳລັງສະແກນ"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"ກຳລັງສະແກນ"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"ການ​ສະ​ແກນ Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"ປັບ​ປຸງ​ທີ່​ຕັ້ງໂດຍ​ການ​ອະ​ນຸ​ຍາດ​ໃຫ້ແອັບ ແລະການ​ບໍ​ລິ​ການສະ​ແກນ​ຫາ​ເຄືອ​ຂ່າຍ Wi‑Fi ແມ້​ແຕ່​ເມື່ອ Wi‑Fi ປິດ"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ການ​ສະ​ແກນ Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"​ປັບ​ປຸງ​ທີ່​ຕັ້ງໂດຍ​ການ​ອະ​ນຸ​ຍາດ​ໃຫ້ການ​ບໍ​ລິ​ການລະ​ບົບ​ສະ​ແກນ​ຫາ​ອຸ​ປະ​ກອນ Bluetooth, ແມ້​ວ່າ ເມື່ອ Bluetooth ປິດ"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; ທີ່​ຢູ່​ເຄືອ​ຂ່າຍ​ມື​ຖື"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"ໃຫ້ແອັບຯຕ່າງໆໃຊ້ບໍລິການສະຖານທີ່ຂອງ Google ເພື່ອປະເມີນສະຖານທີ່ຂອງທ່ານໄດ້ໄວຂຶ້ນ. ຂໍ້ມູນສະຖານທີ່ທີ່ບໍ່ລະບຸໂຕຕົນຈະຖືກເກັບກຳ ແລະສົ່ງໃຫ້ Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"ສະຖານທີ່ທີ່ລະບຸໂດຍ Wi-Fi"</string>
@@ -1155,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"ຕັ້ງລະຫັດຜ່ານແລ້ວ"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"ຕັ້ງລະຫັດ PIN ແລ້ວ"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"ຕັ້ງຮູບແບບແລ້ວ"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"ໃຊ້​ຮູບ​ແບບ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ ເພື່ອ​ສືບ​ຕໍ່."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"ປ້ອນ PIN ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ ເພື່ອ​ສືບ​ຕໍ່."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"ປ້ອນ​ລະ​ຫັດ​ຜ່ານ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ ເພື່ອ​ສືບ​ຕໍ່."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN ​ບໍ່​ຖືກ​ຕ້ອງ"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"ລະຫັດຜ່ານ​ບໍ່ຖືກຕ້ອງ"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"ຮູບແບບປົດ​ລັອກ​ບໍ່​ຖືກ​ຕ້ອງ"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"ຄວາມປອດໄພຂອງອຸປະກອນ"</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_wrong" msgid="4694973540770105678">"ລອງໃໝ່ອີກຄັ້ງ:"</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>
@@ -1181,8 +1224,7 @@
     <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" msgid="6909161623701848863">"ມີ​ຄວາມ​ພະ​ຍາ​ຍາມ​ບໍ່​ຖືກ​ຕ້ອງ​ຫຼາຍ​ຄັ້ງ​ເກີນ​ໄປ. ລອງ​ໃໝ່​ອີກ​ໃນ <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>
@@ -1233,7 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"ຈັດຮຽງຕາມຂະໜາດ"</string>
     <string name="show_running_services" msgid="5736278767975544570">"ສະແດງບໍລິການທີ່ເຮັດວຽກຢູ່"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"ສະແດງໂປຣເຊສທີ່ເກັບຂໍ້ມູນໄວ້"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"ແອັບ​ສຸກ​ເສີນ​ມາດ​ຕະ​ຖານ"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"ແອັບ​ສຸກ​ເສີນ"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"ຕັ້ງຄ່າກຳນົດແອັບພລິເຄຊັນຄືນໃໝ່"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"ຣີເຊັດຄ່າກຳນົດຂອງແອັບຯຕ່າງໆ?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"ຂັ້ນຕອນນີ້ຈະຣີເຊັດຄ່າກຳນົດທັງໝົດຂອງ:\n\n "<li>"ແອັບຯທີ່ປິດການນຳໃຊ້"</li>\n" "<li>"ການແຈ້ງເຕືອນແອັບຯທີ່ປິດການນຳໃຊ້"</li>\n" "<li>"ແອັບພລິເຄຊັນເລີ່ມຕົ້ນສຳລັບການເຮັດວຽກຕ່າງໆ"</li>\n" "<li>"ການຈຳກັດຂໍ້ມູນພື້ນຫຼັງສຳລັບແອັບຯ"</li>\n" "<li>"ການຈຳກັດອະນຸຍາດໃດໆທີ່ຕັ້ງໄວ້"</li>\n\n" ຂໍ້ມູນແອັບຯໃດໆທີ່ມີຢູ່ຈະຍັງຄົງຢູ່ຄືເກົ່າ."</string>
@@ -1437,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ເກັບກຳທຸກແພັກເກັດໃນໄຟລ໌ bluetooth HCI"</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="select_logd_size_title" msgid="7433137108348553508">"ຂະ​ໜາດ​​ບັບ​ເຟີໂຕ​ລັອກ"</string>
@@ -1739,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 ຊົ່ວໂມງ"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 ມື້"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"ສະແດງລະບົບ"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"ເຊື່ອງ​ລະ​ບົບ"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"ໃຊ້ USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"ປະເພດສະຖິຕິ"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"ພື້ນຫຼັງ"</string>
@@ -1835,7 +1876,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_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>
@@ -2210,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"ຜູ່ໃຊ້"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"ໂປຣໄຟລ໌ທີ່ຖືກຈຳກັດ"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"ເພີ່ມ​ຜູ່​ໃຊ້​ໃໝ່​ບໍ?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"ທ່ານ​ສາ​ມາດ​ແບ່ງ​ປັນ​ອຸ​ປະ​ກອນ​ນີ້​ໃຫ້​ຄົນ​ອື່ນ​ໃຊ້​ໄດ້​ໂດຍ​ການ​ສ້າງ​ຜູ່​ໃຊ້​ເພີ່ມ​ເຕີມ. ແຕ່​ລະ​ຜູ່​ໃຊ້​ຈະ​ມີ​ພື້ນ​ທີ່​ເກັບ​ຂໍ້​ມູນ​ຂອງ​ເຂົາ​ເຈົ້າ​ເອງ​ເຊິ່ງ​ພວກ​ເຂົາ​ຈະ​ສາ​ມາດ​ຈັດ​ລະ​ບຽບ​ແອັບຯ, ຮູບ​ພາບ​ພື້ນຫຼັງ ແລະ​ອື່ນໆ​ຂອງ​ເຂົາ​ເຈົ້າ​ໄດ້. ຜູ່​ໃຊ້​ຕ່າງໆ​ຍັງ​ຈະ​ສາ​ມາດ​ປັບ​ແຕ່ງ​ການ​ຕັ້ງ​ຄ່າ​ຂອງ​ອຸ​ປະ​ກອນ​ໄດ້​ ເຊັ່ນ: Wi‑Fi ເຊິ່ງ​ຈະ​ມີ​ຜົນ​ກັບ​ຜູ່​ໃຊ້​ທຸກ​ຄົນ.\n\nເມື່ອ​ທ່ານ​ເພີ່ມ​ຜູ່​ໃຊ້​ໃໝ່, ຜູ່​ໃຊ້​ນັ້ນ​ຈະ​ຕ້ອງ​ຕັ້ງ​ຄ່າ​ພື້ນ​ທີ່​ບ່ອນ​ຈັດ​ເກັບ​ຂໍ້​ມູນ​ຂອງ​ລາວ.\n\nຜູ່​ໃຊ້​ທຸກ​ຄົນ​ສາ​ມາດ​ອັບ​ເດດ​ແອັບຯ​ສຳ​ລັບ​ຜູ່​ໃຊ້​ຄົນ​ອື່ນ​ທັງ​ໝົດ​ໄດ້."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"ທ່ານ​ສາ​ມາດ​ແບ່ງ​ປັນ​ອຸ​ປະ​ກອນ​ນີ້​ໃຫ້​ຄົນ​ອື່ນ​ໃຊ້​ໄດ້​ໂດຍ​ການ​ສ້າງ​ຜູ້​ໃຊ້​ເພີ່ມ​ເຕີມ. ແຕ່​ລະ​ຜູ້​ໃຊ້​ຈະ​ມີ​ພື້ນ​ທີ່​ເກັບ​ຂໍ້​ມູນ​ຂອງ​ເຂົາ​ເຈົ້າ​ເອງ​ ເຊິ່ງ​ພວກ​ເຂົາ​ຈະ​ສາ​ມາດ​ຈັດ​ລະ​ບຽບ​ແອັບ, ຮູບ​ພາບ​ພື້ນຫຼັງ ແລະ​ອື່ນໆ​ຂອງ​ເຂົາ​ເຈົ້າ​ໄດ້. ຜູ້​ໃຊ້​ຕ່າງໆ​ຍັງ​ຈະ​ສາ​ມາດ​ປັບ​ແຕ່ງ​ການ​ຕັ້ງ​ຄ່າ​ຂອງ​ອຸ​ປະ​ກອນ​ໄດ້​ ເຊັ່ນ: Wi‑Fi ເຊິ່ງ​ຈະ​ມີ​ຜົນ​ກັບ​ຜູ້​ໃຊ້​ທຸກ​ຄົນ.\n\nເມື່ອ​ທ່ານ​ເພີ່ມ​ຜູ້ໃຊ້​ໃໝ່, ຜູ້​ໃຊ້​ນັ້ນ​ຈະ​ຕ້ອງ​ຕັ້ງ​ຄ່າ​ພື້ນ​ທີ່​ບ່ອນ​ຈັດ​ເກັບ​ຂໍ້​ມູນ​ຂອງ​ລາວ.\nຜູ້\n​ໃຊ້​ທຸກ​ຄົນ​ສາ​ມາດ​ອັບ​ເດດ​ແອັບສຳ​ລັບ​ຜູ້​ໃຊ້​ຄົນ​ອື່ນ​ທັງ​ໝົດ​ໄດ້."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"ເມື່ອ​ທ່ານ​ເພີ່ມ​ຜູ່​ໃຊ້​ໃໝ່, ຜູ່​ໃຊ້​ນັ້ນ​ຈະ​ຕ້ອງ​ຕັ້ງ​ຄ່າ​ພື້ນ​ທີ່​ບ່ອນ​ຈັດ​ເກັບ​ຂໍ້​ມູນ​ຂອງ​ລາວ.\n\nຜູ່​ໃຊ້​ທຸກ​ຄົນ​ສາ​ມາດ​ອັບ​ເດດ​ແອັບຯ​ສຳ​ລັບ​ຜູ່​ໃຊ້​ຄົນ​ອື່ນ​ທັງ​ໝົດ​ໄດ້."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"ຕັ້ງຄ່າຜູ່ໃຊ້ດຽວນີ້?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"ກວດ​ສອບ​ໃຫ້​ແນ່​ໃຈ​ວ່າ​ບຸກ​ຄົນ​ດັ່ງ​ກ່າວ​ສາ​ມາດ​ຮັບ​ອຸ​ປະ​ກອນ​ແລະ​ຕັ້ງ​ຄ່າ​ພື້ນ​ທີ່​ຂອງ​ພວກ​ເຂົາ​ໄດ້"</string>
@@ -2393,6 +2433,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"ຄ່າເລີ່ມຕົ້ນຂອງແອັບ​ນໍ້າກ້ອນ​ສຸກ​ເສີນ"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"ດາວ​ໂຫຼດ​ແອັບ ລະ​ບົບ​ແອັບ​ພ​ລິ​ເຄ​ຊັນ"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"ຄວາມ​ປອດ​ໄພ​ການ​ອະ​ນຸ​ຍາດ​ແອັບ"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"ມາດ​ຕະ​ຖານ​ແອັບ"</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>
@@ -2407,14 +2448,12 @@
     <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="6948120138640252732">"ບ​ລັອກ​ການ​ລົບ​ກວນ"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ບຸ​ລິ​ມະ​ສິດ​ເທົ່າ​ນັ້ນ​ທີ່​ອະ​ນຸ​ຍາດ"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ກົດ​ລະ​ບຽບ​ອັດ​ຕະ​ໂນ​ມັດ"</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_alarms" msgid="7380265858042606857">"ອະ​ນຸ​ຍາດ​ໂມງ​ປຸກ​ເທົ່າ​ນັ້ນ"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"ບໍ່​ອະນຸຍາດ​ໃຫ້​ມີ​ການ​ລົບກວນ​ເລີຍ"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"ບຸ​ລິ​ມະ​ສິດເທົ່າ​ນັ້ນ"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"ໂມງ​ປຸກ​ເທົ່າ​ນັ້ນ"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"ບໍ່​ມີ​ການ​ລົບກວນ"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ຣິງໂທນໂທລະສັບ"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"​ຣິງ​ໂທນ​ແຈ້ງ​ເຕືອນ​ເລີ່ມ​ຕົ້ນ"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ສັ່ນ​ເຕືອນ​ເມື່ອ​ມີ​ການ​ໂທ​ເຂົ້າ"</string>
@@ -2447,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"ບໍ່ໄດ້ຕິດຕັ້ງໂຕຟັງການແຈ້ງເຕືອນ."</string>
     <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">"ບໍ່​ມີ​ແອັບຯ​ລະ​ບຸ​ເງື່ອນ​ໄຂ"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d ແອັບໃຫ້ເງື່ອນໄຂ</item>
-      <item quantity="one">%d ແອັບໃຫ້ເງື່ອນໄຂ</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="loading_notification_apps" msgid="5031818677010335895">"​ກຳ​ລັງ​ໂຫລດ​ແອັບຯ..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"ບ​ລັອກ​ທັງ​ໝົດ"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ບໍ່​ຕ້ອງ​ສະ​ແດງ​ການ​ແຈ້ງ​ເຕືອນ​ຈາກ​ແອັບຯ​ນີ້"</string>
@@ -2469,17 +2499,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"ຊື່​ເງື່ອນ​ໄຂ"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"ຕື່ມເງື່ອນໄຂ"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"ລຶບ​ເງື່ອນ​ໄຂ"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"ລຶບ​ເງື່ອນ​ໄຂ \"<xliff:g id="RULE">%1$s</xliff:g>\" ບໍ?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"​ລຶບ"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"ປະ​ເພດກົດລະບຽບ"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"​ບໍ່​ຮູ້​ຈັກ"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"ກຳ​ນົດ​ຄ່າ​ກົດລະບຽບ"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"ກົດ​ການ​ກຳ​ນົດ​ເວ​ລາ"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"ບໍ່​ພົບ​ເງື່ອນ​ໄຂ."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"ວັນ"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"ບໍ່ມີ"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"ທຸກໆມື້"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"ບໍ່​ໃຊ້"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> ຫາ <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"​ການ​ໂທ"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"ຂໍ້​ຄວາມ"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"ໂທ​ລະ​ສັບ/ຂໍ້​ຄວາມ​ ຈາກ"</string>
@@ -2489,15 +2525,66 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"ໂມງປຸກ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"ການແຈ້ງເຕືອນ"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ກິດຈະກຳ"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ຜູ້​ໂທ​ທີ່​ເລືອກ​ໄວ້"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ຊ້ຳ​ຄືນ​ຜູ້​ໂທ"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"ຖ້າ​ຄົນ​ດຽວ​ກັນ​ໂທ​ເປັນ​ຄັ້ງ​ທີ​ສອງ​ພາຍ​ໃນ​ໄລ​ຍະ​ເວ​ລາ <xliff:g id="MINUTES">%d</xliff:g> ວິ​ນາ​ທີ, ອະ​ນຸ​ຍາດ​ໃຫ້​ມັນ​ໄດ້"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ວັນ​ຕໍ່​ໄປ"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"ການລົບກວນ"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"​ເມື່ອ​ມີ​ການ​ໂທ ຫຼື​ການ​ແຈ້ງ​ເຕືອນ​ເຂົ້າ​ມາ"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"ທ່ານ​ຢາກ​ຈະ​ໃຫ້​ຖືກ​ຂັດ​ຈັງ​ຫວະ​ເມື່ອ​ໃດ?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"ດົນ​ປານ​ໃດ?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"ອະນຸຍາດໃຫ້ລົບກວນໄດ້ຕະຫຼອດ"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"ປິດ,ທັງ​ໝົດ,ທຸກ​ຢ່າງ"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"ອະນຸຍາດ​ສະເພາະ​ການ​ລົບກວນ​ທີ່​ສຳຄັນ"</string>
+    <string name="zen_mode_option_voice_important_synonyms" msgid="6120004096615029102">"ສຳ​ຄັນ,ບຸ​ລິ​ມະ​ສິດ,ການ​ແຈ້ງ​ເຕືອນ​ບຸ​ລິ​ມະ​ສິດ"</string>
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"ອະ​ນຸ​ຍາດ​ໂມງ​ປຸກ​ເທົ່າ​ນັ້ນ"</string>
+    <string name="zen_mode_option_voice_alarms_synonyms" msgid="7463720676061371446">"ໂມງປຸກ"</string>
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"ບໍ່​ອະນຸຍາດ​ໃຫ້​ມີ​ການ​ລົບກວນ​ເລີຍ"</string>
+    <string name="zen_mode_option_voice_no_interruptions_synonyms" msgid="6196235656198436233">"ບໍ່​ມີ,ບໍ່​ມີ​ອັນ​ໃດ,ບໍ່​ມີ​ການ​ຂັດ​ຈັງ​ຫວະ"</string>
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"ຢ່າງ​ບໍ່​ມີ​ກຳນົດ"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ນາ​ທີ</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ນາ​ທີ</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ຊົ່ວ​ໂມງ</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ຊົ່ວ​ໂມງ</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"ປ່ຽນ​ເປັນ​ການ​ແຈ້ງ​ເຕືອນ​ບຸ​ລິ​ມະ​ສິດ​ເທົ່າ​ນັ້ນ​ໂດຍ​ບໍ່​ມີ​ກຳ​ນົດ"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">ປ່ຽນ​ເປັນ​ການ​ແຈ້ງ​ເຕືອນ​ບຸ​ລິ​ມະ​ສິດ​ເປັນ​ເວ​ລາ <xliff:g id="DURATION">%1$d</xliff:g> ນາ​ທີ​ເທົ່າ​ນັ້ນ​ຈົນ​ຮອດ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">ປ່ຽນ​ເປັນ​ການ​ແຈ້ງ​ເຕືອນ​ບຸ​ລິ​ມະ​ສິດ​ເປັນ​ເວ​ລາໜຶ່ງ​ນາ​ທີ​ເທົ່າ​ນັ້ນ​ຈົນ​ຮອດ <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">ປ່ຽນ​ເປັນ​ການ​ແຈ້ງ​ເຕືອນ​ບຸ​ລິ​ມະ​ສິດ​ເປັນ​ເວ​ລາ <xliff:g id="DURATION">%1$d</xliff:g> ຊົ່ວ​ໂມງ​ເທົ່າ​ນັ້ນ (ຈົນ​ຮອດ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">ປ່ຽນ​ເປັນ​ການ​ແຈ້ງ​ເຕືອນ​ບຸ​ລິ​ມະ​ສິດ​ເປັນ​ເວ​ລາໜຶ່ງ​ຊົ່ວ​ໂມງ​ເທົ່າ​ນັ້ນ​ຈົນ​ຮອດ <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"ປ່ຽນ​ເປັນ​ໂມງ​ປຸກ​ເທົ່າ​ນັ້ນ​ຢ່າງ​ບໍ່​ມີ​ກຳ​ນົດ"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">ປ່ຽນ​ເປັນ​ໂມງ​ປຸກ​ເປັນ​ເວ​ລາ <xliff:g id="DURATION">%1$d</xliff:g> ນາ​ທີເທົ່າ​ນັ້ນ (ຈົນ​ຮອດ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">ປ່ຽນ​ເປັນ​ໂມງ​ປຸກ​ເປັນ​ເວ​ລາໜຶ່ງ​ນາ​ທີ​​ເທົ່າ​ນັ້ນ​ຈົນ​ຮອດ <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">ປ່ຽນ​ເປັນ​ໂມງ​ປຸກ​ເປັນ​ເວ​ລາ <xliff:g id="DURATION">%1$d</xliff:g> ຊົ່ວ​ໂມງ​ເທົ່າ​ນັ້ນ​ຈົນ​ຮອດ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">ປ່ຽນ​ເປັນ​ໂມງ​ປຸກ​ເປັນ​ເວ​ລາ​ໜຶ່ງ​ຊົ່ວ​ໂມງ​ເທົ່ານັ້ນຈົນ​ຮອດ <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"ປ່ຽນ​ເປັນ​ຫ້າມ​ຂັດ​ຈັງ​ຫວະ​ໂດຍ​ບໍ່​ມີ​ກຳ​ນົດ"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">ປ່ຽນ​ເປັນ​ຫ້າມ​ຂັດ​ຈັງ​ຫວະ​ເປັນ​ເວ​ລາ <xliff:g id="DURATION">%1$d</xliff:g> ນາ​ທີ (ຈົນ​ຮອດ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">ປ່ຽນ​ເປັນ​ຫ້າມ​ຂັດ​ຈັງ​ຫວະ​ເປັນ​ເວ​ລາໜຶ່ງ​ນາ​ທີ​ຈົນ​ຮອດ <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">ປ່ຽນ​ເປັນ​ຫ້າມ​ຂັດ​ຈັງ​ຫວະ​ເປັນ​ເວ​ລາ <xliff:g id="DURATION">%1$d</xliff:g> ຊົ່ວ​ໂມງ​ຈົນ​ຮອດ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">ປ່ຽນ​ເປັນ​ຫ້າມ​ຂັດ​ຈັງ​ຫວະ​ເປັນ​ເວ​ລາໜຶ່ງ​ຊົ່ວ​ໂມງ​ຈົນ​ຮອດ <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"ປ່ຽນ​ເປັນ​ຂັດ​ຈັງ​ຫວະ​ທຸກ​ຄັ້ງ"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ຕະຫຼອດໄປ"</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>
@@ -2562,7 +2649,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ການ​ອະ​ນຸ​ຍາດ​ໃຫ້​ໄປ​ແລ້ວ</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ການ​ອະ​ນຸ​ຍາດ​ໃຫ້​ໄປ​ແລ້ວ</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> ໃນ <xliff:g id="COUNT_3">%d</xliff:g> ການ​ອະ​ນຸ​ຍາດ​ແມ່ນ​ໄດ້​ໃຫ້​ແລ້ວ</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ໃນ <xliff:g id="COUNT_1">%d</xliff:g> ການ​ອະ​ນຸ​ຍາດ​ແມ່ນ​ໄດ້​ໃຫ້​ແລ້ວ</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"ຕັ້ງ​ບາງ​ຄ່າ​ເລີ່ມ​ຕົ້ນ​ແລ້ວ"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"ບໍ່ໄດ້ຕັ້ງຄ່າເລີ່ມຕົ້ນເທື່ອ"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"ແອັບຯທັງໝົດ"</string>
@@ -2573,8 +2663,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ບູ​ລິ​ມະ​ສິດ"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"​ລະ​ອຽດ​​ອ່ອນ"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ກັບ URL ໂດ​ເມນ"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"ຕັ້ງ​ຄວາມ​ມັກ​ຄືນ​ໃໝ່​ທົ່ວ​ທຸກ​ແອັບ​ເປັນ​ຄ່າ​ມາດ​ຕະ​ຖານ"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> ແອັບ​ຖືກ​ຕິດ​ຕັ້ງ​ແລ້ວ, ລວມ​ທັງ​ລະ​ບົບ ແລະ​ແອັບ​ທີ່​ດາວ​ໂຫຼດ​ແລ້ວ"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"ຖືກ​ປິດ​ການ​ນຳ​ໃຊ້​ໂດຍ​ຄວບ​ຄຸມ​ລະ​ບົບ"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"​ຂັ້ນ​ສູງ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"ແອັບທີ່ບໍ່ຮູ້ຈັກ"</string>
     <string name="choose_profile" msgid="8229363046053568878">"ເລືອກ​ໂປ​ຣ​ໄຟ​ລ໌"</string>
@@ -2589,4 +2678,10 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ແອັບ​ສາ​ມາດ​ເປີດ URL ໂດ​ເມນ​ຂອງ​ມັນ​ໄດ້</item>
       <item quantity="one">ໜຶ່ງ​ແອັບ​ສາ​ມາດ​ເປີດ URL ໂດ​ເມນ​ຂອງ​ມັນ​ໄດ້</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"ບໍ່​ຮັບຮູ້"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"​ແອັບ​ມາດ​ຕະ​ຖານ"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"ແອັບ​ບ​ຣາວ​ເຊີ"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"ບໍ່​ມີ​ບ​ຣາວ​ເຊີ​ມາດ​ຕະ​ຖານ"</string>
+    <string name="default_app" msgid="6864503001385843060">"(ຄ່າເລີ່ມຕົ້ນ)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"ບ່ອນ​ຈັດ​ເກັບ​ແອັບ"</string>
 </resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index f93786b..3a62787 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Mygtuko paspaudimas"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"Medija"</item>
     <item msgid="7924928667052300589">"Įrenginys"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"apytikslė vietovė"</item>
+    <item msgid="5789673140227507995">"tiksli vietovė"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibruoti"</item>
+    <item msgid="3434165993711230924">"skaityti kontaktus"</item>
+    <item msgid="616161687718081936">"keisti kontaktus"</item>
+    <item msgid="7638002295329050091">"skaityti skambučių žurnalą"</item>
+    <item msgid="6546959730920410907">"keisti skambučių žurnalą"</item>
+    <item msgid="446877710771379667">"skaityti kalendorių"</item>
+    <item msgid="7674458294386319722">"keisti kalendorių"</item>
+    <item msgid="8281201165558093009">"„Wi-Fi“ žvalgymas"</item>
+    <item msgid="8694611243479480497">"pranešimas"</item>
+    <item msgid="7776439107987345446">"mobiliųjų telefonų žvalgymas"</item>
+    <item msgid="514615766544675057">"skambinti į telefoną"</item>
+    <item msgid="8181415497109310680">"skaityti SMS"</item>
+    <item msgid="6816551144382117307">"rašyti SMS"</item>
+    <item msgid="4600463921908905030">"gauti SMS"</item>
+    <item msgid="5958926493289432745">"gauti nepaprastosios padėties SMS"</item>
+    <item msgid="4945269495221089540">"gauti MMS"</item>
+    <item msgid="5570472453573929087">"gauti „WAP Push“ pranešimus"</item>
+    <item msgid="7125408150230860501">"siųsti SMS"</item>
+    <item msgid="7080337936612188061">"skaityti ICC SMS"</item>
+    <item msgid="587124103118495063">"rašyti ICC SMS"</item>
+    <item msgid="2320577158869025503">"keisti nustatymus"</item>
+    <item msgid="1545733463471924009">"piešti viršuje"</item>
+    <item msgid="3609046903962454582">"pasiekti pranešimus"</item>
+    <item msgid="4671646036128214513">"fotoaparatas"</item>
+    <item msgid="1097324338692486211">"įrašyti garso įrašą"</item>
+    <item msgid="5031552983987798163">"leisti garso įrašą"</item>
+    <item msgid="8374996688066472414">"skaityti iškarpinę"</item>
+    <item msgid="3045529469061083747">"keisti iškarpinę"</item>
+    <item msgid="5124443975763747838">"medijos mygtukai"</item>
+    <item msgid="4547883971364273343">"garso sutelktis"</item>
+    <item msgid="2603878814882344450">"pagrindinis garsumas"</item>
+    <item msgid="7136963238377062018">"balso garsumas"</item>
+    <item msgid="4270236897655923007">"skambučio garsumas"</item>
+    <item msgid="6325739889222559394">"medijos garsumas"</item>
+    <item msgid="5762123934816216821">"signalo garsumas"</item>
+    <item msgid="785049718065337473">"pranešimų garsumas"</item>
+    <item msgid="6700305533746877052">"„Bluetooth“ garsumas"</item>
+    <item msgid="2029227495214047094">"neužmigdyti"</item>
+    <item msgid="26109888160231211">"stebėti vietovę"</item>
+    <item msgid="5753382310468855812">"stebėti didelė galia vietovė"</item>
+    <item msgid="3356591542543137332">"gauti naudojimo statistiką"</item>
+    <item msgid="3073734345226842233">"nutildyti / įjungti mikrofono garsą"</item>
+    <item msgid="1148142988678569310">"projektuoti mediją"</item>
+    <item msgid="9130014005474445273">"suaktyvinti VPN"</item>
+    <item msgid="1165192162975045562">"Rašymo ekrano fonas"</item>
+    <item msgid="7129487923652967258">"pagalbinė struktūra"</item>
+    <item msgid="1069023208100114540">"pagalbinė ekrano kopija"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Vietovė"</item>
+    <item msgid="8677040780775113033">"Vietovė"</item>
+    <item msgid="1660743989948992916">"Vietovė"</item>
+    <item msgid="8791172739860195290">"Vibruoti"</item>
+    <item msgid="383413555642128046">"Skaityti kontaktus"</item>
+    <item msgid="3654594895269697313">"Keisti kontaktus"</item>
+    <item msgid="7928393476362362538">"Skaityti skambučių žurnalą"</item>
+    <item msgid="6248591205254641116">"Keisti skambučių žurnalą"</item>
+    <item msgid="6093344633066170692">"Skaityti kalendorių"</item>
+    <item msgid="1334886368750347692">"Keisti kalendorių"</item>
+    <item msgid="1638204101698708656">"Vietovė"</item>
+    <item msgid="2154671955760380322">"Paskelbti pranešimą"</item>
+    <item msgid="4282477730595931828">"Vietovė"</item>
+    <item msgid="4891423912898525905">"Skambinti į telefoną"</item>
+    <item msgid="2623604824935968113">"Skaityti SMS / MMS"</item>
+    <item msgid="4420177125221176306">"Rašyti SMS / MMS"</item>
+    <item msgid="3986142739951490025">"Gauti SMS / MMS"</item>
+    <item msgid="3984213795861739778">"Gauti SMS / MMS"</item>
+    <item msgid="3656243523752472788">"Gauti SMS / MMS"</item>
+    <item msgid="8105802370238551510">"Gauti SMS / MMS"</item>
+    <item msgid="1407766984645388488">"Siųsti SMS / MMS"</item>
+    <item msgid="3527273606643794973">"Skaityti SMS / MMS"</item>
+    <item msgid="4370895547001583812">"Rašyti SMS / MMS"</item>
+    <item msgid="4218544235221631789">"Keisti nustatymus"</item>
+    <item msgid="736541391767350377">"Piešti viršuje"</item>
+    <item msgid="5530815681721654194">"Pasiekti pranešimus"</item>
+    <item msgid="781213371706962767">"Fotoaparatas"</item>
+    <item msgid="1720492593061838172">"Įrašyti garso įrašą"</item>
+    <item msgid="3493046322001257041">"Leisti garso įrašą"</item>
+    <item msgid="136815868796597058">"Skaityti iškarpinę"</item>
+    <item msgid="5238692940326972503">"Keisti iškarpinę"</item>
+    <item msgid="5753789168376302997">"Medijos mygtukai"</item>
+    <item msgid="3265262911688671938">"Garso sutelktis"</item>
+    <item msgid="2098976479485046797">"Pagrindinis garsumas"</item>
+    <item msgid="5660213838861789350">"Balso garsumas"</item>
+    <item msgid="7983336752371254444">"Skambučio garsumas"</item>
+    <item msgid="7878027809189330917">"Medijos garsumas"</item>
+    <item msgid="7260546305036218513">"Signalo garsumas"</item>
+    <item msgid="9103719301075748925">"Pranešimo garsumas"</item>
+    <item msgid="7025966722295861512">"„Bluetooth“ garsumas"</item>
+    <item msgid="4665183401128289653">"Neužmigdyti"</item>
+    <item msgid="8584357129746649222">"Vietovė"</item>
+    <item msgid="7669257279311110599">"Vietovė"</item>
+    <item msgid="3459320345690097795">"Gauti naudojimo statistiką"</item>
+    <item msgid="1312534577834048535">"Nutildyti / įjungti mikrofono garsą"</item>
+    <item msgid="5906017727368097853">"Projektuoti mediją"</item>
+    <item msgid="2486614710846178542">"Suaktyvinti VPN"</item>
+    <item msgid="5586547561693629602">"Rašymo ekrano fonas"</item>
+    <item msgid="32794179825485062">"Pagalbinė struktūra"</item>
+    <item msgid="7872852746938272552">"Pagalbinė ekrano kopija"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Trumpas"</item>
     <item msgid="2560532955514699713">"Vidutinis"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"prasta"</item>
     <item msgid="4212263919458209842">"kritinė"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Išjungta"</item>
-    <item msgid="5656544177755411222">"Ribotos pertraukos"</item>
-    <item msgid="8735337502532332056">"Nėra pertraukų"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Įprasta"</item>
     <item msgid="866544120205026771">"Vidutinė"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 4e75aea..7a584e6 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -270,12 +270,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD kortelė"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Tarpinio serverio nustatymai"</string>
     <string name="cancel" msgid="6859253417269739139">"Atšaukti"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ATŠAUKTI"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"TĘSTI"</string>
     <string name="okay" msgid="1997666393121016642">"Gerai"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"TAIP"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NE"</string>
-    <string name="forget" msgid="7267115980248732932">"PAMIRŠTI"</string>
+    <string name="forget" msgid="1400428660472591263">"Pamiršti"</string>
+    <string name="save" msgid="879993180139353333">"Išsaugoti"</string>
+    <string name="done" msgid="6942539184162713160">"Atlikta"</string>
     <string name="settings_label" msgid="1626402585530130914">"Nustatymai"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Nustatymai"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Spartusis nustatymų klavišas"</string>
@@ -378,7 +376,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Įjunkite kroviklį į lizdą ir bandykite dar kartą."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nėra ekrano užrakto PIN kodo ar slaptažodžio"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Prieš pradėdami šifravimo procesą turite nustatyti ekrano užrakto PIN kodą arba slaptažodį."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Turite nupiešti atrakinimo piešinį, kad patvirtintumėte įrenginio šifravimą."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Užšifruoti?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Šifravimo operacijos anuliuoti negalima ir, jei ją pertrauksite, prarasite duomenis. Šifravimas trunka valandą ar ilgiau; jam vykstant planšetinis kompiuteris kelis kartus bus paleidžiamas iš naujo."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Šifravimo operacijos anuliuoti negalima ir, jei ją pertrauksite, prarasite duomenis. Šifravimas trunka valandą ar ilgiau; jam vykstant telefonas kelis kartus bus paleidžiamas iš naujo."</string>
@@ -423,8 +420,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Šablonas"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN kodas"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Slaptažodis"</string>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Kai nustatysite ekrano užraktą, taip pat galėsite nustatyti kontrolinį kodą skiltyje „Nustatymai &gt; Sauga“."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Išjungti ekrano užraktą"</string>
     <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>
@@ -538,8 +534,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Išplėst. nust."</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Išplėst. „Bluetooth“ nust."</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Kai „Bluetooth“ įj., įreng. gali užm. ryšį su kitais netoliese esančiais „Bluetooth“ įreng."</string>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Kad būtų galima patobulinti vietovės informacijos tikslumą, programos ir paslaugos nuskaitys „Bluetooth“ įrenginius, net kai „Bluetooth“ bus išjungtas. Tai galite pakeisti <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nuskaitymo nustatymuose<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Prijungti prie..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ bus atjungtas nuo medijos garso."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ bus atjungtas nuo laisvų rankų įrangos garso."</string>
@@ -605,8 +600,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Kad būtų galima patobulinti vietovės informacijos tikslumą, programos ir paslaugos nuskaitys „Wi‑Fi“ tinklus, net kai „Wi‑Fi“ bus išjungtas. Tai galite pakeisti <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nuskaitymo nustatymuose<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Daugiau neberodyti"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Išlaikyti „Wi-Fi“ įjungtą, kai veikia miego režimas"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"„Wi‑Fi“ įj. esant miego būsen."</string>
@@ -623,8 +617,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Tiesiog. „Wi-Fi“ r."</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Nuskaityti"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Išplėstinis"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Rodyti programas"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Rod. „Wi-Fi“ stipr."</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>
@@ -682,6 +674,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Prisijungti, kad būtų prijungta?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ reikia, kad pr. prie int. prieš pr. prie tinkl."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"PRIJUNGTI"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Šiame tinkle nėra interneto ryšio. Vis tiek naudoti šį tinklą?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Daugiau neklausti šiame tinkle"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Prijungti"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Jungiantis prie tinklo įvyko klaida."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Pamiršti"</string>
@@ -748,21 +742,17 @@
     <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> kilnojamasis „Wi-Fi“ viešosios interneto prieigos taškas"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"„AndroidHotspot“"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"„Wi-Fi“ skambinimas"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Skambinimo nuostata"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"„Wi-Fi“ skambinimo režimas"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Pageidautinas „Wi-Fi“ ryšys"</item>
     <item msgid="5267397515594230396">"Pageidautinas mobilusis ryšys"</item>
-    <item msgid="3132912693346866895">"Tik „Wi-Fi“"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Kai įjungtas skambinimas „Wi-Fi“ ryšiu, telefonas gali nukreipti skambučius per „Wi-Fi“ tinklus ar operatoriaus tinklą pagal jūsų nuostatas ir stipresnį signalą. Prieš įjungdami šią funkciją, pasikonsultuokite su operatoriumi dėl mokesčių ir kitos išsamios informacijos."</string>
     <string name="home_settings" msgid="212375129455718176">"Pagrindinis"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekranas"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Garsas"</string>
@@ -936,12 +926,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Pasiekiama (tik skaitoma)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Visa vieta"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Skaičiuojama..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Programos (programų duomenys ir medijos turinys)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Programos ir jų duomenys"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Medija"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Atsisiuntimai"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Paveikslėliai, vaizdo įrašai"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Garso įr. (muzika, skamb. tonai, tinklal. ir kt.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Įvairūs"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Kiti failai"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Talpykloje saugomi duomenys"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Atjung. bendrin. atmint."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Išimti SD kortelę"</string>
@@ -974,6 +964,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Vykdomas išėmimas"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Mažėja laisvos saugyklos vietos"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Kai kurios sistemos funkcijos, pvz., sinchronizavimas, gali neveikti tinkamai. Pabandykite atlaisvinti vietos ištrynę ar atsegę elementus, pvz., programas ar medijos turinį."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Pervardyti"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Įdėti"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Pašalinti"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Ištrinti ir formatuoti"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Ištr. ir form. kaip vid. atm."</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB kompiuterio jungtis"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB kompiuterio jungtis"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Prisijungti kaip"</string>
@@ -984,6 +979,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Programos, kuriose įgalintos MIDI funkcijos, gali veikti per USB su kompiuteryje įdiegta MIDI programine įranga."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Kiti naudotojai"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Įrenginio atmintis"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Keičiama atmintis"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> nemokamai (iš viso <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> įdėta"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Nepavyko įdėti <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> saugiai pašalinta"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Nepavyko saugiai pašalinti <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> suformatuotas"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Nepavyko suformatuoti <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Pervardyti atmintį"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Suformatavę šią <xliff:g id="NAME_0">^1</xliff:g> galite naudoti ją kituose įrenginiuose. \n\nVisi duomenys šioje <xliff:g id="NAME_1">^1</xliff:g> bus ištrinti. Pirmiausia apsvarstykite galimybę sukurti atsarginę kopiją. \n\n"<b>"Kurkite atsargines nuotraukų ir kitos medijos kopijas"</b>" \nPerkelkite medijos failus į alternatyvią atmintį šiame įrenginyje arba perkelkite juos į kompiuterį USB kabeliu. \n\n"<b>"Kurkite atsargines programų kopijas"</b>" \nVisos šioje <xliff:g id="NAME_6">^1</xliff:g> saugomos programos bus pašalintos, o jų duomenys bus ištrinti. Jei norite pasilikti šias programas, perkelkite jas į alternatyvią atmintį šiame įrenginyje."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Kai pašalinsite šią <xliff:g id="NAME_0">^1</xliff:g>, joje saugomos programos nebeveiks, o joje saugomi medijos failai nebus pasiekiami, ko ją vėl įdėsite."</b>" \n\nŠi <xliff:g id="NAME_1">^1</xliff:g> suformatuota veikti tik šiame įrenginyje. Ji neveiks kituose įrenginiuose."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Nustatykite <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Naudoti kaip perkeliamą atmintį"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Norint perkelti nuotraukas ir kitą mediją iš vieno įrenginio į kitą."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Naudoti kaip vidinę atmintį"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Norint bet ką saugoti tik šiame įrenginyje, įskaitant programas ir nuotraukas. Suformatavus neveiks kituose įrenginiuose."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatuoti kaip vidinę atminį"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Norint <xliff:g id="NAME_0">^1</xliff:g> saugiai naudoti, reikia ją formatuoti. \n\nSuformatavus š <xliff:g id="NAME_1">^1</xliff:g> veiks šiame įrenginyje. \n\n"<b>"Formatuojant ištrinami visi duomenys, kurie šiuo metu saugomi <xliff:g id="NAME_2">^1</xliff:g>."</b>" Kad neprarastumėte duomenų, apsvarstykite galimybę sukurti jų atsarginę kopiją."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Ištrinti ir formatuoti"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatuojama <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Nepašalinkite <xliff:g id="NAME">^1</xliff:g>, kol formatuojama."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Perkelti duom. į naują atmintį"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Galite perkelti nuotraukas, failus ir programų duomenis į šią naują <xliff:g id="NAME">^1</xliff:g>. \n\nPerkėlimas truks apie <xliff:g id="TIME">^2</xliff:g>, o perkėlus vidinėje atmintyje bus <xliff:g id="SIZE">^3</xliff:g> laisvos vietos. Vykdant kai kurios programos neveiks."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Perkelti dabar"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Perkelti vėliau"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Perkelti duomenis dabar"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Perkėlimas trunka apie <xliff:g id="TIME">^1</xliff:g>. Perkėlus vidinėje atmintyje bus <xliff:g id="SIZE">^2</xliff:g> laisvos vietos."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Perkelti"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Perkeliami duomenys…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Perkeliant: \n• Neperkelkite <xliff:g id="NAME">^1</xliff:g>. \n• Kai kurios programos tinkamai neveiks. \n• Įkraukite įrenginį."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> paruošta"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> nustatyta naudoti su nuotraukomis ir kita medija."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Nauja <xliff:g id="NAME">^1</xliff:g> veikia. \n\nKad perkeltumėte nuotraukas, failus ir programų duomenis į šį įrenginį, eikite į skiltį „Nustatymai“ &gt; „Atmintis“."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Perkelti programą <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Programos <xliff:g id="APP">^1</xliff:g> ir jos duomenų perkėlimas į <xliff:g id="NAME_0">^2</xliff:g> truks neilgai. Negalėsite naudoti programos, kol perkėlimas bus baigtas. \n\nKol perkeliama, nepašalinkite <xliff:g id="NAME_1">^2</xliff:g>."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Perkeliama programa <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Nepašalinkite <xliff:g id="NAME">^1</xliff:g>, kol perkeliama. \n\nPrograma <xliff:g id="APP">^2</xliff:g> šiame įrenginyje nebus pasiekiama, kol perkėlimas bus baigtas."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Atšaukti perkėlimą"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Akumuliatoriaus būsena"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Akumuliatoriaus lygis"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1028,13 +1062,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Nustatyti iš naujo į numatytuosius nustatymus"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Numatytųjų APN nustatymų nustatymas iš naujo baigtas."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Tinklo nustatymų nustatymas iš naujo"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Atlikus šį veiksmą visi susiję tinklo nustatymai bus iš naujo nustatyti į numatytuosius gamyklinius, įskaitant:\n\n"<li>"„Wi-Fi“;"</li>\n<li>"mobiliojo ryšio duomenis;"</li>\n<li>"„Bluetooth“."</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Bus ištrinti visi tinklo nustatymai, įskaitant:\n\n"<li>"„Wi‑Fi“"</li>\n<li>"korinio ryšio duomenis"</li>\n<li>"„Bluetooth“"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Nustatyti iš naujo"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Iš naujo nustatyti visus tinklo nustatymus? Šio veiksmo negalėsite atšaukti!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Iš naujo nustatyti visus tinklo nustatymus? Šio veiksmo negalėsite anuliuoti!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Nustatyti iš naujo"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Turėsite nubrėžti atrakinimo piešinį, kad galėtumėte patvirtinti tinklo nustatymų nustatymą iš naujo."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Nustatyti iš naujo?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Tinklo nustatymų nustatymas iš naujo"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Tinklo nustatymai nustatyti iš naujo"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Nustatyti įrenginį iš naujo"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Gamyklos duomenų nustatymas iš naujo"</string>
     <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>
@@ -1050,9 +1083,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Ištrinti visus SD kortelės duomenis, pvz., muzikos failus ar nuotraukas"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Iš naujo nustatyti planšetinį kompiuterį"</string>
     <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_desc" msgid="1062841478823409667">"Ištrinti visą asmeninę informaciją ir atsisiųstas programas? Šio veiksmo negalėsite anuliuoti!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Ištrinti viską"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Šis naudotojas negali atkurti gamyklinių nustatymų"</string>
@@ -1069,8 +1101,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Nustatyti balso paštą, skambučio peradresavimą, skambučio laukimą, skambintojo ID"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB susiejimas"</string>
@@ -1102,7 +1132,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pagalba"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Koriniai tinklai"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobiliojo ryšio planas"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Numatytoji SMS programa"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS programa"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Pakeisti SMS programą?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Naudoti „<xliff:g id="NEW_APP">%1$s</xliff:g>“ kaip SMS programą vietoj „<xliff:g id="CURRENT_APP">%2$s</xliff:g>“?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Naudoti „<xliff:g id="NEW_APP">%s</xliff:g>“ kaip SMS programą?"</string>
@@ -1133,6 +1163,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Nustatyti vietovę naudojant GPS"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Nuskaitymas"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Nuskaitymas"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"„Wi‑Fi“ nuskaitymas"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Patobulinkite vietovės informaciją leisdami programoms ir paslaugoms nuskaityti „Wi‑Fi“ tinklus, net kai „Wi‑Fi“ bus išjungtas"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"„Bluetooth“ nuskaitymas"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Patobulinkite vietovės informacijos tikslumą leisdami sistemos paslaugoms nuskaityti „Bluetooth“ įrenginius, net kai „Bluetooth“ bus išjungtas"</string>
     <string name="location_network_based" msgid="6010456018401296590">"„Wi‑Fi“ ir kor. tinkl. vietov."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Leisti programoms naud. „Google“ viet. pasl., kad viet. būtų nustatoma greičiau. Anonim. viet. duom. bus renk. ir siunč. „Google“."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Vietą nustatė „Wi-Fi“"</string>
@@ -1178,11 +1212,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Slaptažodis nustatytas"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN kodas nustatytas"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Modelis nustatytas"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Jei norite tęsti, naudokite įrenginio šabloną."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Jei norite tęsti, įveskite įrenginio PIN kodą."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Jei norite tęsti, įveskite įrenginio slaptažodį."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Netinkamas PIN kodas"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Netinkamas slaptažodis"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Netinkamas šablonas"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Įrenginio sauga"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Keisti atrakinimo modelį"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Pakeisti atrakinimo PIN kodą"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Patvirtinti išsaugotą modelį"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Bandykite dar kartą:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Nustatyti atrakinimo modelį"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Jei norite gauti pagalbos, paspauskite „Meniu“."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Baigę atleiskite pirštą"</string>
@@ -1204,8 +1242,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Nustatyti atrakinimo modelį"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Keisti atrakinimo modelį"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Kaip nustatyti atrakinimo modelį"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Per daug neteisingų bandymų!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Bandyti dar kartą po <xliff:g id="NUMBER">%d</xliff:g> sek."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Per daug klaidingų bandymų. Bandykite dar kartą po <xliff:g id="NUMBER">%d</xliff:g> sek."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Programa jūsų telefone neįdiegta."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Valdyti programas"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Tvarkykite ir pašalinkite įdiegtas programas"</string>
@@ -1256,8 +1293,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Rūšiuoti pagal dydį"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Rodyti vykdomas paslaugas"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Rodyti padėtus procesus"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Avarinė programa"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Iš naujo nustat. nuostat."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Iš naujo nust. nuostat.?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Bus iš naujo nustatytos visos toliau nurodytų objektų nuostatos:\n\n "<li>"Išjungtos programos"</li>\n" "<li>"Išjungtų programų pranešimai"</li>\n" "<li>"Numatytosios veiksmų programos"</li>\n" "<li>"Programų foninių duomenų apribojimai"</li>\n" "<li>"Visi leidimų apribojimai"</li>\n\n" Neprarasite jokių programų duomenų."</string>
@@ -1461,8 +1497,6 @@
     <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="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="select_logd_size_title" msgid="7433137108348553508">"Registruotuvo biuferio dydžiai"</string>
@@ -1763,6 +1797,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 val."</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 d."</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Rodyti sistemos procesus"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Slėpti sistemą"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Naudoti USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistikos tipas"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Fonas"</string>
@@ -1859,7 +1894,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Dabartinis slaptažodis:"</string>
@@ -2234,7 +2268,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Naudotojas"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Ribotas profilis"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Pridėti naują naudotoją?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Galite bendrinti šį įrenginį su kitais žmonėmis sukūrę papildomų naudotojų. Kiekvienam naudotojui suteikiama atskira erdvė, kurią jie gali tinkinti naudodami savo programas, ekrano foną ir kt. Be to, naudotojai gali koreguoti įrenginio nustatymus, pvz., „Wi‑Fi“, kurie taikomi visiems.\n\nKai pridedate naują naudotoją, šis asmuo turi nustatyti savo erdvę.\n\nBet kuris naudotojas gali atnaujinti visų kitų naudotojų programas."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Galite bendrinti šį įrenginį su kitais žmonėmis sukūrę papildomų naudotojų. Kiekvienam naudotojui suteikiama atskira erdvė, kurią jie gali tinkinti naudodami savo programas, ekrano foną ir kt. Be to, naudotojai gali koreguoti įrenginio nustatymus, pvz., „Wi‑Fi“, kurie taikomi visiems.\n\nKai pridedate naują naudotoją, šis asmuo turi nustatyti savo erdvę.\n\nBet kuris naudotojas gali atnaujinti visų kitų naudotojų programas."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Kai pridedate naują naudotoją, šis asmuo turi nustatyti savo erdvę.\n\nBet kuris naudotojas gali atnaujinti visų kitų naudotojų programas."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Nustatyti naudotoją dabar?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Įsitikinkite, kad asmuo gali paimti įrenginį ir nustatyti savo vietą"</string>
@@ -2414,10 +2448,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"apribojimas riboti apribota"</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_reset_apps" msgid="6420313678620788457">"nustatyti iš naujo nuostatos numatytosios"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"numatytoji kritiniu atveju naudotina programa"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"programos atsisiųsti programos sistema"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"programų leidimų sauga"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"programos numatytosios"</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>
@@ -2432,14 +2466,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Signalo garsumas"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Skambučio garsumas"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Pranešimo garsumas"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Netrukdyti"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Leidžiama tik pagal prioritetą"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatinės taisyklės"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Kai gaunami skambučiai ir 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_alarms" msgid="7380265858042606857">"Leisti tik signalus"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Nepertraukti"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Tik prioritetiniai"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Tik įspėjimai"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Jokių pertraukčių"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefono skambėjimo tonas"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Numatytasis pranešimo skambėjimo tonas"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Taip pat vibruoti, kai skamb."</string>
@@ -2474,17 +2506,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Neįdiegta pranešimų skaitymo priemonių."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Įgalinti „<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>“ galės skaityti visus sistemos ar įdiegtų programų skelbiamus pranešimus, kuriuose gali būti asmeninės informacijos, pavyzdžiui, kontaktų vardų ir jums atsiųstų pranešimų teksto. Ji taip pat galės atsisakyti šių pranešimų arba jose paliečiamų mygtukų veiksmų."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Sąlygų teikėjai"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nėra sąlygas pateikiančių programų"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="one">%d programa pateikia sąlygas</item>
-      <item quantity="few">%d programos pateikia sąlygas</item>
-      <item quantity="many">%d programos pateikia sąlygas</item>
-      <item quantity="other">%d programų pateikia sąlygas</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nėra įdiegta jokių sąlygų teikėjų."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Įgalinti „<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>“ galės pridėti išėjimo sąlygas prie režimo „Netrukdyti“."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Įkeliamos programos..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokuoti viską"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Niekada nerodyti iš šios programos gautų pranešimų"</string>
@@ -2498,17 +2519,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritetas"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Delikatus"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Taisyklės pavadinimas"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Pridėti taisyklę"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Ištrinti taisyklę"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Ištrinti taisyklę „<xliff:g id="RULE">%1$s</xliff:g>“?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Ištrinti"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Taisyklės tipas"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Nežinoma"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Konfigūruoti taisyklę"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Tvarkaraščio taisyklė"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Taisyklė nerasta."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dienos"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Nėra"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Kasdien"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Niekada"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="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>
@@ -2518,15 +2545,92 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Signalai"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Priminimai"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Įvykiai"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Pasirinkti skambintojai"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Pakartotinai skambinantys naudotojai"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Jei asmuo skambina antrą kartą per <xliff:g id="MINUTES">%d</xliff:g> min. laikotarpį, leisti skambutį"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automatiškai įjungti"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Niekada"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Kiekvieną naktį"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> kitą dieną"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Kada jus pertraukti?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Kiek laiko?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Neribotam laikui"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> minutė</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> minutės</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> minutės</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minučių</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> valanda</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> valandos</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> valandos</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> valandų</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Pakeisti tik į prioritetinius pranešimus neribotam laikui"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Pakeisti tik į prioritetinius pranešimus <xliff:g id="DURATION">%1$d</xliff:g> minutei iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Pakeisti tik į prioritetinius pranešimus <xliff:g id="DURATION">%1$d</xliff:g> minutėms iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Pakeisti tik į prioritetinius pranešimus <xliff:g id="DURATION">%1$d</xliff:g> minutės iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Pakeisti tik į prioritetinius pranešimus <xliff:g id="DURATION">%1$d</xliff:g> minučių iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Pakeisti tik į prioritetinius pranešimus <xliff:g id="DURATION">%1$d</xliff:g> valandai (iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">Pakeisti tik į prioritetinius pranešimus <xliff:g id="DURATION">%1$d</xliff:g> valandoms (iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="many">Pakeisti tik į prioritetinius pranešimus <xliff:g id="DURATION">%1$d</xliff:g> valandos (iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Pakeisti tik į prioritetinius pranešimus <xliff:g id="DURATION">%1$d</xliff:g> valandų (iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Pakeisti tik į signalus neribotam laikui"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">Pakeisti tik į signalus <xliff:g id="DURATION">%1$d</xliff:g> minutei (iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">Pakeisti tik į signalus <xliff:g id="DURATION">%1$d</xliff:g> minutėms (iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="many">Pakeisti tik į signalus <xliff:g id="DURATION">%1$d</xliff:g> minutės (iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Pakeisti tik į signalus <xliff:g id="DURATION">%1$d</xliff:g> minučių (iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="one">Pakeisti tik į signalus <xliff:g id="DURATION">%1$d</xliff:g> valandai iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Pakeisti tik į signalus <xliff:g id="DURATION">%1$d</xliff:g> valandoms iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Pakeisti tik į signalus <xliff:g id="DURATION">%1$d</xliff:g> valandos iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Pakeisti tik į signalus <xliff:g id="DURATION">%1$d</xliff:g> valandų iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Pakeisti į nepertraukimo nustatymą neribotam laikui"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Pakeisti į netrukdymo nustatymą <xliff:g id="DURATION">%1$d</xliff:g> minutei (iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">Pakeisti į netrukdymo nustatymą <xliff:g id="DURATION">%1$d</xliff:g> minutėms (iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="many">Pakeisti į netrukdymo nustatymą <xliff:g id="DURATION">%1$d</xliff:g> minutės (iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Pakeisti į netrukdymo nustatymą <xliff:g id="DURATION">%1$d</xliff:g> minučių (iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Pakeisti į netrukdymo nustatymą <xliff:g id="DURATION">%1$d</xliff:g> valandai iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Pakeisti į netrukdymo nustatymą <xliff:g id="DURATION">%1$d</xliff:g> valandoms iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Pakeisti į netrukdymo nustatymą <xliff:g id="DURATION">%1$d</xliff:g> valandos iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Pakeisti į netrukdymo nustatymą <xliff:g id="DURATION">%1$d</xliff:g> valandų iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Pakeisti į pertraukimo nustatymą visam laikui"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"visada"</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>
@@ -2593,7 +2697,12 @@
       <item quantity="many">Suteikta <xliff:g id="COUNT_1">%d</xliff:g> leidimo</item>
       <item quantity="other">Suteikta <xliff:g id="COUNT_1">%d</xliff:g> leidimų</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one">Suteiktas <xliff:g id="COUNT_2">%d</xliff:g> leidimas iš <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="few">Suteikti <xliff:g id="COUNT_2">%d</xliff:g> leidimai iš <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="many">Suteikta <xliff:g id="COUNT_2">%d</xliff:g> leidimo iš <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="other">Suteikta <xliff:g id="COUNT_2">%d</xliff:g> leidimų iš <xliff:g id="COUNT_3">%d</xliff:g></item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Nustatyti kai kurie numatytieji nustatymai"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Nenustatyta jokių numatytųjų nustatymų"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Visos programos"</string>
@@ -2604,8 +2713,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritetiniai"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Neskelbtini"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Su domeno URL"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Nustatyti iš naujo visų programų nuostatas į numatytąsias"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"Įdiegta programų: <xliff:g id="COUNT">%d</xliff:g> (įskaitant sistemos ir atsisiųstas programas)"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Išjungė administratorius"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Išplėstiniai"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nežinoma programa"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Profilio pasirinkimas"</string>
@@ -2622,4 +2730,11 @@
       <item quantity="many">Šio domeno URL nuorodas galima atidaryti naudojant <xliff:g id="COUNT">%d</xliff:g> programos</item>
       <item quantity="other">Šio domeno URL nuorodas galima atidaryti naudojant <xliff:g id="COUNT">%d</xliff:g> programų</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Neatpažintas"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Numatytosios programos"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Naršyklės programa"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Nėra numatytosios naršyklės"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Numatytoji)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index d4b1bab..a125675 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"Parole"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Spiedpoga"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"Multivide"</item>
     <item msgid="7924928667052300589">"Ierīce"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"aptuvena atrašanās vieta"</item>
+    <item msgid="5789673140227507995">"precīza atrašanās vieta"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibrozvans"</item>
+    <item msgid="3434165993711230924">"lasīt kontaktpersonas"</item>
+    <item msgid="616161687718081936">"mainīt kontaktpersonu informāciju"</item>
+    <item msgid="7638002295329050091">"nolasīt zvanu žurnālu"</item>
+    <item msgid="6546959730920410907">"modificēt zvanu žurnālu"</item>
+    <item msgid="446877710771379667">"lasīt kalendāru"</item>
+    <item msgid="7674458294386319722">"modificēt kalendāru"</item>
+    <item msgid="8281201165558093009">"Wi-Fi meklēšana"</item>
+    <item msgid="8694611243479480497">"paziņojums"</item>
+    <item msgid="7776439107987345446">"mobilā tālruņa meklēšana"</item>
+    <item msgid="514615766544675057">"zvanīt uz tālruņa numuru"</item>
+    <item msgid="8181415497109310680">"lasīt īsziņu"</item>
+    <item msgid="6816551144382117307">"rakstīt īsziņu"</item>
+    <item msgid="4600463921908905030">"saņemt īsziņu"</item>
+    <item msgid="5958926493289432745">"saņemt ārkārtas īsziņu"</item>
+    <item msgid="4945269495221089540">"saņemt multiziņu"</item>
+    <item msgid="5570472453573929087">"saņemt WAP push ziņojumu"</item>
+    <item msgid="7125408150230860501">"sūtīt īsziņu"</item>
+    <item msgid="7080337936612188061">"lasīt ICC īsziņu"</item>
+    <item msgid="587124103118495063">"rakstīt ICC īsziņu"</item>
+    <item msgid="2320577158869025503">"modificēt iestatījumus"</item>
+    <item msgid="1545733463471924009">"zīmēt augšdaļā"</item>
+    <item msgid="3609046903962454582">"piekļūt paziņojumiem"</item>
+    <item msgid="4671646036128214513">"kamera"</item>
+    <item msgid="1097324338692486211">"ierakstīt audio"</item>
+    <item msgid="5031552983987798163">"atskaņot audio"</item>
+    <item msgid="8374996688066472414">"lasīt starpliktuvi"</item>
+    <item msgid="3045529469061083747">"modificēt starpliktuvi"</item>
+    <item msgid="5124443975763747838">"multivides pogas"</item>
+    <item msgid="4547883971364273343">"audio uzsvars"</item>
+    <item msgid="2603878814882344450">"galvenais skaļums"</item>
+    <item msgid="7136963238377062018">"balss skaļums"</item>
+    <item msgid="4270236897655923007">"zvana skaļums"</item>
+    <item msgid="6325739889222559394">"multivides skaļums"</item>
+    <item msgid="5762123934816216821">"signāla skaļums"</item>
+    <item msgid="785049718065337473">"paziņojumu skaļums"</item>
+    <item msgid="6700305533746877052">"Bluetooth apjoms"</item>
+    <item msgid="2029227495214047094">"neļaut pāriet miega rež."</item>
+    <item msgid="26109888160231211">"pārraudzīt atrašanās vietu"</item>
+    <item msgid="5753382310468855812">"pārraudzīt lieljaudas atrašanās vietu"</item>
+    <item msgid="3356591542543137332">"iegūt lietojuma statistiku"</item>
+    <item msgid="3073734345226842233">"izslēgt/ieslēgt mikrofonu"</item>
+    <item msgid="1148142988678569310">"projicēt saturu"</item>
+    <item msgid="9130014005474445273">"aktivizēt VPN"</item>
+    <item msgid="1165192162975045562">"izveidot fona tapeti"</item>
+    <item msgid="7129487923652967258">"palīdzīga struktūra"</item>
+    <item msgid="1069023208100114540">"palīdzīgs ekrānuzņēmums"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Atrašanās vieta"</item>
+    <item msgid="8677040780775113033">"Atrašanās vieta"</item>
+    <item msgid="1660743989948992916">"Atrašanās vieta"</item>
+    <item msgid="8791172739860195290">"Vibrozvans"</item>
+    <item msgid="383413555642128046">"Lasīt kontaktpersonas"</item>
+    <item msgid="3654594895269697313">"Mainīt kontaktpersonu informāciju"</item>
+    <item msgid="7928393476362362538">"Nolasīt zvanu žurnālu"</item>
+    <item msgid="6248591205254641116">"Modificēt zvanu žurnālu"</item>
+    <item msgid="6093344633066170692">"Lasīt kalendāru"</item>
+    <item msgid="1334886368750347692">"Modificēt kalendāru"</item>
+    <item msgid="1638204101698708656">"Atrašanās vieta"</item>
+    <item msgid="2154671955760380322">"Publicēt paziņojumu"</item>
+    <item msgid="4282477730595931828">"Atrašanās vieta"</item>
+    <item msgid="4891423912898525905">"Zvanīt uz tālruņa numuru"</item>
+    <item msgid="2623604824935968113">"Lasīt īsziņu vai multiziņu"</item>
+    <item msgid="4420177125221176306">"Rakstīt īsziņu vai multiziņu"</item>
+    <item msgid="3986142739951490025">"Saņemt īsziņu vai multiziņu"</item>
+    <item msgid="3984213795861739778">"Saņemt īsziņu vai multiziņu"</item>
+    <item msgid="3656243523752472788">"Saņemt īsziņu vai multiziņu"</item>
+    <item msgid="8105802370238551510">"Saņemt īsziņu vai multiziņu"</item>
+    <item msgid="1407766984645388488">"Sūtīt īsziņu vai multiziņu"</item>
+    <item msgid="3527273606643794973">"Lasīt īsziņu vai multiziņu"</item>
+    <item msgid="4370895547001583812">"Rakstīt īsziņu vai multiziņu"</item>
+    <item msgid="4218544235221631789">"Modificēt iestatījumus"</item>
+    <item msgid="736541391767350377">"Zīmēt augšdaļā"</item>
+    <item msgid="5530815681721654194">"Piekļūt paziņojumiem"</item>
+    <item msgid="781213371706962767">"Kamera"</item>
+    <item msgid="1720492593061838172">"Ierakstīt audio"</item>
+    <item msgid="3493046322001257041">"Atskaņot audio"</item>
+    <item msgid="136815868796597058">"Lasīt starpliktuvi"</item>
+    <item msgid="5238692940326972503">"Modificēt starpliktuvi"</item>
+    <item msgid="5753789168376302997">"Multivides pogas"</item>
+    <item msgid="3265262911688671938">"Audio uzsvars"</item>
+    <item msgid="2098976479485046797">"Galvenais skaļums"</item>
+    <item msgid="5660213838861789350">"Balss skaļums"</item>
+    <item msgid="7983336752371254444">"Zvana skaļums"</item>
+    <item msgid="7878027809189330917">"Multivides skaļums"</item>
+    <item msgid="7260546305036218513">"Signāla skaļums"</item>
+    <item msgid="9103719301075748925">"Paziņojumu skaļums"</item>
+    <item msgid="7025966722295861512">"Bluetooth apjoms"</item>
+    <item msgid="4665183401128289653">"Neļaut pāriet miega rež."</item>
+    <item msgid="8584357129746649222">"Atrašanās vieta"</item>
+    <item msgid="7669257279311110599">"Atrašanās vieta"</item>
+    <item msgid="3459320345690097795">"Iegūt lietojuma statistiku"</item>
+    <item msgid="1312534577834048535">"Izslēgt/ieslēgt mikrofonu"</item>
+    <item msgid="5906017727368097853">"Projicēt saturu"</item>
+    <item msgid="2486614710846178542">"Aktivizēt VPN"</item>
+    <item msgid="5586547561693629602">"Izveidot fona tapeti"</item>
+    <item msgid="32794179825485062">"Palīdzīga struktūra"</item>
+    <item msgid="7872852746938272552">"Palīdzīgs ekrānuzņēmums"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Īss"</item>
     <item msgid="2560532955514699713">"Vidējs"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"zems"</item>
     <item msgid="4212263919458209842">"kritisks"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Izslēgts"</item>
-    <item msgid="5656544177755411222">"Ierobežoti pārtraukumi"</item>
-    <item msgid="8735337502532332056">"Nav pārtraukumu"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normāls"</item>
     <item msgid="866544120205026771">"Vidējs"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index bbd2853..0b0a582 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -269,12 +269,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD karte"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Starpniekservera iestatījumi"</string>
     <string name="cancel" msgid="6859253417269739139">"Atcelt"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ATCELT"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"TURPINĀT"</string>
     <string name="okay" msgid="1997666393121016642">"LABI"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"JĀ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NĒ"</string>
-    <string name="forget" msgid="7267115980248732932">"AIZMIRST"</string>
+    <string name="forget" msgid="1400428660472591263">"Aizmirst"</string>
+    <string name="save" msgid="879993180139353333">"Saglabāt"</string>
+    <string name="done" msgid="6942539184162713160">"Gatavs"</string>
     <string name="settings_label" msgid="1626402585530130914">"Iestatījumi"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Iestatījumi"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Saīsne Iestatījumi"</string>
@@ -376,7 +374,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Pievienojiet lādētāju un mēģiniet vēlreiz."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nav ekrāna bloķēšanas PIN vai paroles"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Lai varētu sākt šifrēšanu, ir jāiestata bloķēšanas ekrāna PIN vai parole."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Lai apstiprinātu ierīces šifrēšanu, norādiet grafisko atslēgu."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Vai veikt šifrēšanu?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Šifrēšanas darbība ir neatgriezeniska; pārtraucot šifrēšanu, dati tiks zaudēti. Šifrēšana ilgst vienu stundu vai ilgāk, un tās laikā planšetdators vairākas reizes tiks restartēts."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Šifrēšanas darbība ir neatgriezeniska; pārtraucot šifrēšanu, dati tiks zaudēti. Šifrēšana ilgst vienu stundu vai ilgāk, un tās laikā tālrunis vairākas reizes tiks restartēts."</string>
@@ -421,8 +418,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Shēma"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Parole"</string>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Kad būsiet iestatījis ekrāna bloķēšanu, varēsiet pievienot arī savu pirkstu nospiedumu sadaļā Iestatījumi &gt; Drošība."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Izslēgt ekrāna bloķēšanu"</string>
     <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>
@@ -530,8 +526,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Papildu iestatījumi"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth papildu iestatījumi"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Kad Bluetooth ir ieslēgts, ierīce var sazināties ar citām Bluetooth ierīcēm tuvumā."</string>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Lai uzlabotu atrašanās vietas noteikšanas precizitāti, lietotnēs un pakalpojumos tiks meklētas Bluetooth ierīces, pat ja Bluetooth savienojums ir izslēgts. Varat to mainīt <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>meklēšanas iestatījumos<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Savienot ar..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Ierīce <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tiks atvienota no datu nesēja audio."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Ierīce <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tiks atvienota no brīvroku audio."</string>
@@ -597,8 +592,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Lai uzlabotu atrašanās vietas noteikšanas precizitāti, lietotnēs un pakalpojumos tiks meklēti Wi-Fi tīkli, pat ja Wi-Fi savienojums ir izslēgts. Varat to mainīt <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>meklēšanas iestatījumos<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Vairs nerādīt"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Aktivizēt Wi-Fi arī miega režīmā"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi ieslēgts miega režīmā"</string>
@@ -615,8 +609,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skenēt"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Papildu"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Rādīt lietotnes"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Rādīt Wi-Fi signālu"</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>
@@ -674,6 +666,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Vai pierakstīties, lai izveidotu savienojumu?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> pieprasa pierakstīties tiešsaistē pirms savienošanas ar tīklu."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"IZVEIDOT SAVIENOJUMU"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Šim tīklam nav interneta piekļuves. Vai tomēr izmantot šo tīklu?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Vairs nejautāt par šo tīklu"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Izveidot savienojumu"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Neizdevās izveidot savienojumu ar tīklu."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Neiegaumēt"</string>
@@ -740,21 +734,17 @@
     <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> pārnēsājams Wi-Fi tīklājs"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi zvani"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Zvanu preference"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi zvanu režīms"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Vēlams Wi-Fi tīkls"</item>
     <item msgid="5267397515594230396">"Vēlams mobilais tīkls"</item>
-    <item msgid="3132912693346866895">"Tikai Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2."</item>
     <item msgid="1171822231056612021">"1."</item>
-    <item msgid="3194458950573886239">"0."</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Ja ir ieslēgti Wi-Fi zvani, varat veikt tālruņa zvanus Wi-Fi tīklos vai savā mobilo sakaru operatora tīkla atkarībā no savām preferencēm un no tā, kurš signāls ir spēcīgāks. Pirms ieslēdzat šo funkciju, sazinieties ar savu mobilo sakaru operatoru, lai noskaidrotu tarifus un citu informāciju."</string>
     <string name="home_settings" msgid="212375129455718176">"Sākums"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Displejs"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Skaņa"</string>
@@ -927,12 +917,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Pieejams (tikai lasāms)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Kopējā vieta"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Notiek aprēķināšana..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Lietotnes (lietotņu dati un multivides saturs)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Lietotnes un lietotņu dati"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Multivide"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Lejupielādes"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Attēli, videoklipi"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (mūzika, zvana signāli, aplādes utt.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Dažādi"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Citi faili"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Kešatmiņā ievietotie dati"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Atvienot kopīgoto krātuvi"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Atvienot SD karti"</string>
@@ -965,6 +955,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Notiek atvienošana"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Paliek maz brīvas vietas"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Dažas sistēmas funkcijas, piemēram, sinhronizēšana, var nedarboties pareizi. Mēģiniet atbrīvot vietu, dzēšot vai noņemot piespraustos vienumus, piemēram, lietotnes vai multivides saturu."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Pārdēvēt"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Pievienot"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Noņemt"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Dzēst un formatēt"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Dzēst un formatēt kā iekšējo atmiņu"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB savienojums ar datoru"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB savienojums ar datoru"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Izveidot savienojumu kā"</string>
@@ -975,6 +970,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Ļauj lietojumprogrammām, kurās ir iespējoti MIDI signāli, darboties kopā ar jūsu datora MIDI programmatūru, izmantojot USB savienojumu."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Citi lietotāji"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Ierīces atmiņa"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Noņemamas atmiņas ierīces"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> bez maksas (kopā: <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> ir pievienota"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Nevarēja pievienot: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> tika droši noņemta"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Nevarēja droši noņemt: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> ir formatēta"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Nevarēja formatēt: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Pārdēvējiet atmiņu"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Pēc formatēšanas varat izmantot šo <xliff:g id="NAME_0">^1</xliff:g> citās ierīcēs. \n\nVisi šajā <xliff:g id="NAME_1">^1</xliff:g> saglabātie dati tiks dzēsti. Ieteicams vispirms dublēt datus. \n\n"<b>"Dublējiet fotoattēlus un citu saturu"</b>" \nPārvietojiet satura failus uz šīs ierīces alternatīvo krātuvi vai pārsūtiet tos uz datoru, izmantojot USB kabeli. \n\n"<b>"Dublējiet lietotnes"</b>" \nVisas šajā <xliff:g id="NAME_6">^1</xliff:g> glabātās lietotnes tiks atinstalētas, un to dati tiks dzēsti. Lai saglabātu šīs lietotnes, pārvietojiet tās uz šīs ierīces alternatīvo krātuvi."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Kad izņemsiet šo <xliff:g id="NAME_0">^1</xliff:g>, tajā glabātās lietotnes vairs nedarbosies un tajā glabātie faili nebūs pieejami, līdz tā tiks ievietota atpakaļ."</b>" \n\nŠī <xliff:g id="NAME_1">^1</xliff:g> ir formatēta tā, lai darbotos tikai šajā ierīcē, un tā nedarbosies citās ierīcēs."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Iestatiet <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Izmantot kā pārnēsājamu krātuvi"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Izvēloties šo opciju, varēsiet pārvietot fotoattēlus un citus datus uz citām ierīcēm."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Izmantot kā iekšējo atmiņu"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Izvēloties šo opciju, varēsiet glabāt failus (tostarp lietotnes un fotoattēlus) tikai šajā ierīcē. Tādā gadījumā krātuve ir jāformatē, lai tā darbotos tikai konkrētā ierīcē."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatēt kā iekšējo atmiņu"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Lai padarītu <xliff:g id="NAME_0">^1</xliff:g> drošu, tā ir jāformatē. \n\nPēc formatēšanas šī <xliff:g id="NAME_1">^1</xliff:g> darbosies tikai šajā ierīcē. \n\n"<b>"Formatējot <xliff:g id="NAME_2">^1</xliff:g>, tiks dzēsti visi tajā pašlaik glabātie dati."</b>" Lai nezaudētu datus, dublējiet tos."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Dzēst un formatēt"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Notiek <xliff:g id="NAME">^1</xliff:g> formatēšana…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Neizņemiet <xliff:g id="NAME">^1</xliff:g> formatēšanas laikā."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Pārvietojiet uz jauno krātuvi"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Varat pārvietot fotoattēlus, failus un lietotņu datus uz jauno <xliff:g id="NAME">^1</xliff:g>. \n\nFailu pārvietošanai nepieciešamais laiks ir aptuveni <xliff:g id="TIME">^2</xliff:g>, un tādējādi iekšējā atmiņā tiks atbrīvota <xliff:g id="SIZE">^3</xliff:g> liela vieta. Kamēr noritēs pārvietošana, dažas lietotnes nedarbosies."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Pārvietot tūlīt"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Pārvietot vēlāk"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Pārvietojiet datus tūlīt"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Failu pārvietošanai nepieciešamais laiks ir aptuveni <xliff:g id="TIME">^1</xliff:g>. Iekšējā atmiņā tiks atbrīvota <xliff:g id="SIZE">^2</xliff:g> liela vieta."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Pārvietot failus"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Notiek datu pārvietošana…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Failu pārvietošanas laikā: \n• neizņemiet <xliff:g id="NAME">^1</xliff:g>; \n• dažas lietotnes var nedarboties pareizi; \n• uzturiet ierīces akumulatora enerģijas līmeni."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> ir gatava lietošanai"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Jūsu <xliff:g id="NAME">^1</xliff:g> ir iestatīta, un tajā var glabāt fotoattēlus un citu saturu"</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Jaunā <xliff:g id="NAME">^1</xliff:g> darbojas. \n\nLai pārvietotu fotoattēlus un lietotņu datus uz šo ierīci, atveriet izvēlni Iestatījumi &gt; Krātuve."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Pārvietojiet lietotni <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Lietotnes <xliff:g id="APP">^1</xliff:g> un tās datu pārvietošana uz <xliff:g id="NAME_0">^2</xliff:g> aizņems tikai neilgu brīdi. Kamēr pārvietošana nebūs pabeigta, nevarēsiet izmantot lietotni. \n\nNeizņemiet <xliff:g id="NAME_1">^2</xliff:g>, kamēr tiek pārvietoti faili."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Notiek lietotnes <xliff:g id="APP">^1</xliff:g> pārvietošana…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Neizņemiet <xliff:g id="NAME">^1</xliff:g>, kamēr tiek pārvietoti faili. \n\nKamēr failu pārvietošana nebūs pabeigta, lietotne <xliff:g id="APP">^2</xliff:g> šajā ierīcē nebūs pieejama."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Atcelt pārvietošanu"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Akumulatora statuss"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Akumulatora uzlādes līmenis"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1019,13 +1053,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Atiestatīt noklusējuma vērtības"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Noklusējuma APN iestatījumu atiestatīšana ir pabeigta."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Tīkla iestatījumu atiestatīšana"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Visi ar tīklošanu saistītie iestatījumi tiks atiestatīti uz rūpnīcas noklusējuma iestatījumiem. Tas attiecas arī uz šādiem iestatījumiem: \n\n"<li>"Wi-Fi"</li>\n<li>"Mobilie dati"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Tādējādi tiks atiestatīti visi tīklu iestatījumi, tostarp: \n\n"<li>"Wi‑Fi"</li>\n<li>"Mobilie dati"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Atiestatīt iestatījumus"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Vai atiestatīt visus tīkla iestatījumus? Šo darbību nevarēs atsaukt."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Vai atiestatīt visus tīkla iestatījumus? Šo darbību nevarēs atsaukt."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Atiestatīt iestatījumus"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Lai apstiprinātu tīkla iestatījumu atiestatīšanu, norādiet savu grafisko atslēgu."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Vai atiestatīt?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Tīkla iestatījumu atiestatīšana"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Tīklu iestatījumi ir atiestatīti."</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Atiestatīt ierīci"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Rūpnīcas datu atiestatīšana"</string>
     <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>
@@ -1041,9 +1074,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Izdzēst visus SD kartē saglabātos datus, piemēram, mūziku vai fotoattēlus"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Atiestatīt planšetdatoru"</string>
     <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_desc" msgid="1062841478823409667">"Vai dzēst visu jūsu personīgo informāciju un visas lejupielādētās lietotnes? Šo darbību nevarēs atsaukt."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Dzēst visu"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Šim lietotājam nav pieejama rūpnīcas datu atiestatīšana."</string>
@@ -1060,8 +1092,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Balss pasta, zvanu pāradresācijas, zvana gaidīšanas, zvanītāja ID iestatīšana"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB saistīšana"</string>
@@ -1093,7 +1123,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Palīdzība"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobilie tīkli"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilo sakaru pakalpojumu plāns"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Noklusējuma īsziņu lietotne"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Īsziņu lietotne"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vai mainīt īsziņu lietotni?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Vai īsziņām izmantot lietotni <xliff:g id="NEW_APP">%1$s</xliff:g>, nevis <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Vai izmantot lietotni <xliff:g id="NEW_APP">%s</xliff:g> kā īsziņu lietotni?"</string>
@@ -1124,6 +1154,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Lietot GPS atrašanās vietas noteikšanai"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Pārbaudīšana"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Pārbaudīšana"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi meklēšana"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Uzlabot atrašanās vietas noteikšanas precizitāti, ļaujot lietotnēm un pakalpojumiem meklēt Wi-Fi tīklus, pat ja Wi-Fi savienojums ir izslēgts"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth meklēšana"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Uzlabot atrašanās vietas noteikšanas precizitāti, ļaujot sistēmas pakalpojumiem meklēt Bluetooth ierīces, pat ja Bluetooth savienojums ir izslēgts"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi un mobilo tīklu atr. vieta"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Ļaut lietotnēm izmantot Google atrašanās vietas pakalpojumu, lai ātrāk noteiktu jūsu atrašanās vietu. Tiks apkopoti un nosūtīti uz Google serveriem anonīmi atrašanās vietas dati."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fi noteikta atrašanās vieta"</string>
@@ -1169,11 +1203,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Parole ir iestatīta"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN kods ir iestatīts"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Kombinācija ir iestatīta"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Lai turpinātu, ievadiet ierīces kombināciju."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Lai turpinātu, ievadiet ierīces PIN kodu."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Lai turpinātu, ievadiet ierīces paroli."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Nepareizs PIN kods"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Nepareiza parole"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Nepareiza kombinācija"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Ierīces drošība"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Atbloķēšanas kombinācijas maiņa"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Mainīt atbloķēšanas PIN"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Apstiprināt saglabāto kombināciju"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Mēģiniet vēlreiz:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Zīmēt atbloķēšanas kombināciju"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Lai saņemtu palīdzību, nospiediet Izvēlne."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Atlaidiet pirkstu, kad esat pabeidzis."</string>
@@ -1195,8 +1233,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Iestatīt atbloķēšanas kombināciju"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Atbloķēšanas kombinācijas maiņa"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Kā zīmēt atbloķēšanas kombināciju"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Pārāk daudz nepareizu mēģinājumu!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Mēģiniet vēlreiz pēc <xliff:g id="NUMBER">%d</xliff:g> sekundēm."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Pārāk daudz neveiksmīgu mēģinājumu. Mēģiniet vēlreiz pēc <xliff:g id="NUMBER">%d</xliff:g> sekundēm."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Lietojumprogramma jūsu tālrunī nav instalēta."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Pārvaldīt lietotnes"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Pārvaldiet un noņemiet instalētās lietotnes"</string>
@@ -1247,8 +1284,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Kārtot pēc izmēra"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Rādīt aktīvos pakalp."</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Rādīt kešatmiņā iev. pr."</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Ārkārtas izsaukumu lietotne"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Atiest. lietotnes prefer."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Vai atiest. liet. pref.?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Tādējādi tiks atiestatītas visas preferences, kas saistītas ar:\n\n "<li>"atspējotām lietotnēm;"</li>\n" "<li>"atspējotu lietotņu paziņojumiem;"</li>\n" "<li>"darbībām paredzētām noklusējuma lietojumprogrammām;"</li>\n" "<li>"lietotņu fona datu ierobežojumiem;"</li>\n" "<li>"visiem atļauju ierobežojumiem."</li>\n\n" Jūs nezaudēsiet nekādus lietotņu datus."</string>
@@ -1452,8 +1488,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Tvert visas Bluetooth HCI paketes failā"</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="select_logd_size_title" msgid="7433137108348553508">"Reģistrētāja buferu lielumi"</string>
@@ -1754,6 +1788,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 stundas"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 diena"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Rādīt sistēmas procesus"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Slēpt sistēmu"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Lietot unikālo kopas lielumu"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistikas veids"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Fons"</string>
@@ -1850,7 +1885,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Pašreizējā parole:"</string>
@@ -2225,7 +2259,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Lietotājs"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Ierobežots profils"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Vai pievienot jaunu lietotāju?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Varat koplietot šo ierīci ar citām personām, izveidojot papildu lietotājus. Katram lietotājam ir sava vide, kas ir pielāgojama, izmantojot lietotnes, fona tapetes u.c. Lietotāji var pielāgot ierīces iestatījumus, kas attiecas uz visiem lietotājiem, piemēram, Wi‑Fi.\n\nKad pievienosiet jaunu lietotāju, viņam būs jāizveido sava vide.\n\nIkviens lietotājs var atjaunināt lietotnes citu lietotāju vietā."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Varat koplietot šo ierīci ar citām personām, izveidojot papildu lietotājus. Katram lietotājam ir sava vide, kas ir pielāgojama, izmantojot lietotnes, fona tapetes u.c. Lietotāji var pielāgot ierīces iestatījumus, kas attiecas uz visiem lietotājiem, piemēram, Wi‑Fi.\n\nKad pievienosiet jaunu lietotāju, viņam būs jāizveido sava vide.\n\nIkviens lietotājs var atjaunināt lietotnes citu lietotāju vietā."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Kad pievienosiet jaunu lietotāju, viņam būs jāizveido sava vide.\n\nIkviens lietotājs var atjaunināt lietotnes citu lietotāju vietā."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Iestatīt kontu tūlīt?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Pārliecinieties, ka persona var izmantot ierīci un iestatīt savu vidi."</string>
@@ -2405,10 +2439,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"ierobežojums ierobežot ierobežots"</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_reset_apps" msgid="6420313678620788457">"atiestatīt preferences noklusējums"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"ārkārtas gadījumi noklusējuma lietotne"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"lietotnes lejupielādēt lietojumprogrammas sistēma"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"lietotnes atļaujas drošība"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"lietotnes noklusējums"</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>
@@ -2423,14 +2457,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Signāla skaļums"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Zvana skaļums"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Paziņojumu skaļums"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Bloķēt pārtraukumus"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Atļauti tikai prioritārie pārtraukumi"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automātiskas kārtulas"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Saņemot zvanus un 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_alarms" msgid="7380265858042606857">"Atļaut tikai signālus"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Nepārtraukt"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Tikai prioritārie pārtraukumi"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Tikai signāli"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Bez pārtraukumiem"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tālruņa zvana signāls"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Paziņojumu noklusējuma zvana signāls"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrācija zvaniem"</string>
@@ -2464,16 +2496,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Nav instalēts neviens paziņojumu uztvērējs."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Vai iespējot pakalpojumu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Uztvērējs <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> varēs lasīt visus paziņojumus, ko publicējusi sistēma vai jebkura instalētā lietotne. Šajos paziņojumos var būt ietverta personas informācija, piemēram, kontaktpersonu vārdi un saņemtās īsziņas. Šis uztvērējs arī varēs paslēpt šos paziņojumus un pieskarties paziņojumos esošajām darbību pogām."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Nosacījumu sniedzēji"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nosacījumi nav sniegti nevienā lietotnē"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="zero">Nosacījumi sniegti %d lietotnēs</item>
-      <item quantity="one">Nosacījumi sniegti %d lietotnē</item>
-      <item quantity="other">Nosacījumi sniegti %d lietotnēs</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nav instalēts neviens nosacījumu sniedzējs."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Vai iespējot pakalpojumu <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> varēs pievienot iziešanas nosacījumus režīmā “Netraucēt”."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Notiek lietotņu ielāde..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloķēt visus"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nekad nerādīt paziņojumus no šīs lietotnes"</string>
@@ -2487,17 +2509,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritāte"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitīvi"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Kārtulas nosaukums"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Pievienot kārtulu"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Dzēst kārtulu"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Vai dzēst kārtulu “<xliff:g id="RULE">%1$s</xliff:g>”?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Dzēst"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Kārtulas veids"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Nezināma"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Konfigurēt kārtulu"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Grafika kārtula"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Kārtula nav atrasta."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dienas"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Nav"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Katru dienu"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nekad"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"No <xliff:g id="START">%1$s</xliff:g> līdz <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2507,15 +2535,84 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Signāli"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Atgādinājumi"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Notikumi"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Atlasīti zvanītāji"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Personas, kas vairākkārt zvanījušas"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Atļaut, ja viena un tā pati persona zvana <xliff:g id="MINUTES">%d</xliff:g> minūšu periodā"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automātiski ieslēgt"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nekad"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Katru nakti"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> nākamajā dienā"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Kad jūs var pārtraukt?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Cik ilgi?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Uz nenoteiktu laiku"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="zero"><xliff:g id="COUNT_1">%d</xliff:g> minūšu</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> minūte</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minūtes</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="zero"><xliff:g id="COUNT_1">%d</xliff:g> stundu</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> stunda</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> stundas</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Pāriet uz režīmu “Tikai prioritārie paziņojumi” uz nenoteiktu laiku"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="zero">Pāriet uz “Prioritārie paziņojumi” <xliff:g id="DURATION">%1$d</xliff:g> minūtes (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Pāriet uz “Prioritārie paziņojumi” <xliff:g id="DURATION">%1$d</xliff:g> minūti (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Pāriet uz “Prioritārie paziņojumi” <xliff:g id="DURATION">%1$d</xliff:g> minūtes (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="zero">Pāriet uz “Prioritārie paziņojumi” <xliff:g id="DURATION">%1$d</xliff:g> stundas (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Pāriet uz “Prioritārie paziņojumi” <xliff:g id="DURATION">%1$d</xliff:g> stundu (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Pāriet uz “Prioritārie paziņojumi” <xliff:g id="DURATION">%1$d</xliff:g> stundas (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Pāriet uz režīmu “Tikai signāli” uz nenoteiktu laiku"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="zero">Pāriet uz “Tikai signāli” <xliff:g id="DURATION">%1$d</xliff:g> minūtes (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Pāriet uz “Tikai signāli” <xliff:g id="DURATION">%1$d</xliff:g> minūti (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Pāriet uz “Tikai signāli” <xliff:g id="DURATION">%1$d</xliff:g> minūtes (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="zero">Pāriet uz “Tikai signāli” <xliff:g id="DURATION">%1$d</xliff:g> stundas (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Pāriet uz “Tikai signāli” <xliff:g id="DURATION">%1$d</xliff:g> stundu (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Pāriet uz “Tikai signāli” <xliff:g id="DURATION">%1$d</xliff:g> stundas (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Pāriet uz režīmu “Nepārtraukt” uz nenoteiktu laiku"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="zero">Pāriet uz “Nepārtraukt” <xliff:g id="DURATION">%1$d</xliff:g> minūtes (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Pāriet uz “Nepārtraukt” <xliff:g id="DURATION">%1$d</xliff:g> minūti (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Pāriet uz “Nepārtraukt” <xliff:g id="DURATION">%1$d</xliff:g> minūtes (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="zero">Pāriet uz “Nepārtraukt” <xliff:g id="DURATION">%1$d</xliff:g> stundas (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Pāriet uz “Nepārtraukt” <xliff:g id="DURATION">%1$d</xliff:g> stundu (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Pāriet uz “Nepārtraukt” <xliff:g id="DURATION">%1$d</xliff:g> stundas (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Pāriet uz “Vienmēr pārtraukt”"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"bezgalīgi"</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>
@@ -2581,7 +2678,11 @@
       <item quantity="one">Piešķirta <xliff:g id="COUNT_1">%d</xliff:g> atļauja</item>
       <item quantity="other">Piešķirtas <xliff:g id="COUNT_1">%d</xliff:g> atļaujas</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="zero">Piešķirtās atļaujas: <xliff:g id="COUNT_2">%d</xliff:g> no <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="one">Piešķirtās atļaujas: <xliff:g id="COUNT_2">%d</xliff:g> no <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="other">Piešķirtās atļaujas: <xliff:g id="COUNT_2">%d</xliff:g> no <xliff:g id="COUNT_3">%d</xliff:g></item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Iestatīti daži noklusējumi"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Nav iestatīti noklusējumi"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Visas lietotnes"</string>
@@ -2592,8 +2693,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Ar prioritāriem paziņojumiem"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Ar sensitīviem paziņojumiem"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Ar domēnu URL"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Atiestatiet visu lietotņu preferences uz noklusējuma vērtībām"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"Instalētas <xliff:g id="COUNT">%d</xliff:g> lietotnes, tostarp lejupielādētās un sistēmas lietotnes"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Atspējojis administrators"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Papildu"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nezināma lietotne"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Profila izvēlēšanās"</string>
@@ -2609,4 +2709,11 @@
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> lietotne var atvērt savu domēnu vietrāžus URL</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> lietotnes var atvērt savu domēnu vietrāžus URL</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Nav atpazīts"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Noklusējuma lietotnes"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Pārlūka lietotne"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Nav noklusējuma pārlūka"</string>
+    <string name="default_app" msgid="6864503001385843060">"(noklusējums)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-mk-rMK/arrays.xml b/res/values-mk-rMK/arrays.xml
index 81c871d..6906abb 100644
--- a/res/values-mk-rMK/arrays.xml
+++ b/res/values-mk-rMK/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Копче „Притисни“"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"мала"</item>
     <item msgid="4212263919458209842">"критична"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Исклучено"</item>
-    <item msgid="5656544177755411222">"Ограничени прекини"</item>
-    <item msgid="8735337502532332056">"Нула прекини"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Нормално"</item>
     <item msgid="866544120205026771">"Умерено"</item>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 1a90808..a0ad0a8 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD картичка"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Подесувања за прокси"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ДА"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"НЕ"</string>
-    <string name="forget" msgid="7267115980248732932">"ЗАБОРАВИ"</string>
+    <string name="forget" msgid="1400428660472591263">"Заборави"</string>
+    <string name="save" msgid="879993180139353333">"Зачувај"</string>
+    <string name="done" msgid="6942539184162713160">"Готово"</string>
     <string name="settings_label" msgid="1626402585530130914">"Подесувања"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Подесувања"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Кратенка за подесувања"</string>
@@ -374,7 +372,6 @@
     <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_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>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Напредни"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Напреден Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Кога е вклучен Bluetooth, уредот може да комуницира со други уреди со Bluetooth во близина."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"За да се подобри точноста на локацијата, услугите на Google ќе скенираат за уреди со Bluetooth, дури и кога Bluetooth е исклучен. Може да го измените ова во LINK_BEGINпоставките за скенирањеLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"За да се подобри точноста на локацијата, апликациите и услугите ќе скенираат уреди со Bluetooth, дури и кога Bluetooth е исклучен. Може да го измените ова во <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>поставки за скенирање<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Поврзи се со..."</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>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"За да се подобри точноста на локацијата, услугите на Google ќе скенираат за Wi‑Fi мрежи, дури и кога Wi‑Fi е исклучено. Може да го измените ова во LINK_BEGINпоставките за скенирањеLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"За да се подобри точноста на локацијата, апликациите и услугите ќе скенираат Wi‑Fi мрежи, дури и кога Wi‑Fi е исклучен. Може да го измените ова во <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>поставки за скенирање<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Не прикажувај повторно"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Задржи Wi-Fi во текот на режим на мирување"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Вклучена Wi‑Fi при мирување"</string>
@@ -604,8 +601,6 @@
     <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_apps" msgid="6003687912727859577">"Прикажи апликации"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Прикажи Wi-Fi јачина"</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>
@@ -663,6 +658,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ПОВРЗИ"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Мрежата нема пристап до интернет. Сепак користете ја мрежата?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Не прашувај повторно во оваа мрежа"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Поврзи се"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Не успеа да се поврзе со мрежата"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Заборави"</string>
@@ -729,21 +726,17 @@
     <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> точка на пристап на пренослива Wi‑Fi"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Повикување преку Wi-Fi"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Параметар за повикување"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Режим – повикување преку Wi-Fi"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Се претпочита Wi-Fi"</item>
     <item msgid="5267397515594230396">"Се претпочита мобилна"</item>
-    <item msgid="3132912693346866895">"Само Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Кога е вклучено повикувањето преку Wi-Fi, телефонот може да насочува повици преку мрежи на Wi-Fi или мрежата на операторот, зависно од параметрите и кој сигнал е посилен. Пред да ја вклучите функцијата, проверете кај операторот за давачки и други детали."</string>
     <string name="home_settings" msgid="212375129455718176">"Почетна страница"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Екран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
@@ -915,12 +908,12 @@
     <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="5128673488173839077">"Апликации и податоци на апликацијата"</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_media_misc_usage" msgid="235452944021647124">"Разно"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Други датотеки"</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">"Одмонтирај СД картичка"</string>
@@ -953,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Одмонтирање во тек"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Меморијата е речиси полна"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Некои функции на системот, како што е синхронизирањето, може да не функционираат правилно. Обидете се да ослободите простор со бришење или откачување предмети, како што се апликации или медиумски содржини."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Преименувај"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Монтирај"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Извади"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Избриши и форматирај"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Избриши и форматирај како внатрешна меморија"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Врска со компјутер со УСБ"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"УСБ врска со компјутер"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Поврзи како"</string>
@@ -963,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Овозможува апликациите со овозможен MIDI да работат преку УСБ со софтвер MIDI на компјутерот."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Други корисници"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Меморија на уредот"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Пренослива меморија"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> слободно (Вкупно <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> е монтирано"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Не може да се монтира <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> е безбедно извадено"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Не може безбедно да се извади <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> е форматирано"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Не може да се форматира <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Преименувај меморија"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"По форматирањето, може да ја користите оваа <xliff:g id="NAME_0">^1</xliff:g> во други уреди. \n\nСите податоци на <xliff:g id="NAME_1">^1</xliff:g> ќе бидат избришани. Размислете прво да направите резервна копија. \n\n"<b>"Направете резервна копија од фотографиите и другите медиуми"</b>" \nПреместете ги медиумските датотеки во алтернативна меморија на уредов или префрлете ги на компјутер користејќи УСБ-кабел. \n\n"<b>"Направете резервна копија од апликациите"</b>" \nСите апликации меморирани на <xliff:g id="NAME_6">^1</xliff:g> ќе се деинсталираат и нивните податоци ќе се избришат. За да ги сочувате апликацииве, преместете ги во алтернативна меморија на уредов."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Кога ќе го извадите меморискиот уред <xliff:g id="NAME_0">^1</xliff:g>, апликациите меморирани таму ќе престанат да работат, а медиумските датотеки нема да бидат достапни додека тој не се внесе повторно."</b>" \n\nМеморискиот уред <xliff:g id="NAME_1">^1</xliff:g> е форматиран да работи само на овој уред. Нема да работи на ниеден друг уред."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Поставете <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Користи како пренослива меморија"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"За преместување фотографии и други медиуми меѓу уреди."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Користи како внатрешна меморија"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"За меморирање на што било само на овој уред, вклучувајќи и апликации и фотографии. Бара форматирање што го спречува да работи со други уреди."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Формат. како внатрешна меморија"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Ова бара меморискиот уред <xliff:g id="NAME_0">^1</xliff:g> да биде форматиран за да биде безбеден. \n\nПо форматирањето, <xliff:g id="NAME_1">^1</xliff:g> ќе работи само на овој уред. \n\n"<b>"Форматирањето ги брише сите податоци тековно складирани на <xliff:g id="NAME_2">^1</xliff:g>."</b>" За да избегнете губење на податоците, размислете да направите резервна копија од нив."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Избриши и форматирај"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Се форматира <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Не отстранувајте ја <xliff:g id="NAME">^1</xliff:g> додека се форматира."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Премести подат. во нова меморија"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Може да ги преместувате фотографиите, датотеките и податоците за апликацијата на новата <xliff:g id="NAME">^1</xliff:g>. \n\nПреместувањето трае околу <xliff:g id="TIME">^2</xliff:g> и ќе ослободи <xliff:g id="SIZE">^3</xliff:g> од внатрешната меморија. Некои апликации нема да работат додека ова е во тек."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Премести сега"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Премести подоцна"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Премести ги податоците сега"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Преместувањето трае околу <xliff:g id="TIME">^1</xliff:g>. Ќе ослободи <xliff:g id="SIZE">^2</xliff:g> од внатрешната меморија."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Премести"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Се преместуваат податоци…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"За време на преместувањето: \n• Не отстранувајте ја <xliff:g id="NAME">^1</xliff:g>. \n• Некои апликации нема да работат исправно. \n• Држете го уредот наполнет."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> е подготвена"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Вашата <xliff:g id="NAME">^1</xliff:g> е целосно подготвена за користење со фотографии и други медиуми."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Вашата нова <xliff:g id="NAME">^1</xliff:g> работи. \n\nЗа да преместите фотографии, датотеки и податоци за апликацијата на уредов, одете во Поставки и меморија."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Премести <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Преместувањето на <xliff:g id="APP">^1</xliff:g> и нејзините податоци на <xliff:g id="NAME_0">^2</xliff:g> ќе потрае само неколку моменти. Нема да може да ја користите апликацијата додека преместувањето не заврши. \n\nНе отстранувајте ја <xliff:g id="NAME_1">^2</xliff:g> за време на преместувањето."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Се преместува <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Не отстранувајте ја <xliff:g id="NAME">^1</xliff:g> за време на преместувањето. \n\nАпликацијата <xliff:g id="APP">^2</xliff:g> на уредов нема да биде достапна додека преместувањето не заврши."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Откажи преместување"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Статус на батеријата"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Ниво на батерија"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Подесувања на APN"</string>
@@ -1007,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Ресетирај на стандардни вредности"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Ресетирањето стандардни подесувања на APN е завршено."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Ресетирање мрежни поставки"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Ова ќе ги ресетира на стандардните вредности сите поставки поврзани со мрежата, вклучувајќи:\n\n"<li>"Wifi"</li>\n<li>"Мобилни податоци"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Ова ќе ги ресетира сите мрежни поставки, вклучувајќи и:\n\n"<li>"Wi‑Fi"</li>\n<li>"Мобилни податоци"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Ресетирај поставки"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Ресетирај ги сите мрежни поставки? Не може да се врати ова дејство!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Да се ресетираат сите мрежни поставки? Не може да се врати ова дејство!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Ресетирај поставки"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Треба да ја употребите шемата за отклучување за да потврдите ресетирање на мрежните поставки."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Ресетирај?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Ресетирање мрежни поставки"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Мрежните поставки се ресетирани"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Ресетирај уред"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Ресетирање фабрички податоци"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Ова ќе ги избрише сите податоци од "<b>"внатрешна меморија"</b>"на вашиот таблет, заедно со:\n\n"<li>"вашата сметка на Google"</li>\n<li>"податоци и подесувања на систем и апликации"</li>\n<li>"преземени апликации"</li></string>
@@ -1029,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Избриши ги сите податоци на СД картичката, како што се музика или фотографии"</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="1062841478823409667">"Да се избришат сите ваши лични податоци и преземени апликации? Не може да го вратите ова дејство!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Избриши сè"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Фабричкото ресетирање не е достапно за овој корисник"</string>
@@ -1048,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Подеси говорна пошта, проследување на повик, повик на чекање, ИД на повикувач"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Поврзување со УСБ"</string>
@@ -1081,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Помош"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Мобилни мрежи"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Мобилен план"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Стандардна СМС апликација"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Апликација за СМС"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Измени СМС апликација?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Користи <xliff:g id="NEW_APP">%1$s</xliff:g> наместо <xliff:g id="CURRENT_APP">%2$s</xliff:g> како на СМС апликација?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Користи <xliff:g id="NEW_APP">%s</xliff:g> како СМС апликација?"</string>
@@ -1112,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Користи ГПС за да се утврди локацијата"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Се скенира"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Се скенира"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Скенирање на Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Подобрете ја локацијата овозможувајќи им на системските услуги да скенираат Wi‑Fi мрежи, дури и кога Wi‑Fi е исклучен"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Скенирање на Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Подобрете ја локацијата овозможувајќи им на системските услуги да скенираат уреди со Bluetooth, дури и кога Bluetooth е исклучен"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Лок. на мр. на Wi‑Fi и на моб."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"За брза процена, овозможи услуга за локација на Google. Анонимните податоци за локација се собираат и се испраќаат на Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Локацијата е утврдена со Wi-Fi"</string>
@@ -1157,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Лозинката е поставена"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-от е поставен"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Шемата е поставена"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Користете ја шемата на уредот за да продолжите."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Внесете го ПИН-кодот на уредот за да продолжите."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Внесете ја лозинката на уредот за да продолжите."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Погрешен ПИН"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Погрешна лозинка"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Погрешна шема"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Безбедност на уред"</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>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Притисни „Мени“ за помош."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Отпуштете го прстот кога е готово"</string>
@@ -1183,8 +1224,7 @@
     <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" msgid="6909161623701848863">"Премногу погрешни обиди. Обидете се повторно за <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>
@@ -1235,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Подреди по големина"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Прикажи активни услуги"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Прикажи кеширани процеси"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Апликација за итност"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Ресет. парам. на аплик."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Ресетирај параметри на апликација?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Со ова се ресетираат сите параметри за:\n\n"<li>"оневозможени апликации"</li>\n<li>"оневозможени известувања на апликација"</li>\n<li>"стандардни апликации за дејства"</li>\n<li>"ограничувања за податоци во заднина за апликации"</li>\n<li>"сите ограничувања за дозволи"</li>\n\n" Вие нема да изгубите никакви податоци за апликацијата."</string>
@@ -1440,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Сними ги сите Bluetooth HCI пакети во датотека"</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="select_logd_size_title" msgid="7433137108348553508">"Величини на меѓумеморија на забележувач"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 часа"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 ден"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Прикажи систем"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Сокриј систем"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Користи Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Тип статистика"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Заднина"</string>
@@ -1838,7 +1876,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_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>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Корисник"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Ограничен профил"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Да се додаде нов корисник?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Со создавање дополнителни корисници може да го споделите уредот со други. Секој корисник ќе си има сопствен простор кој може да го прилагодува со сопствени апликации, тапети и така натаму. Корисниците може и да прилагодуваат поставки на уредот што се однесуваат на сите, како Wi‑Fi.\n\nКога додавате нов корисник, тоа лице треба да го постави својот простор.\n\nСекој корисник може да ажурира апликации за сите други корисници."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Со создавање дополнителни корисници може да го споделите уредов со други. Секој корисник има сопствен простор што може да го нагодува со сопствени апликации, тапети и така натаму. Корисниците може и да нагодуваат поставки на уредот, како Wi‑Fi, што се однесуваат на сите.\n\nКога додавате нов корисник, тој треба да го постави својот простор.\n\nСекој корисник може да ажурира апликации за сите други корисници."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Кога додавате нов корисник, тоа лице треба да го постави својот простор.\n\nСекој корисник може да ажурира апликации за сите други корисници."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Подеси корисник сега?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Проверете дали лицето е достапно да го земе уредот и да го постави својот простор"</string>
@@ -2393,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"рестрикција ограничи ограничено"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"текст поправка поправи звук вибрирај автоматски јазик движење предложи предлог тема навредлив збор впиши емотикона меѓународно"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"ресетирање претпочитања стандардни"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"стандардна апликација за итни случаи"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"апликации преземање систем"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"апликации дозволи безбедност"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"апликациите се стандардни"</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>
@@ -2411,14 +2448,12 @@
     <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="6948120138640252732">"Блокирај прекини"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Дозволува само приоритетно"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Автоматски правила"</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_alarms" msgid="7380265858042606857">"Дозволи само аларми"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Не прекинувај"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Само приоритетно"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Само аларми"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Без прекини"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Мелодија на телефон"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Станд. мелодија за известување"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Вибрации и за повици"</string>
@@ -2451,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Нема инсталирано слушатели на известувања."</string>
     <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">"Нема апликации даватели на состојба"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="one">%d апликација обезбедува услови</item>
-      <item quantity="other">%d апликации обезбедуваат услови</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="loading_notification_apps" msgid="5031818677010335895">"Вчитување апликации…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блокирај ги сите"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Никогаш не прикажувај известувања од оваа апликација"</string>
@@ -2473,17 +2499,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"Име на правило"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Додај правило"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Избриши правило"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Избриши правило за „<xliff:g id="RULE">%1$s</xliff:g>“?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Избриши"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Тип правило"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Непознато"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Конфигурирај правило"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Правило за распоред"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Правилото не е пронајдено"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Денови"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Нема"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Секој ден"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Никогаш"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> до <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Повици"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Пораки"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Повици/пораки од"</string>
@@ -2493,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Аларми"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Потсетници"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Настани"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Избрани повикувачи"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Редовни повикувачи"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Доколку истото лице повикува по втор пат во период од <xliff:g id="MINUTES">%d</xliff:g> минути, дозволете"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> следниот ден"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Кога сакате да ве прекинат?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"За колку време?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Неодредено време"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> минута</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> минути</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> час</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> часа</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Промени на приоритетни известувања само на неодредено време"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Промени на приоритетни известувања само за <xliff:g id="DURATION">%1$d</xliff:g> минута до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Промени на приоритетни известувања само за <xliff:g id="DURATION">%1$d</xliff:g> минути до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Промени на приоритетни известувања само за <xliff:g id="DURATION">%1$d</xliff:g> час до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Промени на приоритетни известувања само за <xliff:g id="DURATION">%1$d</xliff:g> часа до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Промена на аларми само на неодредено време"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">Промени на аларми само за <xliff:g id="DURATION">%1$d</xliff:g> минута до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Промени на аларми само за <xliff:g id="DURATION">%1$d</xliff:g> минути до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="one">Промени на аларми само за <xliff:g id="DURATION">%1$d</xliff:g> час до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Промени на аларми само за <xliff:g id="DURATION">%1$d</xliff:g> часа до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Промени да не се прекине на неодредено време"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Промени да не прекинува <xliff:g id="DURATION">%1$d</xliff:g> минута (до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Промени да не прекинува <xliff:g id="DURATION">%1$d</xliff:g> минути до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Промени да не прекинува <xliff:g id="DURATION">%1$d</xliff:g> час до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Промени да не прекинува <xliff:g id="DURATION">%1$d</xliff:g> часа до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Промени секогаш да се прекине"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"засекогаш"</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>
@@ -2566,7 +2659,10 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> дозвола е одобрена</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> дозволи се одобрени</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one">Доделена е <xliff:g id="COUNT_2">%d</xliff:g> од <xliff:g id="COUNT_3">%d</xliff:g> дозвола</item>
+      <item quantity="other">Доделена е <xliff:g id="COUNT_2">%d</xliff:g> од <xliff:g id="COUNT_3">%d</xliff:g> дозволи</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Поставени се некои стандардни вредности"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Нема поставено стандардни вредности"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Сите апликации"</string>
@@ -2577,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Приоритетни"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Чувствителни"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Со УРЛ-домени"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Ресетирај ги претпочитањата за сите апликации на стандардни"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> инсталирани апликации, вклучувајќи системски и преземени апликации"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Оневозможено од администраторот"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Напредни"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Непозната апликација"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Изберете профил"</string>
@@ -2593,4 +2688,11 @@
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> апликација може да ги отвори нејзините УРЛ-домени</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> апликации може да ги отворат нивните УРЛ-домени</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Не е препознаено"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Стандардни апликации"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Апликација на прелистувачот"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Нема стандарден прелистувач"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Стандардно)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-ml-rIN/arrays.xml b/res/values-ml-rIN/arrays.xml
index efe4d9f..25e375b 100644
--- a/res/values-ml-rIN/arrays.xml
+++ b/res/values-ml-rIN/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"പുഷ് ബട്ടൺ"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"മീഡിയ"</item>
     <item msgid="7924928667052300589">"ഉപകരണം"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"മോശം ലൊക്കേഷൻ"</item>
+    <item msgid="5789673140227507995">"നല്ല ലൊക്കേഷൻ"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"വൈബ്രേറ്റുചെയ്യുക"</item>
+    <item msgid="3434165993711230924">"കോൺടാക്റ്റുകൾ റീഡുചെയ്യുക"</item>
+    <item msgid="616161687718081936">"കോൺടാക്റ്റുകൾ പരിഷ്‌ക്കരിക്കുക"</item>
+    <item msgid="7638002295329050091">"കോൾ ലോഗ് റീഡുചെയ്യുക"</item>
+    <item msgid="6546959730920410907">"കോൾ ലോഗ് പരിഷ്‌ക്കരിക്കുക"</item>
+    <item msgid="446877710771379667">"കലണ്ടർ റീഡുചെയ്യുക"</item>
+    <item msgid="7674458294386319722">"കലണ്ടർ പരിഷ്‌ക്കരിക്കുക"</item>
+    <item msgid="8281201165558093009">"wi-fi സ്‌കാൻ"</item>
+    <item msgid="8694611243479480497">"അറിയിപ്പ്"</item>
+    <item msgid="7776439107987345446">"സെൽ സ്‌കാൻ"</item>
+    <item msgid="514615766544675057">"ഫോണ്‍ വിളിക്കുക"</item>
+    <item msgid="8181415497109310680">"SMS വായിക്കുക"</item>
+    <item msgid="6816551144382117307">"SMS എഴുതുക"</item>
+    <item msgid="4600463921908905030">"SMS നേടുക"</item>
+    <item msgid="5958926493289432745">"അടിയന്തര SMS നേടുക"</item>
+    <item msgid="4945269495221089540">"MMS നേടുക"</item>
+    <item msgid="5570472453573929087">"WAP പുഷ് നേടുക"</item>
+    <item msgid="7125408150230860501">"SMS അയയ്‌ക്കുക"</item>
+    <item msgid="7080337936612188061">"ICC SMS വായിക്കുക"</item>
+    <item msgid="587124103118495063">"ICC SMS എഴുതുക"</item>
+    <item msgid="2320577158869025503">"ക്രമീകരണങ്ങൾ പരിഷ്‌ക്കരിക്കുക"</item>
+    <item msgid="1545733463471924009">"മുകളിൽ ഡ്രോ ചെയ്യുക"</item>
+    <item msgid="3609046903962454582">"അറിയിപ്പുകൾ ആക്‌സസ്സുചെയ്യുക"</item>
+    <item msgid="4671646036128214513">"ക്യാമറ"</item>
+    <item msgid="1097324338692486211">"ഓഡിയോ റെക്കോർഡുചെയ്യുക"</item>
+    <item msgid="5031552983987798163">"ഓഡിയോ പ്ലേ ചെയ്യുക"</item>
+    <item msgid="8374996688066472414">"ക്ലിപ്പ്ബോർഡ് റീഡുചെയ്യുക"</item>
+    <item msgid="3045529469061083747">"ക്ലിപ്പ്ബോർഡ് പരിഷ്‌ക്കരിക്കുക"</item>
+    <item msgid="5124443975763747838">"മീഡിയ ബട്ടണുകൾ"</item>
+    <item msgid="4547883971364273343">"ഓഡിയോ ഫോക്കസ്"</item>
+    <item msgid="2603878814882344450">"മൊത്തം വോളിയം"</item>
+    <item msgid="7136963238377062018">"വോയ്‌സ് വോളിയം"</item>
+    <item msgid="4270236897655923007">"റിംഗ് വോളിയം"</item>
+    <item msgid="6325739889222559394">"മീഡിയ വോളിയം"</item>
+    <item msgid="5762123934816216821">"അലാറം വോളിയം"</item>
+    <item msgid="785049718065337473">"അറിയിപ്പ് വോളിയം"</item>
+    <item msgid="6700305533746877052">"ബ്ലൂടൂത്ത് വോളിയം"</item>
+    <item msgid="2029227495214047094">"സജീവമായി തുടരുക"</item>
+    <item msgid="26109888160231211">"ലൊക്കേഷൻ നിരീക്ഷിക്കുക"</item>
+    <item msgid="5753382310468855812">"ഉയർന്ന പവർ ലൊക്കേഷൻ നിരീക്ഷിക്കുക"</item>
+    <item msgid="3356591542543137332">"ഉപയോഗ സ്ഥിതിവിവരക്കണക്കുകൾ നേടുക"</item>
+    <item msgid="3073734345226842233">"മൈക്രോഫോൺ മ്യൂട്ടുചെയ്യുക/അൺമ്യൂട്ടുചെയ്യുക"</item>
+    <item msgid="1148142988678569310">"പ്രോജക്‌റ്റ് മീഡിയ"</item>
+    <item msgid="9130014005474445273">"VPN സജീവമാക്കുക"</item>
+    <item msgid="1165192162975045562">"വാൾപേപ്പർ എഴുതുക"</item>
+    <item msgid="7129487923652967258">"അസിസ്റ്റ് ഘടന"</item>
+    <item msgid="1069023208100114540">"അസിസ്റ്റ് സ്‌ക്രീൻഷോട്ട്"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"ലൊക്കേഷൻ"</item>
+    <item msgid="8677040780775113033">"ലൊക്കേഷൻ"</item>
+    <item msgid="1660743989948992916">"ലൊക്കേഷൻ"</item>
+    <item msgid="8791172739860195290">"വൈബ്രേറ്റുചെയ്യുക"</item>
+    <item msgid="383413555642128046">"കോൺടാക്റ്റുകൾ റീഡുചെയ്യുക"</item>
+    <item msgid="3654594895269697313">"കോൺടാക്റ്റുകൾ പരിഷ്‌ക്കരിക്കുക"</item>
+    <item msgid="7928393476362362538">"കോൾ ലോഗ് റീഡുചെയ്യുക"</item>
+    <item msgid="6248591205254641116">"കോൾ ലോഗ് പരിഷ്‌ക്കരിക്കുക"</item>
+    <item msgid="6093344633066170692">"കലണ്ടർ റീഡുചെയ്യുക"</item>
+    <item msgid="1334886368750347692">"കലണ്ടർ പരിഷ്‌ക്കരിക്കുക"</item>
+    <item msgid="1638204101698708656">"ലൊക്കേഷൻ"</item>
+    <item msgid="2154671955760380322">"അറിയിപ്പ് പോസ്റ്റുചെയ്യുക"</item>
+    <item msgid="4282477730595931828">"ലൊക്കേഷൻ"</item>
+    <item msgid="4891423912898525905">"ഫോണ്‍ വിളിക്കുക"</item>
+    <item msgid="2623604824935968113">"SMS/MMS വായിക്കുക"</item>
+    <item msgid="4420177125221176306">"SMS/MMS എഴുതുക"</item>
+    <item msgid="3986142739951490025">"SMS/MMS നേടുക"</item>
+    <item msgid="3984213795861739778">"SMS/MMS നേടുക"</item>
+    <item msgid="3656243523752472788">"SMS/MMS നേടുക"</item>
+    <item msgid="8105802370238551510">"SMS/MMS നേടുക"</item>
+    <item msgid="1407766984645388488">"SMS/MMS അയയ്‌ക്കുക"</item>
+    <item msgid="3527273606643794973">"SMS/MMS വായിക്കുക"</item>
+    <item msgid="4370895547001583812">"SMS/MMS എഴുതുക"</item>
+    <item msgid="4218544235221631789">"ക്രമീകരണങ്ങൾ പരിഷ്‌ക്കരിക്കുക"</item>
+    <item msgid="736541391767350377">"മുകളിൽ ഡ്രോ ചെയ്യുക"</item>
+    <item msgid="5530815681721654194">"ആക്‌സസ്സ് അറിയിപ്പുകൾ"</item>
+    <item msgid="781213371706962767">"ക്യാമറ"</item>
+    <item msgid="1720492593061838172">"ഓഡിയോ റെക്കോർഡുചെയ്യുക"</item>
+    <item msgid="3493046322001257041">"ഓഡിയോ പ്ലേ ചെയ്യുക"</item>
+    <item msgid="136815868796597058">"ക്ലിപ്പ്ബോർഡ് റീഡുചെയ്യുക"</item>
+    <item msgid="5238692940326972503">"ക്ലിപ്പ്ബോർഡ് പരിഷ്‌ക്കരിക്കുക"</item>
+    <item msgid="5753789168376302997">"മീഡിയ ബട്ടണുകൾ"</item>
+    <item msgid="3265262911688671938">"ഓഡിയോ ഫോക്കസ്"</item>
+    <item msgid="2098976479485046797">"മൊത്തം വോളിയം"</item>
+    <item msgid="5660213838861789350">"വോയ്‌സ് വോളിയം"</item>
+    <item msgid="7983336752371254444">"റിംഗ് വോളിയം"</item>
+    <item msgid="7878027809189330917">"മീഡിയ വോളിയം"</item>
+    <item msgid="7260546305036218513">"അലാറം വോളിയം"</item>
+    <item msgid="9103719301075748925">"അറിയിപ്പ് വോളിയം"</item>
+    <item msgid="7025966722295861512">"ബ്ലൂടൂത്ത് വോളിയം"</item>
+    <item msgid="4665183401128289653">"സജീവമായി തുടരുക"</item>
+    <item msgid="8584357129746649222">"ലൊക്കേഷൻ"</item>
+    <item msgid="7669257279311110599">"ലൊക്കേഷൻ"</item>
+    <item msgid="3459320345690097795">"ഉപയോഗ സ്ഥിതിവിവരക്കണക്കുകൾ നേടുക"</item>
+    <item msgid="1312534577834048535">"മൈക്രോഫോൺ മ്യൂട്ടുചെയ്യുക/അൺമ്യൂട്ടുചെയ്യുക"</item>
+    <item msgid="5906017727368097853">"പ്രോജക്‌റ്റ് മീഡിയ"</item>
+    <item msgid="2486614710846178542">"VPN സജീവമാക്കുക"</item>
+    <item msgid="5586547561693629602">"വാൾപേപ്പർ എഴുതുക"</item>
+    <item msgid="32794179825485062">"അസിസ്റ്റ് ഘടന"</item>
+    <item msgid="7872852746938272552">"അസിസ്റ്റ് സ്‌ക്രീൻഷോട്ട്"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"ഹ്രസ്വമായത്"</item>
     <item msgid="2560532955514699713">"ഇടത്തരം"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"കുറവ്"</item>
     <item msgid="4212263919458209842">"കഴിയാറായി"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"ഓഫ്"</item>
-    <item msgid="5656544177755411222">"പരിമിത തടസ്സങ്ങൾ"</item>
-    <item msgid="8735337502532332056">"തടസ്സങ്ങളൊന്നുമില്ല"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"സാധാരണം"</item>
     <item msgid="866544120205026771">"ഇടത്തരം"</item>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 1757b3f..8a4dfd9 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD കാർഡ്"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"പ്രോക്‌സി ക്രമീകരണങ്ങൾ"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ശരി"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"അല്ല"</string>
-    <string name="forget" msgid="7267115980248732932">"മറക്കുക"</string>
+    <string name="forget" msgid="1400428660472591263">"മറക്കുക"</string>
+    <string name="save" msgid="879993180139353333">"സംരക്ഷിക്കുക"</string>
+    <string name="done" msgid="6942539184162713160">"പൂർത്തിയായി"</string>
     <string name="settings_label" msgid="1626402585530130914">"ക്രമീകരണങ്ങൾ"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"ക്രമീകരണങ്ങൾ"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"ക്രമീകരണങ്ങളിലേയ്ക്ക്"</string>
@@ -374,7 +372,6 @@
     <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_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>
@@ -419,8 +416,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"പാറ്റേൺ"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"പിൻ"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"പാസ്‌വേഡ്"</string>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"നിങ്ങൾ സ്‌ക്രീൻ ലോക്ക് സജ്ജമാക്കിക്കഴിഞ്ഞാൽ, ക്രമീകരണം &gt; സുരക്ഷ എന്നതിൽ നിങ്ങളുടെ വിരലടയാളം സജ്ജമാക്കാനുമാകും."</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>
@@ -522,8 +518,7 @@
     <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>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"ലൊക്കേഷൻ കൃത്യത മെച്ചപ്പെടുത്താൻ, അപ്ലിക്കേഷനുകളും സേവനങ്ങളും Bluetooth ഓഫാണെങ്കിൽപ്പോലും Bluetooth ഉപകരണങ്ങൾ ലഭ്യമാണോയെന്നറിയാൻ സ്‌കാൻ ചെയ്യും. നിങ്ങൾക്ക് <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>സ്‌കാനിംഗ് ക്രമീകരണത്തിൽ<xliff:g id="LINK_END_1">LINK_END</xliff:g> ഇത് മാറ്റാനാകും."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"ഇതിൽ കണക്റ്റുചെയ്യുക..."</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>
@@ -589,8 +584,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"ലൊക്കേഷൻ കൃത്യത മെച്ചപ്പെടുത്താൻ, അപ്ലിക്കേഷനുകളും സേവനങ്ങളും Wi‑Fi ഓഫാണെങ്കിൽപ്പോലും Wi‑Fi നെറ്റ്‌വർക്കുകൾക്കായി സ്‌കാൻ ചെയ്യും. നിങ്ങൾക്ക് <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>സ്‌കാനിംഗ് ക്രമീകരണത്തിൽ<xliff:g id="LINK_END_1">LINK_END</xliff:g> ഇത് മാറ്റാനാകും."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"വീണ്ടും കാണിക്കരുത്"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"സുഷുപ്‌തിയിലായിരിക്കുമ്പോഴും Wi‑Fi സജീവമായി നിർത്തുക"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"സുഷുപ്‌തിയിലാകുമ്പോഴും Wi‑Fi സജീവമാണ്"</string>
@@ -607,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi ഡയറക്‌ട്"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"സ്‌കാൻ ചെയ്യുക"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"വിപുലമായത്"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"അപ്ലിക്കേഷനുകൾ കാണിക്കുക"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"വൈഫൈ ശക്തി കാണിക്കുക"</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>
@@ -666,6 +658,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"കണക്റ്റുചെയ്യുക"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"ഈ നെറ്റ്‌വർക്കിൽ ഇന്റർനെറ്റ് ആക്‌സസ്സ് ഇല്ല. ഏതുവിധേനയും ഈ നെറ്റ്‌വർക്ക് ഉപയോഗിക്കണോ?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"ഈ നെറ്റ്‌വർക്കിനായി വീണ്ടും ആവശ്യപ്പെടരുത്"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"കണക്റ്റുചെയ്യുക"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"നെറ്റ്‌വർക്കിൽ കണക്റ്റുചെയ്യുന്നതിൽ പരാജയപ്പെട്ടു"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"മറക്കുക"</string>
@@ -737,14 +731,12 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi തിരഞ്ഞെടുത്തിരിക്കുന്നു"</item>
     <item msgid="5267397515594230396">"സെല്ലുലാർ തിരഞ്ഞെടുത്തിരിക്കുന്നു"</item>
-    <item msgid="3132912693346866895">"Wi-Fi മാത്രം"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wi-Fi കോളിംഗ് ഓണായിരുന്നാൽ, നിങ്ങളുടെ മുൻഗണനയെയും ഏത് സിഗ്നലാണ് ദൃഢമെന്നതിനെയും ആശ്രയിച്ച് ഫോണിന് Wi-Fi നെറ്റ്‌വർക്കുകൾ അല്ലെങ്കിൽ കാരിയർ നെറ്റ്‌വർക്ക് വഴിയോ കോളുകൾ റൂട്ട് ചെയ്യാനാകും. ഈ ഫീച്ചർ ഓണാക്കുന്നതിനുമുമ്പ്, നിരക്കുകളും മറ്റ് വിശദാംശങ്ങളും അറിയുന്നതിന് നിങ്ങളുടെ കാരിയറെ ബന്ധപ്പെടുക."</string>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wi-Fi കോളിംഗ് ഓണായിരിക്കുമ്പോൾ, നിങ്ങളുടെ മുൻഗണനയും ഏത് സിഗ്നലാണ് ശക്തമെന്നതും അടിസ്ഥാനമാക്കി ഫോണിന് Wi-Fi നെറ്റ്‌വർക്കോ കാരിയർ നെറ്റ്‌വർക്കോ വഴി കോളുകൾ റൂട്ട് ചെയ്യാനാകും. ഈ ഫീച്ചർ ഓണാക്കുന്നതിനുമുമ്പ്, നിരക്കുകളും മറ്റ് വിശദാംശങ്ങളും അറിയുന്നതിന് നിങ്ങളുടെ കാരിയറെ ബന്ധപ്പെടുക."</string>
     <string name="home_settings" msgid="212375129455718176">"ഹോം"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ദൃശ്യമാക്കുക"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ശബ്‌ദം"</string>
@@ -916,12 +908,12 @@
     <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="5128673488173839077">"അപ്ലിക്കേഷനുകളും അപ്ലിക്കേഷൻ ഡാറ്റയും"</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_media_misc_usage" msgid="235452944021647124">"പലവക"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"മറ്റ് ഫയലുകൾ"</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>
@@ -954,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"അൺമൗണ്ടുചെയ്യൽ പുരോഗതിയിലാണ്"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"സംഭരണയിടം കഴിഞ്ഞു"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"സമന്വയിപ്പിക്കൽ പോലുള്ള ചില സിസ്റ്റം പ്രവർത്തനങ്ങൾ ശരിയായി പ്രവർത്തിക്കണമെന്നില്ല. അപ്ലിക്കേഷനുകളോ മീഡിയ ഉള്ളടക്കമോ പോലുള്ള ഇനങ്ങൾ ഇല്ലാതാക്കുന്നതിലൂടെയോ അൺപിൻ ചെയ്യുന്നതിലൂടെയോ ഇടം ശൂന്യമാക്കുന്നത് പരീക്ഷിക്കുക."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"പേരുമാറ്റുക"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"മൗണ്ടുചെയ്യുക"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"നിരസിക്കുക"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"മായ്‌ക്കുക, ഫോർമാറ്റുചെയ്യുക"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"ആന്തരിക സംഭരണമായി മായ്‌ക്കുക, ഫോർമാറ്റുചെയ്യുക"</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>
@@ -964,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"നിങ്ങളുടെ കമ്പ്യൂട്ടറിലെ MIDI സോഫ്‌റ്റ്‌വെയർ ഉപയോഗിച്ച് USB-യിൽ പ്രവർത്തിക്കാൻ MIDI പ്രവർത്തനക്ഷമമാക്കിയ അപ്ലിക്കേഷനുകളെ അനുവദിക്കുന്നു."</string>
     <string name="storage_other_users" msgid="808708845102611856">"മറ്റ് ഉപയോക്താക്കൾ"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"ഉപകരണ സംഭരണം"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"നീക്കംചെയ്യാനാവുന്ന സംഭരണം"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> സൗജന്യം (മൊത്തം <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> മൗണ്ടുചെയ്‌തു"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g> മൗണ്ടുചെയ്യാനായില്ല"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> എന്നതിനെ സുരക്ഷിതമായി നിരസിച്ചു"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g> എന്നതിനെ സുരക്ഷിതമായി നിരസിക്കാനായില്ല"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> എന്നതിനെ ഫോർമാറ്റുചെയ്‌തു"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> ഫോർമാറ്റുചെയ്യാനായില്ല"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"സംഭരണത്തിന്റെ പേരുമാറ്റുക"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"ഫോർമാറ്റുചെയ്‌തശേഷം, നിങ്ങൾക്ക് ഈ <xliff:g id="NAME_0">^1</xliff:g> മറ്റ് ഉപകരണങ്ങളിൽ ഉപയോഗിക്കാനാകും. \n\nഈ <xliff:g id="NAME_1">^1</xliff:g> എന്നതിലെ എല്ലാ വിവരവും മായ്‌ക്കും. ആദ്യം ബാക്കപ്പുചെയ്യുന്നത് പരിഗണിക്കുക. \n\n"<b>"ഫോട്ടോകളും മറ്റ് മീഡിയയും ബാക്കപ്പുചെയ്യുക"</b>" \nനിങ്ങളുടെ മീഡിയ ഫയലുകളെ ഈ ഉപകരണത്തിലെ ഇതര സംഭരണയിടത്തിലേക്ക് നീക്കുകയോ USB കേബിൾ ഉപയോഗിച്ച് അവയെ ഒരു കമ്പ്യൂട്ടറിലേക്ക് മാറ്റുകയോ ചെയ്യുക. \n\n"<b>"അപ്ലിക്കേഷനുകൾ ബാക്കപ്പുചെയ്യുക"</b>" \nഈ <xliff:g id="NAME_6">^1</xliff:g> എന്നതിൽ സംഭരിച്ചിരിക്കുന്ന എല്ലാ അപ്ലിക്കേഷനുകളും അൺഇൻസ്റ്റാൾ ചെയ്യുകയും അവയുടെ വിവരം മായ്‌ക്കുകയും ചെയ്യും. ഈ അപ്ലിക്കേഷനുകൾ സൂക്ഷിക്കാൻ, അവയെ ഈ ഉപകരണത്തിലെ ഇതര സംഭരണയിടത്തിലേക്ക് നീക്കുക."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"നിങ്ങൾ ഈ <xliff:g id="NAME_0">^1</xliff:g> ഒഴിവാക്കുമ്പോൾ, അതിൽ സംഭരിച്ചിരിക്കുന്ന അപ്ലിക്കേഷനുകളുടെ പ്രവർത്തനം നിലയ്‌ക്കുകയും അതിൽ സംഭരിച്ചിരിക്കുന്ന മീഡിയ ഫയലുകൾ അത് തിരികെ ചേർക്കുന്നതുവരെ ലഭ്യമാകുകയുമില്ല ."</b>" \n\nഈ <xliff:g id="NAME_1">^1</xliff:g> എന്നത് ഈ ഉപകരണത്തിൽ മാത്രം പ്രവർത്തിക്കാനാണ് ഫോർമാറ്റുചെയ്‌തിരിക്കുന്നത്. ഇത് മറ്റുള്ളവയിൽ പ്രവർത്തിക്കുകയില്ല."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"നിങ്ങളുടെ <xliff:g id="NAME">^1</xliff:g> സജ്ജമാക്കുക"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"പോർട്ടബിൾ സംഭരണമായി ഉപയോഗിക്കുക"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"ഉപകരണങ്ങൾ തമ്മിൽ ഫോട്ടോകളും മറ്റ് മീഡിയയും നീക്കുന്നതിനായി."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"ആന്തരിക സംഭരണമായി ഉപയോഗിക്കുക"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"അപ്ലിക്കേഷനുകളും ഫോട്ടോകളും ഉൾപ്പെടെ ഈ ഉപകരണത്തിൽ മാത്രമായി എന്തും സംഭരിക്കാനായി. ഇത് മറ്റ് ഉപകരണങ്ങളിൽ പ്രവർത്തിക്കുന്നതിനെ തടയാൻ ഫോർമാറ്റുചെയ്യേണ്ടതുണ്ട്."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"ആന്തരിക സംഭരണമായി ഫോർമാറ്റുചെയ്യൂ"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"ഇത് സുരക്ഷിതമാക്കാൻ <xliff:g id="NAME_0">^1</xliff:g> എന്നത് ഇതിന് ഫോർമാറ്റുചെയ്യേണ്ടതുണ്ട്. \n\nഫോർമാറ്റുചെയ്‌തതിനുശേഷം, ഈ <xliff:g id="NAME_1">^1</xliff:g> ഈ ഉപകരണത്തിൽ മാത്രമേ പ്രവർത്തിക്കൂ. \n\n"<b>"ഫോർമാറ്റുചെയ്യുന്നത്, <xliff:g id="NAME_2">^1</xliff:g> എന്നതിൽ നിലവിൽ സംഭരിച്ചിരിക്കുന്ന എല്ലാ വിവരവും മായ്ക്കാനിടയാക്കും."</b>" വിവരം നഷ്‌ടപ്പെടുന്നത് ഒഴിവാക്കാൻ, അത് ബാക്കപ്പുചെയ്യുന്നത് പരിഗണിക്കുക."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"മായ്‌ക്കുക, ഫോർമാറ്റുചെയ്യുക"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> ഫോർമാറ്റുചെയ്യുന്നു…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"അത് ഫോർമാറ്റുചെയ്യുമ്പോൾ <xliff:g id="NAME">^1</xliff:g> നീക്കംചെയ്യരുത്."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"പുതിയ സംഭരണത്തിലേക്ക് വിവരം നീക്കുക"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"നിങ്ങൾക്ക് ഈ പുതിയ <xliff:g id="NAME">^1</xliff:g> എന്നതിലേക്ക് ഫോട്ടോകളും ഫയലുകളും അപ്ലിക്കേഷൻ വിവരവും നീക്കാനാകും. \n\nനീക്കാൻ ഏകദേശം <xliff:g id="TIME">^2</xliff:g> സമയമെടുക്കുകയും ആന്തരിക സംഭരണത്തിൽ നിന്ന് <xliff:g id="SIZE">^3</xliff:g> സൃഷ്‌ടിക്കുകയും ചെയ്യും. പ്രവർത്തനം നടന്നുകൊണ്ടിരിക്കുമ്പോൾ ചില അപ്ലിക്കേഷനുകൾ പ്രവർത്തിക്കില്ല."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"ഇപ്പോൾ നീക്കുക"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"പിന്നീട് നീക്കുക"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"വിവരം ഇപ്പോൾ നീക്കുക"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"നീക്കാൻ ഏകദേശം <xliff:g id="TIME">^1</xliff:g> എടുക്കുന്നു. ഇത് ആന്തരികസംഭരണത്തിന്റെ <xliff:g id="SIZE">^2</xliff:g> ലഭ്യമാക്കും."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"നീക്കുക"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"വിവരം നീക്കുന്നു ..."</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"നീക്കുന്ന സമയത്ത്: \n• <xliff:g id="NAME">^1</xliff:g> നീക്കംചെയ്യരുത്. \n• ചില അപ്ലിക്കേഷനുകൾ ശരിയായി പ്രവർത്തിക്കില്ല. \n• ഉപകരണം ചാർജ്ജുചെയ്‌തുതന്നെ സൂക്ഷിക്കുക."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> തയ്യാറായിരിക്കുന്നു"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"ഫോട്ടോകൾക്കും മറ്റ് മീഡിയയ്‌ക്കുമൊപ്പം ഉപയോഗിക്കാൻ നിങ്ങളുടെ <xliff:g id="NAME">^1</xliff:g> തയ്യാറായിരിക്കുന്നു."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"നിങ്ങളുടെ പുതിയ <xliff:g id="NAME">^1</xliff:g> പ്രവർത്തിക്കുന്നു. \n\nഫോട്ടോകൾ, ഫയലുകൾ അപ്ലിക്കേഷൻ വിവരം എന്നിവ ഈ ഉപകരണത്തിലേക്ക് നീക്കാൻ, ക്രമീകരണം &gt; സംഭരണം എന്നതിലേക്ക് പോകുക."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> നീക്കുക"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<xliff:g id="NAME_0">^2</xliff:g> എന്നതിലേക്ക് <xliff:g id="APP">^1</xliff:g> എന്നതും അതിന്റെ വിവരവും നീക്കുന്നതിന് കുറച്ച് നിമിഷങ്ങൾ മാത്രമേയെടുക്കൂ. നീക്കുന്ന പ്രവർത്തനം പൂർത്തിയാകുന്നതുവരെ നിങ്ങൾക്ക് അപ്ലിക്കേഷൻ ഉപയോഗിക്കാനാവില്ല. \n\nനീക്കുന്നതിനിടെ <xliff:g id="NAME_1">^2</xliff:g> നീക്കംചെയ്യരുത്."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> നീക്കുന്നു…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"നീക്കുന്നതിനിടെ <xliff:g id="NAME">^1</xliff:g> നീക്കംചെയ്യരുത്. \n\nനീക്കുന്ന പ്രവർത്തനം പൂർത്തിയാകുന്നതുവരെ ഈ ഉപകരണത്തിലെ <xliff:g id="APP">^2</xliff:g> അപ്ലിക്കേഷൻ ലഭ്യമാകില്ല."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"നീക്കുന്നത് റദ്ദാക്കുക"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"ബാറ്ററി നില"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ബാറ്ററി നില"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN-കൾ"</string>
@@ -1008,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"സ്ഥിരമായതിലേക്ക് പുനഃസജ്ജമാക്കുക"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"സ്ഥിര APN ക്രമീകരണങ്ങൾ പുനഃസജ്ജീകരിക്കൽ പൂർത്തിയാക്കി."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"നെറ്റ്‌വർക്ക് ക്രമീകരണം റീസെറ്റുചെയ്യുക"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">\n\n<li>"Wifi"</li>\n<li>"മൊബൈൽ ഡാറ്റ"</li>\n<li>"Bluetooth"</li>" എന്നിവയുൾപ്പെടെ ഫാക്‌ടറി ഡിഫോൾട്ടുകളിലേക്ക് ഇത് നെറ്റ്‌വർക്കിംഗുമായി ബന്ധപ്പെട്ട എല്ലാ ക്രമീകരണത്തെയും റീസെറ്റുചെയ്യും."</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"ഇത് ഇവയുൾപ്പെടെ എല്ലാ നെറ്റ്‌വർക്ക് ക്രമീകരണവും റീസെറ്റുചെയ്യും:\n\n"<li>"Wi‑Fi"</li>\n<li>"സെല്ലുലാർ ഡാറ്റ"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"ക്രമീകരണം റീസെറ്റുചെയ്യുക"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"എല്ലാ നെറ്റ്‌വർക്കിംഗ് ക്രമീകരണവും റീസെറ്റുചെയ്യണോ? നിങ്ങൾക്ക് ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാവില്ല!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"എല്ലാ നെറ്റ്‌വർക്കിംഗ് ക്രമീകരണവും റീസെറ്റുചെയ്യണോ? നിങ്ങൾക്ക് ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാവില്ല!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"ക്രമീകരണം റീസെറ്റുചെയ്യുക"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"ഒരു നെറ്റ്‌വർക്ക് ക്രമീകരണ റീസെറ്റ് സ്ഥിരീകരിക്കാൻ നിങ്ങൾ അൺലോക്ക് പാറ്റേൺ വരയ്‌ക്കേണ്ടതുണ്ട്."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"റീസെറ്റുചെയ്യണോ?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"നെറ്റ്‌വർക്ക് ക്രമീകരണം റീസെറ്റുചെയ്യുക"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"നെറ്റ്‌വർക്ക് ക്രമീകരണം റീസെറ്റുചെയ്‌തു"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"ഉപകരണം പുനഃസജ്ജീകരിക്കുക"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"ഫാക്‌ടറി ഡാറ്റ പുനഃസജ്ജീകരണം"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ഇത് നിങ്ങളുടെ ടാബ്‌ലെറ്റിന്റെ "<b>"ആന്തരിക സംഭരണത്തിൽ"</b>" നിന്നും ഇവയുൾപ്പെടെ എല്ലാ ഡാറ്റയും മായ്ക്കും:\n\n"<li>"നിങ്ങളുടെ Google അക്കൗണ്ട്"</li>\n<li>"സി‌സ്റ്റത്തിന്റെയും അപ്ലിക്കേഷന്റെയും ഡാറ്റയും ക്രമീകരണങ്ങളും"</li>\n<li>"ഡൗൺലോഡുചെ‌യ്‌ത അപ്ലിക്കേഷനുകൾ"</li></string>
@@ -1030,9 +1065,8 @@
     <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="1062841478823409667">"നിങ്ങളുടെ എല്ലാ വ്യക്തിഗത വിവരവും ഡൗൺലോഡ് ചെയ്‌ത അപ്ലിക്കേഷനുകളും മായ്‌ക്കണോ? നിങ്ങൾക്ക് ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാകില്ല!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"എല്ലാം മായ്ക്കുക"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"ഈ ഉപയോക്താവിനായി ഫാക്‌ടറി പുനഃസജ്ജമാക്കൽ ലഭ്യമല്ല"</string>
@@ -1049,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"വോയ്‌സ് മെയിൽ, കോൾ കൈമാറൽ, കോൾ വെയ്‌റ്റിംഗ്, കോളർ ഐഡി എന്നിവ സജ്ജീകരിക്കുക"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB ടെതറിംഗ്"</string>
@@ -1082,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"സഹായം"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"സെല്ലുലാർ നെറ്റ്‌വർക്കുകൾ"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"മൊബൈൽ പ്ലാൻ"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"സ്ഥിര SMS അപ്ലിക്കേഷൻ"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS അപ്ലിക്കേഷൻ"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS അപ്ലിക്കേഷൻ മാറ്റണോ?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"നിങ്ങളുടെ SMS അപ്ലിക്കേഷനായി <xliff:g id="CURRENT_APP">%2$s</xliff:g> എന്നതിനുപകരം <xliff:g id="NEW_APP">%1$s</xliff:g> ഉപയോഗിക്കണോ?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"നിങ്ങളുടെ SMS അപ്ലിക്കേഷനായി <xliff:g id="NEW_APP">%s</xliff:g> ഉപയോഗിക്കണോ?"</string>
@@ -1113,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ലൊക്കേഷൻ നിർണ്ണയിക്കാൻ GPS ഉപയോഗിക്കുക"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"സ്കാൻ ചെയ്യുന്നു"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"സ്കാൻ ചെയ്യുന്നു"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi സ്‌കാനിംഗ്"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Wi‑Fi ഓഫാണെങ്കിൽപ്പോലും Wi‑Fi ഉപകരണങ്ങൾ ലഭ്യമാണോയെന്ന് സ്‌കാൻ ചെയ്യാൻ അപ്ലിക്കേഷനുകളെയും സേവനങ്ങളെയും അനുവദിച്ചുകൊണ്ട് ലൊക്കേഷൻ മെച്ചപ്പെടുത്തുക"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth സ്‌കാനിംഗ്"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Bluetooth ഓഫാണെങ്കിൽപ്പോലും Bluetooth ഉപകരണങ്ങൾ ലഭ്യമാണോയെന്നറിയുന്നതിന് സ്‌കാൻ ചെയ്യാൻ നിങ്ങൾക്ക് സിസ്റ്റം സേവനങ്ങളെ അനുവദിച്ചുകൊണ്ട് ലൊക്കേഷൻ മെച്ചപ്പെടുത്തുക"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi, സെല്ലുലാർ നെറ്റ്‌വർക്ക് ലൊക്കേഷൻ"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"നിങ്ങളുടെ ലൊക്കേഷൻ വേഗത്തിൽ നിർണ്ണയിക്കാൻ Google-ന്റെ ലൊക്കേഷൻ സേവനം ഉപയോഗിക്കാൻ അപ്ലിക്കേഷനുകളെ അനുവദിക്കുക. അജ്ഞാത ലൊക്കേഷൻ ഡാറ്റ ശേഖരിച്ച് Google-ന് അയയ്‌ക്കും."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi നിർണ്ണയിച്ച ലൊക്കേഷൻ"</string>
@@ -1158,11 +1194,15 @@
     <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="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"തുടരാൻ നിങ്ങളുടെ ഉപകരണ പാറ്റേൺ ഉപയോഗിക്കുക."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"തുടരാൻ ഉപകരണ പിൻ നൽകുക."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"തുടരാൻ നിങ്ങളുടെ ഉപകരണത്തിന്റെ പാസ്‌വേഡ് നൽകുക."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"പിൻ തെറ്റാണ്"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"പാസ്‌വേഡ് തെറ്റാണ്"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"പാറ്റേൺ തെറ്റാണ്"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"ഉപകരണ സുരക്ഷ"</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>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"സഹായത്തിനായി മെനു അമർത്തുക."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"പൂർത്തിയായിക്കഴിഞ്ഞാൽ വിരൽ എടുക്കുക"</string>
@@ -1184,8 +1224,7 @@
     <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" msgid="6909161623701848863">"നിരവധി തെറ്റായ ശ്രമങ്ങൾ. <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>
@@ -1236,7 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"വലുപ്പമനുസരിച്ച് അടുക്കുക"</string>
     <string name="show_running_services" msgid="5736278767975544570">"പ്രവർത്തിക്കുന്ന സേവനങ്ങൾ ദൃശ്യമാക്കുക"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"കാഷെചെയ്‌ത പ്രോസസ്സുകൾ ദൃശ്യമാക്കുക"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"സ്ഥിര അടിയന്തിര അപ്ലിക്കേഷൻ"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"അടിയന്തിര അപ്ലിക്കേഷൻ"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"അപ്ലിക്കേഷൻ മുൻഗണനകൾ പുനഃസജ്ജമാക്കുക"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"അപ്ലിക്കേഷൻ മുൻഗണനകൾ പുനഃസജ്ജമാക്കണോ?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"ഇത് ഇനിപ്പറയുന്നവയ്‌ക്കായുള്ള എല്ലാ മുൻഗണനകളും പുനഃസജ്ജമാക്കും:\n\n "<li>"പ്രവർത്തനരഹിതമാക്കിയ അപ്ലിക്കേഷനുകൾ"</li>\n" "<li>"പ്രവർത്തനരഹിതമാക്കിയ അപ്ലിക്കേഷൻ അറിയിപ്പുകൾ"</li>\n" "<li>"പ്രവർത്തനങ്ങൾക്കുള്ള സ്ഥിര അപ്ലിക്കേഷനുകൾ"</li>\n" "<li>"അപ്ലിക്കേഷനുകൾക്കുള്ള പശ്ചാത്തല ഡാറ്റാ നിയന്ത്രണങ്ങൾ"</li>\n" "<li>"എല്ലാ അനുമതി നിയന്ത്രണങ്ങളും"</li>\n\n" നിങ്ങൾക്ക് അപ്ലിക്കേഷൻ ഡാറ്റയൊന്നും നഷ്‌ടമാകില്ല."</string>
@@ -1440,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ഒരു ഫയലിൽ എല്ലാ ബ്ലൂടൂത്ത് HCI പാക്കറ്റുകളും ക്യാപ്‌ചർ ചെയ്യുക"</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="select_logd_size_title" msgid="7433137108348553508">"ലോഗർ ബഫർ വലുപ്പം"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 മണിക്കൂർ"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"ഒരു ദിവസം"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"സിസ്റ്റം ദൃശ്യമാക്കുക"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"സിസ്റ്റം മറയ്‌ക്കുക"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss ഉപയോഗിക്കുക"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"സ്ഥിതിവിവരക്കണക്ക് തരം"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"പശ്ചാത്തലം"</string>
@@ -1838,7 +1876,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_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>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"ഉപയോക്താവ്"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"നിയന്ത്രിത പ്രൊഫൈൽ"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"പുതിയ ഉപയോക്താവിനെ ചേർക്കണോ?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"കൂടുതൽ ഉപയോക്താക്കളെ സൃഷ്‌ടിച്ചുകൊണ്ട് ഈ ഉപകരണം മറ്റ് ആളുകളുമായി നിങ്ങൾക്ക് പങ്കിടാനാവും. സ്വന്തം അപ്ലിക്കേഷനുകളും വാൾപേപ്പറും അതിൽ കൂടുതൽ കാര്യങ്ങളും ഉപയോഗിച്ചുകൊണ്ട് ഇഷ്‌ടാനുസൃതമാക്കുന്നതിന് ഓരോ ഉപയോക്താക്കൾക്കും അവരുടേതായ ഒരു ഇടം ലഭിക്കുന്നു. Wi‑Fi പോലെ എല്ലാവരെയും ബാധിക്കുന്ന ഉപകരണ ക്രമീകരണങ്ങളും ഉപയോക്താക്കൾക്ക് ക്രമീകരിക്കാനാവും.\n\nനിങ്ങൾ ഒരു പുതിയ ഉപയോക്താവിനെ ചേർക്കുമ്പോൾ, ആ വ്യക്തിയ്‌ക്ക് അവരുടെ ഇടം സജ്ജീകരിക്കേണ്ടതുണ്ട്.\n\nമറ്റ് എല്ലാ ഉപയോക്താക്കൾക്കുമായി ഏതൊരു ഉപയോക്താവിനും അപ്ലിക്കേഷനുകൾ അപ്‌ഡേറ്റുചെയ്യാനാവും."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"കൂടുതൽ ഉപയോക്താക്കളെ സൃഷ്‌ടിച്ചുകൊണ്ട് ഈ ഉപകരണം മറ്റ് ആളുകളുമായി നിങ്ങൾക്ക് പങ്കിടാനാവും. സ്വന്തം അപ്ലിക്കേഷനുകളും വാൾപേപ്പറും മറ്റ് കാര്യങ്ങളും ഉപയോഗിച്ചുകൊണ്ട് ഇഷ്‌ടാനുസൃതമാക്കുന്നതിന് ഓരോ ഉപയോക്താക്കൾക്കും അവരുടേതായ ഒരു ഇടം ലഭിക്കുന്നു. Wi‑Fi പോലെ എല്ലാവരെയും ബാധിക്കുന്ന ഉപകരണ ക്രമീകരണവും ഉപയോക്താക്കൾക്ക് ക്രമീകരിക്കാനാവും.\n\nനിങ്ങൾ ഒരു പുതിയ ഉപയോക്താവിനെ ചേർക്കുമ്പോൾ, ആ വ്യക്തിയ്‌ക്ക് അവരുടെ ഇടം സജ്ജീകരിക്കേണ്ടതുണ്ട്.\n\nമറ്റ് എല്ലാ ഉപയോക്താക്കൾക്കുമായി ഏതൊരു ഉപയോക്താവിനും അപ്ലിക്കേഷനുകൾ അപ്‌ഡേറ്റുചെയ്യാനാവും."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"നിങ്ങൾ ഒരു പുതിയ ഉപയോക്താവിനെ ചേർക്കുമ്പോൾ, ആ വ്യക്തിയ്‌ക്ക് അവരുടെ ഇടം സജ്ജീകരിക്കേണ്ടതുണ്ട്.\n\nമറ്റ് എല്ലാ ഉപയോക്താക്കൾക്കുമായി ഏതൊരു ഉപയോക്താവിനും അപ്ലിക്കേഷനുകൾ അപ്‌ഡേറ്റുചെയ്യാനാവും."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"ഉപയോക്താവിനെ ഇപ്പോൾ സജ്ജീകരിക്കണോ?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"ഉപകരണം എടുത്ത് ഇടം സജ്ജീകരിക്കുന്നതിന് വ്യക്തി ലഭ്യമാണെന്ന് ഉറപ്പാക്കുക"</string>
@@ -2396,6 +2433,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"അടിയന്തര ഐസ് അപ്ലിക്കേഷൻ സ്ഥിര ക്രമീകരണം"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"ആപ്സ് ഡൗൺലോഡ് അപ്ലിക്കേഷൻ സിസ്റ്റം"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"അപ്ലിക്കേഷൻ അനുമതി സുരക്ഷ"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"സ്ഥിര അപ്ലിക്കേഷനുകൾ"</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>
@@ -2410,14 +2448,12 @@
     <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="6948120138640252732">"തടസ്സങ്ങളെ തടയുക"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"മുൻഗണന മാത്രം അനുവദിക്കുന്നു"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"സ്വയമേയുള്ള നയങ്ങൾ"</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_alarms" msgid="7380265858042606857">"അലാറങ്ങൾ മാത്രം അനുവദിക്കുക"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"തടസ്സപ്പെടുത്തരുത്"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"മുൻഗണന മാത്രം"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"അലാറങ്ങൾ മാത്രം"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"തടസ്സങ്ങളൊന്നുമില്ല"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ഫോൺ റിംഗ്ടോൺ"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"സ്ഥിര അറിയിപ്പ് റിംഗ്‌ടോൺ"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"കോളുകൾക്കായും വൈബ്രേറ്റ് ചെയ്യും"</string>
@@ -2450,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"അറിയിപ്പ് ലിസണറുകളൊന്നും ഇൻസ്റ്റാളുചെയ്‌തിട്ടില്ല."</string>
     <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">"അപ്ലിക്കേഷനുകളൊന്നും കണ്ടീഷനുകൾ നൽകുന്നില്ല."</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d അപ്ലിക്കേഷനുകൾ, വ്യവസ്ഥകൾ നൽകുന്നു</item>
-      <item quantity="one">%d അപ്ലിക്കേഷനുകൾ വ്യവസ്ഥകൾ നൽകുന്നു</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="loading_notification_apps" msgid="5031818677010335895">"അപ്ലിക്കേഷനുകൾ ലോഡുചെയ്യുന്നു..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"എല്ലാം തടയുക"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ഈ അപ്ലിക്കേഷനിൽ നിന്ന് അറിയിപ്പുകൾ ഒരിക്കലും കാണിക്കരുത്"</string>
@@ -2472,17 +2499,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"നയത്തിന്റെ പേര്"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"നയം ചേർക്കുക"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"നയം ഇല്ലാതാക്കുക"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<xliff:g id="RULE">%1$s</xliff:g>\" നയം ഇല്ലാതാക്കണോ?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"ഇല്ലാതാക്കുക"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"നയത്തിന്റെ തരം"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"അജ്ഞാതം"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"നയം കോൺഫിഗർ ചെയ്യുക"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"ഷെഡ്യൂൾ നയം"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"നയം കണ്ടെത്തിയില്ല."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"ദിവസം"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"ഒന്നുമില്ല"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"എല്ലാ ദിവസവും"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"ഒരിക്കലുമില്ല"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> മുതൽ <xliff:g id="END">%2$s</xliff:g> വരെ"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"കോളുകൾ"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"സന്ദേശങ്ങള്‍"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"ഇതിൽ നിന്നുള്ള കോളുകൾ/സന്ദേശങ്ങൾ"</string>
@@ -2492,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"അലാറങ്ങൾ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"ഓർമ്മപ്പെടുത്തലുകൾ"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ഇവന്റുകൾ"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"തിരഞ്ഞെടുത്ത കോളർമാർ"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ആവർത്തിച്ച് വിളിക്കുന്നവർ"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"<xliff:g id="MINUTES">%d</xliff:g> മിനിറ്റ് സമയത്തിനുള്ളിൽ ഒരേ വ്യക്തി തന്നെ രണ്ടാമതും വിളിക്കുകയാണെങ്കിൽ, അത് അനുവദിക്കുക"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>, അടുത്ത ദിവസം"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"എപ്പോഴാണ് \'തടസ്സപ്പെടുത്തുക\' മോഡിലേക്ക് മാറാൻ നിങ്ങൾ താൽപ്പര്യപ്പെടുന്നത്?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"എത്ര സമയത്തേക്ക്?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"അവ്യക്തം"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> മിനിറ്റ്</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> മിനിറ്റ്</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> മണിക്കൂർ</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> മണിക്കൂർ</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"അനിശ്ചിതമായി \'മുൻഗണന അറിയിപ്പുകൾ മാത്രം\'എന്നതിലേക്ക് മാറ്റുക"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> വരെ <xliff:g id="DURATION">%1$d</xliff:g> മിനിറ്റത്തേക്ക് \'മുൻഗണന അറിയിപ്പുകൾ മാത്രം\' എന്നതിലേക്ക് മാറ്റുക</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> വരെ ഒരു മിനിറ്റത്തേക്ക് \'മുൻഗണന അറിയിപ്പുകൾ മാത്രം\' എന്നതിലേക്ക് മാറ്റുക</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> മണിക്കൂർ നേരത്തേക്ക് (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> വരെ) \'മുൻഗണന അറിയിപ്പുകൾ മാത്രം\' എന്നതിലേക്ക് മാറ്റുക</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> വരെ ഒരു മണിക്കൂർ നേരത്തേക്ക് \'മുൻഗണന അറിയിപ്പുകൾ മാത്രം\' എന്നതിലേക്ക് മാറ്റുക</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"അനിശ്ചിതമായി \'അലാറങ്ങൾ മാത്രം\'എന്നതിലേക്ക് മാറ്റുക"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> മിനിറ്റത്തേക്ക് (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> വരെ) \'അലാറങ്ങൾ മാത്രം\' എന്നതിലേക്ക് മാറ്റുക</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> വരെ ഒരു മിനിറ്റത്തേക്ക് \'അലാറങ്ങൾ മാത്രം\' എന്നതിലേക്ക് മാറ്റുക</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> വരെ <xliff:g id="DURATION">%1$d</xliff:g> മണിക്കൂർ നേരത്തേക്ക് \'അലാറങ്ങൾ മാത്രം\' എന്നതിലേക്ക് മാറ്റുക</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> വരെ ഒരു മണിക്കൂർ നേരത്തേക്ക് \'അലാറങ്ങൾ മാത്രം\' എന്നതിലേക്ക് മാറ്റുക</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"അനിശ്ചിതമായി \'തടസ്സപ്പെടുത്തരുത്\' എന്നതിലേക്ക് മാറ്റുക"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> മിനിറ്റത്തേക്ക് (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> വരെ) \'ശല്യപ്പെടുത്തരുത്\' എന്നതിലേക്ക് മാറ്റുക</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>വരെ ഒരു മിനിറ്റത്തേക്ക് \'ശല്യപ്പെടുത്തരുത്\' എന്നതിലേക്ക് മാറ്റുക</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> വരെ <xliff:g id="DURATION">%1$d</xliff:g> മണിക്കൂർ നേരത്തേക്ക് \'ശല്യപ്പെടുത്തരുത്\' എന്നതിലേക്ക് മാറ്റുക</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> വരെ ഒരു മണിക്കൂർ നേരത്തേക്ക് \'ശല്യപ്പെടുത്തരുത്\' എന്നതിലേക്ക് മാറ്റുക</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"\'എല്ലായ്‌പ്പോഴും തടസ്സപ്പെടുത്തുക\' എന്നതിലേക്ക് മാറ്റുക"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ശാശ്വതമായി"</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>
@@ -2565,7 +2659,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> അനുമതികൾ നൽകി</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> അനുമതി നൽകി</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> / <xliff:g id="COUNT_3">%d</xliff:g> അനുമതികൾ നൽകി</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g> അനുമതി നൽകി</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"സ്ഥിരമായ ചിലവ സജ്ജീകരിച്ചു"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"സ്ഥിരമായൊന്നും സജ്ജീകരിച്ചിട്ടില്ല"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"എല്ലാ അപ്ലിക്കേഷനുകളും"</string>
@@ -2576,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"മു‌ൻഗണന"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"തന്ത്രപ്രധാനം"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ഡൊമെയ്‌ൻ URL-കൾ ഉള്ളത്"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"എല്ലാ അപ്ലിക്കേഷനുകളിലുമുള്ള മുൻഗണനകൾ സ്ഥിരമായവകളിലേക്ക് റീസെറ്റുചെയ്യുക"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"സിസ്റ്റം, ഡൗൺലോഡുചെയ്‌ത അപ്ലിക്കേഷനുകൾ എന്നിവ ഉൾപ്പെടെ <xliff:g id="COUNT">%d</xliff:g> അപ്ലിക്കേഷനുകൾ ഇൻസ്റ്റാളുചെയ്‌തു"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"അഡ്‌മിനിസ്ട്രേറ്റർ പ്രവർത്തനരഹിതമാക്കി"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"വിപുലമായത്"</string>
     <string name="unknown_app" msgid="5275921288718717656">"അജ്ഞാത അപ്ലിക്കേഷൻ"</string>
     <string name="choose_profile" msgid="8229363046053568878">"പ്രൊഫൈൽ തിരഞ്ഞെടുക്കുക"</string>
@@ -2592,4 +2688,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> അപ്ലിക്കേഷനുകൾക്ക് അതിന്റെ ഡൊമെയ്ൻ URL-കൾ തുറക്കാനാകും</item>
       <item quantity="one">ഒരു അപ്ലിക്കേഷന് അതിന്റെ ഡൊമെയ്‌ൻ URL-കൾ തുറക്കാനാകും</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"തിരിച്ചറിഞ്ഞില്ല"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"സ്ഥിര അപ്ലിക്കേഷനുകൾ"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"ബ്രൗസർ അപ്ലിക്കേഷൻ"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"സ്ഥിര ബ്രൗസറൊന്നുമില്ല"</string>
+    <string name="default_app" msgid="6864503001385843060">"(സ്ഥിരമായത്)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-mn-rMN/arrays.xml b/res/values-mn-rMN/arrays.xml
index 9ba676d..700a960 100644
--- a/res/values-mn-rMN/arrays.xml
+++ b/res/values-mn-rMN/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"СИМ"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Товчлуур"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"Медиа"</item>
     <item msgid="7924928667052300589">"Төхөөрөмж"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"бүдүүн байршил"</item>
+    <item msgid="5789673140227507995">"сайн байршил"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"чичиргээ"</item>
+    <item msgid="3434165993711230924">"харилцагчдыг унших"</item>
+    <item msgid="616161687718081936">"харилцагчдыг өөрчлөх"</item>
+    <item msgid="7638002295329050091">"дуудлагын жагсаалтыг унших"</item>
+    <item msgid="6546959730920410907">"дуудлагын жагсаалтыг өөрчлөх"</item>
+    <item msgid="446877710771379667">"календарь унших"</item>
+    <item msgid="7674458294386319722">"календарийг өөрчлөх"</item>
+    <item msgid="8281201165558093009">"wi-fi скан"</item>
+    <item msgid="8694611243479480497">"мэдэгдэл"</item>
+    <item msgid="7776439107987345446">"үүрэн скан"</item>
+    <item msgid="514615766544675057">"утас руу залгах"</item>
+    <item msgid="8181415497109310680">"SMS унших"</item>
+    <item msgid="6816551144382117307">"SMS бичих"</item>
+    <item msgid="4600463921908905030">"SMS хүлээн авах"</item>
+    <item msgid="5958926493289432745">"яаралтай SMS хүлээж авах"</item>
+    <item msgid="4945269495221089540">"MMS хүлээн авах"</item>
+    <item msgid="5570472453573929087">"WAP хүлээн авах"</item>
+    <item msgid="7125408150230860501">"SMS илгээх"</item>
+    <item msgid="7080337936612188061">"ICC SMS унших"</item>
+    <item msgid="587124103118495063">"ICC SMS бичих"</item>
+    <item msgid="2320577158869025503">"тохиргоог өөрчлөх"</item>
+    <item msgid="1545733463471924009">"дээр нь нээх"</item>
+    <item msgid="3609046903962454582">"мэдэгдэлд хандах"</item>
+    <item msgid="4671646036128214513">"камера"</item>
+    <item msgid="1097324338692486211">"аудио бичих"</item>
+    <item msgid="5031552983987798163">"аудио тоглуулах"</item>
+    <item msgid="8374996688066472414">"түр санах ойг унших"</item>
+    <item msgid="3045529469061083747">"түр санах ойг өөрчлөх"</item>
+    <item msgid="5124443975763747838">"медиа товч"</item>
+    <item msgid="4547883971364273343">"аудио фокус"</item>
+    <item msgid="2603878814882344450">"үндсэн дууны хэмжээ"</item>
+    <item msgid="7136963238377062018">"хоолойн дууны хэмжээ"</item>
+    <item msgid="4270236897655923007">"хонхны дууны хэмжээ"</item>
+    <item msgid="6325739889222559394">"медиа дууны хэмжээ"</item>
+    <item msgid="5762123934816216821">"сэрүүлгийн дууны хэмжээ"</item>
+    <item msgid="785049718065337473">"мэдэгдлийн дууны хэмжээ"</item>
+    <item msgid="6700305533746877052">"блютүүтийн хэмжээ"</item>
+    <item msgid="2029227495214047094">"сэрүүн байлгах"</item>
+    <item msgid="26109888160231211">"байршлыг хянах"</item>
+    <item msgid="5753382310468855812">"өндөр чадалтай байршлуудыг хянах"</item>
+    <item msgid="3356591542543137332">"ашиглалтын статистик авах"</item>
+    <item msgid="3073734345226842233">"Микрофон хаах/нээх"</item>
+    <item msgid="1148142988678569310">"төслийн медиа"</item>
+    <item msgid="9130014005474445273">"VPN идэвхжүүлэх"</item>
+    <item msgid="1165192162975045562">"ханын зураг бичих"</item>
+    <item msgid="7129487923652967258">"бүтэц өөрчлөх"</item>
+    <item msgid="1069023208100114540">"дэлгэцийн агшинг өөрчлөх"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Байршил"</item>
+    <item msgid="8677040780775113033">"Байршил"</item>
+    <item msgid="1660743989948992916">"Байршил"</item>
+    <item msgid="8791172739860195290">"Чичиргээ"</item>
+    <item msgid="383413555642128046">"Харилцагчдыг унших"</item>
+    <item msgid="3654594895269697313">"Харилцагчдыг өөрчлөх"</item>
+    <item msgid="7928393476362362538">"Дуудлагын жагсаалтыг унших"</item>
+    <item msgid="6248591205254641116">"Дуудлагын жагсаалтыг өөрчлөх"</item>
+    <item msgid="6093344633066170692">"Календарь унших"</item>
+    <item msgid="1334886368750347692">"Календарийг өөрчлөх"</item>
+    <item msgid="1638204101698708656">"Байршил"</item>
+    <item msgid="2154671955760380322">"Пост мэдэгдэл"</item>
+    <item msgid="4282477730595931828">"Байршил"</item>
+    <item msgid="4891423912898525905">"Утас руу залгах"</item>
+    <item msgid="2623604824935968113">"SMS/MMS унших"</item>
+    <item msgid="4420177125221176306">"SMS/MMS бичих"</item>
+    <item msgid="3986142739951490025">"SMS/MMS хүлээн авах"</item>
+    <item msgid="3984213795861739778">"SMS/MMS хүлээн авах"</item>
+    <item msgid="3656243523752472788">"SMS/MMS хүлээн авах"</item>
+    <item msgid="8105802370238551510">"SMS/MMS хүлээн авах"</item>
+    <item msgid="1407766984645388488">"SMS/MMS илгээх"</item>
+    <item msgid="3527273606643794973">"SMS/MMS унших"</item>
+    <item msgid="4370895547001583812">"SMS/MMS бичих"</item>
+    <item msgid="4218544235221631789">"Тохиргоог өөрчлөх"</item>
+    <item msgid="736541391767350377">"Дээр нь нээх"</item>
+    <item msgid="5530815681721654194">"Хандалтын мэдэгдэл"</item>
+    <item msgid="781213371706962767">"Камер"</item>
+    <item msgid="1720492593061838172">"Аудио бичих"</item>
+    <item msgid="3493046322001257041">"Аудио тоглуулах"</item>
+    <item msgid="136815868796597058">"Түр санах ойг унших"</item>
+    <item msgid="5238692940326972503">"Түр санах ойг өөрчлөх"</item>
+    <item msgid="5753789168376302997">"Медиа товч"</item>
+    <item msgid="3265262911688671938">"Аудио фокус"</item>
+    <item msgid="2098976479485046797">"Үндсэн дууны хэмжээ"</item>
+    <item msgid="5660213838861789350">"Хоолойн дууны хэмжээ"</item>
+    <item msgid="7983336752371254444">"Хонхны дууны хэмжээ"</item>
+    <item msgid="7878027809189330917">"Медиа дууны хэмжээ"</item>
+    <item msgid="7260546305036218513">"Сэрүүлгийн дууны хэмжээ"</item>
+    <item msgid="9103719301075748925">"Мэдэгдлийн дууны хэмжээ"</item>
+    <item msgid="7025966722295861512">"Блютүүтийн хэмжээ"</item>
+    <item msgid="4665183401128289653">"Сэрүүн байлгах"</item>
+    <item msgid="8584357129746649222">"Байршил"</item>
+    <item msgid="7669257279311110599">"Байршил"</item>
+    <item msgid="3459320345690097795">"Ашиглалтын статистик авах"</item>
+    <item msgid="1312534577834048535">"Микрофон хаах/нээх"</item>
+    <item msgid="5906017727368097853">"Төслийн медиа"</item>
+    <item msgid="2486614710846178542">"VPN идэвхжүүлэх"</item>
+    <item msgid="5586547561693629602">"Ханын зураг бичих"</item>
+    <item msgid="32794179825485062">"Бүтэц өөрчлөх"</item>
+    <item msgid="7872852746938272552">"Дэлгэцийн агшинг өөрчлөх"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Богино"</item>
     <item msgid="2560532955514699713">"Дундаж"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"бага"</item>
     <item msgid="4212263919458209842">"эгзэгтэй"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Идэвхгүй"</item>
-    <item msgid="5656544177755411222">"Хязгаарлагдмал тасалдалтай"</item>
-    <item msgid="8735337502532332056">"Тасалдал байхгүй"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Хэвийн"</item>
     <item msgid="866544120205026771">"Дундаж"</item>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index a3853ad..ecfb3e9 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD карт"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Прокси тохиргоо"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ТИЙМ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"ҮГҮЙ"</string>
-    <string name="forget" msgid="7267115980248732932">"МАРТАХ"</string>
+    <string name="forget" msgid="1400428660472591263">"Мартах"</string>
+    <string name="save" msgid="879993180139353333">"Хадгалах"</string>
+    <string name="done" msgid="6942539184162713160">"Үйлдлийг гүйцэтгэсэн байна"</string>
     <string name="settings_label" msgid="1626402585530130914">"Тохиргоо"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Тохиргоо"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Тохиргооны товчилбор"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Цэнэглэгчээ залгаад дахин оролдоно уу."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Дэлгэцийн түгжээний PIN буюу нууц үг байхгүй"</string>
     <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>
@@ -419,8 +416,7 @@
     <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>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Та дэлгэцийн цоожоо тохируулсны дараа Тохиргоо &amp; gt; Аюулгүй байдал цэсэнд ороод хурууны хээгээ мөн тохируулж болно."</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>
@@ -512,8 +508,7 @@
     <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>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Байршлын нарийвчлалыг сайжруулахын тулд апп-ууд болон үйлчилгээнүүд нь Bluetooth асаалтгүй байсан ч Bluetooth төхөөрөмжүүдийг скан хийх болно. Та үүнийг <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>скан хийх тохиргоон дотор өөрчилж болно<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Холбох…"</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>
@@ -579,8 +574,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Байршлын нарийвчлалыг сайжруулахын тулд апп-ууд болон үйлчилгээнүүд нь Wi-Fi асаалтгүй байсан ч Wi-Fi сүлжээнүүдийг скан хийх болно. Та үүнийг <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g> скан хийх тохиргоон дотор өөрчилж болно<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Дахиж үл харуулах"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Идэвхгүй үед Wi-Fi-г байлгах"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi унтах үед"</string>
@@ -597,8 +591,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Шууд"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Скан хийх"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Дэлгэрэнгүй"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Апп-уудыг харуулах"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"WiFi хүч харуулах"</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>
@@ -656,6 +648,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ХОЛБОХ"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Энэ сүлжээ нь интернэтэд холбогдоогүй байна. Энэ сүлжээг цааш үргэлжлүүлэн ашиглах уу?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Энэ сүлжээнд дахин бүү асуу"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Холбогдох"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Сүлжээнд холбогдож чадсангүй"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Мартах"</string>
@@ -727,12 +721,10 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi илүү эрхэмлэдэг"</item>
     <item msgid="5267397515594230396">"Үүрэн сүлжээг илүү эрхэмлэдэг"</item>
-    <item msgid="3132912693346866895">"Зөвхөн Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wi-Fi дуудлага асаалттай байгаа үед таны сонголт болон аль дохио илүү хүчтэй байгаагаас шалтгаалан Wi-Fi сүлжээ болон таны операторын сүлжээгээр дамжуулан таны утас дуудлагуудыг хянаж дамжуулна. Энэ горимыг асаахаасаа өмнө өөрийнхөө операторын төлбөр болон бусад дэлгэрэнгүй мэдээллүүдийг шалгаж үзээрэй."</string>
     <string name="home_settings" msgid="212375129455718176">"Нүүр"</string>
@@ -906,12 +898,12 @@
     <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">"Апп (апп өгөгдөл &amp; медиа контент)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Апп &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_music_usage" msgid="1363785144783011606">"Аудио (хөгжим, хонхны ая, файлаат түгээлт гэх мэт.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Янз бүрийн."</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Бусад файл"</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>
@@ -944,6 +936,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Салгалт явагдаж байна"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Сангийн хэмжээ дутагдаж байна"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Синк хийх гэх мэт системийн зарим функц зөв ажиллахгүй байж магадгүй. Апп-ууд эсвэл медиа контент зэрэг зүйлсийг устгах буюу суллах замаар сул зай гаргахыг хичээнэ үү."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Нэр өөрчлөх"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Залгах"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Салгах"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Устгах &amp; хэлбэршүүлэх"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Устгах &amp; дотоод санах ой хэлбэрээр хэлбэршүүлэх"</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>
@@ -954,6 +951,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"MIDI-г идэвхжүүлсэн програмуудыг өөрийн компьютер дээрх MIDI програм хангамжийг USB дээр ажиллуулах."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Бусад хэрэглэгчид"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Төхөөрөмжийн санах ой"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Хөдөлгөөнт санах ой"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> хоосон (нийт <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> залгасан байна"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g>-ыг залгаж чадахгүй байна"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g>-ыг аюулгүй салгалаа"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g>-ыг аюулгүй салгаж чадсангүй"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g>-ыг хэлбэршүүлсэн"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g>-ыг хэлбэршүүлэх боломжгүй байна"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Санах ойн нэрийг өөрчлөх"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Хэлбэршүүлэлт хийсний дараа та <xliff:g id="NAME_0">^1</xliff:g>-ыг бусад төхөөрөмжүүдэд энэ ашиглаж болно. \n\nЭнэ <xliff:g id="NAME_1">^1</xliff:g> дээрх бүх өгөгдөл арчигдаж болно. Тиймээс өгөгдлөө нөөцлөн авна уу. \n\n"<b>"Зураг болон бусад медиаг нөөцлөх "</b>\n"Энэ төхөөрөмж дээрх өөр санах ойд медиаг зөөх эсвэл USB кабель ашиглан компьютер уруу шилжүүлэх. \n\n"<b>"Апп нөөцлөх"</b>\n"Энэ <xliff:g id="NAME_6">^1</xliff:g> дээрх бүх апп болон тэдгээрийн өгөгдөл нь устгагдах тул төхөөрөмж дээрх өөр санах ойд зөөвөрлөн нөөцөлнө үү."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>" <xliff:g id="NAME_0">^1</xliff:g>-ыг салгах үед суулгагдсан апп-ууд ажиллахаа зогсоож, хадгалагдсан файлуудыг дахин оруулахаас нааш нээх боломжгүй болно. "</b>\n\n"Энэхүү <xliff:g id="NAME_1">^1</xliff:g> нь зөвхөн энэ төхөөрөмж дээр ажиллахаар хэлбэршүүлэгдсэн байна. Үүнээс өөр төхөөрөмж дээр ажиллахгүй."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g>-аа тохируул"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Зөөврийн санах хэлбэрээр ашиглах"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Төхөөрөмж хооронд зураг болон бусад медиаг зөөвөрлөхөд зориулсан."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Дотоод санах ой хэлбэрээр ашиглах"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Энэ төхөөрөмж дээр апп, зураг гэх мэт зүйлүүдийг хадгалахад зориулсан. Бусад төхөөрөмжүүдтэй ажиллахаас хамгаалах хэлбэршүүлэлтийг шаарддаг."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Дотоод санах ой хэлбэрээр хэлбэршүүлэх"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Аюулгүй байдлыг хангахын тулд <xliff:g id="NAME_0">^1</xliff:g>-ыг хэлбэршүүлэх хэрэгтэй. \n\nХэлбэршүүлсний дараагаар <xliff:g id="NAME_1">^1</xliff:g> нь зөвхөн энэ төхөөрөмж дээр ажиллана. \n\n"<b>"Хэлбэршүүлэлт нь <xliff:g id="NAME_2">^1</xliff:g> дээр хадгалсан бүх мэдээллийг устгана."</b>"Өгөгдөлөө алдахгүйн тулд нөөцлөн авна уу."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Устгах &amp; хэлбэршүүлэх"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g>-ыг хэлбэршүүлж байна..."</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Хэлбэршүүлэлт хийх явцад <xliff:g id="NAME">^1</xliff:g>-ыг бүү устга."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Шинэ санах ойд өгөгдлийг зөөх"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Шинэ <xliff:g id="NAME">^1</xliff:g>-д зураг, файл, апп зэргийн өгөгдлөө зөөн байршуулж болно. \n\nЗөөвөрлөхөд <xliff:g id="TIME">^2</xliff:g> минут шаардлагатай бөгөөд дотоод санах ойд <xliff:g id="SIZE">^3</xliff:g> хэмжээний зай үүсгэнэ. Зөөвөрлөх явцад зарим апп ажиллахгүй байж болно."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Одоо зөөх"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Дараа зөөх"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Өгөгдлийг одоо зөөх"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Зөөвөрлөхөд <xliff:g id="TIME">^1</xliff:g> минут болно. Энэ нь дотоод санах ойноос <xliff:g id="SIZE">^2</xliff:g> хэмжээг суллана."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Зөөх"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Өгөгдөл зөөвөрлөж байна..."</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Зөөвөрлөх үед: \n• <xliff:g id="NAME">^1</xliff:g>-ийг бүү устга. \n• Зарим апп-ууд хэвийн горимоор ажиллахгүй байж болно. \n• Төхөөрөмжийг цэнэгийг хадгал."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> бэлэн"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Таны <xliff:g id="NAME">^1</xliff:g>-ыг зураг болон бусад медиатай хэрэглэхэд зориулан тохируулсан."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Таны шинэ <xliff:g id="NAME">^1</xliff:g> ажиллаж байна. \n\nТохиргоо ба Санах ой хэсгээс энэ төхөөрөмжид зураг, файл, апп зэргийн өгөгдлийг зөөвөрлөнө үү."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g>-ыг зөөх"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<xliff:g id="APP">^1</xliff:g> ба өгөгдлийг нь <xliff:g id="NAME_0">^2</xliff:g>-д зөөвөрлөхөд хэдхэн хором л болно. Зөөвөрлөж дуусах хүртэл та апп-ыг ашиглах боломжгүй. \n\n Зөөвөрлөх үед <xliff:g id="NAME_1">^2</xliff:g>-ыг хөдөлгөхгүй байна уу."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g>-ыг зөөж байна..."</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Зөөвөрлөх явцад <xliff:g id="NAME">^1</xliff:g>-ыг хөдөлгөхгүй байна уу. \n\n Энэ төхөөрөмж дээрх <xliff:g id="APP">^2</xliff:g> апп нь зөөвөрлөж дуусах хүртэл ажиллахгүй."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Зөөвөрлөлтийг цуцлах"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Зайны статус"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Зайны түвшин"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -998,13 +1034,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Үндсэн рүү сэргээх"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Үндсэн APN тохиргоог дахин шинэчилж дууслаа."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Сүлжээний тохиргоог дахин тохируулах"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Энэ нь сүлжээтэй холбоотой бүх тохиргоог үйлдвэрийн тохиргоонд шилжүүлнэ.Үүнд:\n\n"<li>"Wifi"</li>\n<li>"Гар утасны дата"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Энэ сүлжээний бүх тохиргоог дахин тохируулна. Үүнд:\n\n"<li>"Wi‑Fi"</li>\n<li>"Үүрэн дата"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Дахин тохируулах"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Бүх сүлжээний тохиргоог дахин тохируулах уу? Та энэ үйлдлийг буцаах боломжгүй!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Бүх сүлжээний тохиргоог дахин тохируулах уу? Энэ үйлдлийг буцаах боломжгүй!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Дахин тохируулах"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Сүлжээний тохиргооны өөрчлөлтийг баталгаажуулахын тулд түгжээгээ тайлна уу."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Дахин тохируулах уу?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Сүлжээний тохиргоог дахин тохируулах"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Сүлжээний тохиргоог дахин тохируулсан байна"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Төхөөрөмжийг дахин тохируулах"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Үйлдвэрээс гарсан төлөвт"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Энэ таны таблетын "<b>"дотоод сангаас"</b>"таны \n\n"<li>"Google акаунт"</li>\n<li>"Системийн болон апп өгөгдөл болон тохиргоо"</li>\n<li>"Татаж авсан апп-уудыг"</li>" оруулан бүх өгөгдлийг устгах болно"</string>
@@ -1020,9 +1055,8 @@
     <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="1062841478823409667">"Бүх хувийн мэдээллээ устгаад, апп-ыг татаж авмаар байна уу? Энэ үйлдлийг буцаах боломжгүй!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Бүгдийг устгах"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Энэ хэрэглэгчийн хувьд үйлдвэрээс гарсан төлөв рүү шинэчлэх боломжгүй"</string>
@@ -1039,8 +1073,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Дуут шуудан, дуудлага дамжуулах, дуудлага хүлээлгэх, залгагчий ID тохируулах"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB модем болгох"</string>
@@ -1072,7 +1104,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Тусламж"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Үүрэн сүлжээ"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Мобайл төлбөрийн багц"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Үндсэн SMS апп"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS апп"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS апп-г өөрчлөх үү?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Таны үндсэн SMS аппликешнээр <xliff:g id="CURRENT_APP">%2$s</xliff:g>-н оронд <xliff:g id="NEW_APP">%1$s</xliff:g>-г ашиглах уу?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g>-г таны SMS апп-р ашиглах уу?"</string>
@@ -1103,6 +1135,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Байршлыг тогтоохын тулд GPS ашиглах"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Скан хийж байна"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Скан хийж байна"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi скан"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Апп-ууд болон үйлчилгээнүүдэд Wi-Fi асаалтгүй байсан ч Wi-Fi сүлжээнүүдийг скан хийх боломжийг олгох замаар байршлыг сайжруул"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth скан"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Системийн үйлчилгээнүүдэд Bluetooth асаалтгүй байсан ч Bluetooth төхөөрөмжүүдийг скан хийх боломжийг олгох замаар байршлыг сайжруул"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; үүрэн сүлжээний байршил"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Апп-уудад Google-н байршлын үйлчилгээ ашиглан таны байршлыг хурдан олохыг зөвшөөрөх. Нэргүй байршлын мэдээлэл цуглуулагдаж Google рүү илгээгдэх болно."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fi-р тодорхойлогдсон байршил"</string>
@@ -1148,11 +1184,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Нууц үгийг тохирууллаа"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-г тохирууллаа"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Загварыг тохирууллаа"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Үргэлжлүүлэхийн тулд төхөөрөмжийн зурган түгжээг оруулна уу."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Үргэлжлүүлэхийн тулдтөхөөрөмжийнхөө ПИН кодыг оруулна уу."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Үргэлжлүүлэхийн тулд төхөөрөмжийн нууц үгээ оруулна уу."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"ПИН код буруу байна"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Нууц үг буруу байна"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Зурган түгжээ буруу байна"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Төхөөрөмжийн аюулгүй байдал"</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_wrong" msgid="4694973540770105678">"Дахин оролдно уу:"</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>
@@ -1174,8 +1214,7 @@
     <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" msgid="6909161623701848863">"Хэт олон удаа буруу оруулсан байна. <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>
@@ -1226,7 +1265,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Хэмжээгээр эрэмбэлэх"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Ажиллаж байгаа үйлчилгээнүүдийг харуулах"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Кеш хийгдсэн процессуудыг харуулах"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"Онцгой нөхцөлд ашиглах стандарт апп"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Яаралтай тусламжийн апп"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Апп тохируулгыг дахин шинэчлэх"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Апп тохируулгыг дахин шинэчлэх үү?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Энэ нь дараах бүх тохиргоог шинэчлэх болно:\n\n "<li>"Идэвхгүй апп-ууд"</li>\n" "<li>"Идэвхгүй апп мэдэгдлүүд"</li>\n" "<li>"Үйлдлүүдийн үндсэн аппликешнүүд"</li>\n" "<li>"Апп-уудын далд дата хязгаарлалтууд"</li>\n" "<li>"Ямар нэг зөвшөөрлын хязгаарлалтууд"</li>\n\n" Та ямаг нэг апп датаг алдахгүй."</string>
@@ -1430,8 +1469,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Файл доторх бүх блютүүт HCI пакетуудыг унших"</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="select_logd_size_title" msgid="7433137108348553508">"Логгерын буферын хэмжээ"</string>
@@ -1732,6 +1769,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 цаг"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 өдөр"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Системийг харуулах"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Системийг нуух"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss ашиглах"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Статистикийн төрөл"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Далд"</string>
@@ -1828,7 +1866,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_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>
@@ -2203,7 +2240,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Хэрэглэгч"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Хязгаарлагдсан профайл"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Шинэ хэрэглэгч нэмэх үү?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Та хэрэглэгч нэмэх замаар энэ төхөөрөмжийг бусадтай хуваалцаж болно. Хэрэглэгч бүрт өөрийн апп, дэвсгэр зураг гэх мэтийг тохируулж болох хувийн профайлтай байна. Хэрэглэгчид нь бусдад бүгдэд нь нөлөөлөх Wi‑Fi мэтийн тохиргоог өөрчлөх эрхтэй.\n\nТа шинэ хэрэглэгч нэмбэл, тухайн хүн өөрийн профайлыг тохируулах шаардлагатай.\n\nАль ч хэрэглэгч бүх хэрэглэгчийн апп-уудыг шинэчлэх боломжтой."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Та нэмэлт хэрэглэгчдийг бий болгох замаар бусад хүмүүстэй энэ төхөөрөмжийг хуваалцаж болно. Хэрэглэгч бүр нь өөрийн талбартай бөгөөд түүнийгээ апп, ханын цаас болон бусад зүйлээр өөрчилж болно. Хэрэглэгч нь мөн нийтээр хэрэглэдэг Wi-Fi гэх мэт төхөөрөмжийн тохиргоог өөрчилж болно.\n\n Хэрэв та шинэ хэрэглэгч нэмэх бол тухайн хүн өөрийн талбарыг хэлбэршүүлэх ёстой.\n\nАль ч хэрэглэгч нь бусад бүх хэрэглэгчдийн өмнөөс апп шинэчилж болно."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Та шинэ хэрэглэгч нэмбэл, тухайн хүн өөрийн профайлыг тохируулах шаардлагатай.\n\nАль ч хэрэглэгч бүх хэрэглэгчийн апп-уудыг шинэчлэх боломжтой."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Хэрэглэгчийг одоо тохируулах уу?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Хэрэглэгч төхөөрөмжийг авч өөрийн профайлыг тохируулах боломжтой эсэхийг шалгана уу"</string>
@@ -2386,6 +2423,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"Онцгой нөхцөлд ашиглах апп"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"апп, апп татах, систем"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"апп-уудын зөвшөөрлийн аюулгүй байдал"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"үндсэн апликейшнүүд"</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>
@@ -2400,14 +2438,12 @@
     <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="6948120138640252732">"Тасалдуулахгүй байх"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Зөвхөн хамгийн чухал гэснийг зөвшөөрнө"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Автомат журам"</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_alarms" msgid="7380265858042606857">"Зөвхөн сэрүүлгийг зөвшөөрөх"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Тасалдалгүй байх"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Зөвхөн чухал зүйлс"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Зөвхөн сэрүүлэг"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Аливаа саад байхгүй байх"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Утасны хонхны ая"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Мэдэгдлийн үндсэн хонхны ая"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Дуудлагад бас чичрэх"</string>
@@ -2438,13 +2474,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Мэдэгдэл сонсогч суулгагдаагүй."</string>
     <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">"Нөхцөл нийлүүлэх апп байхгүй"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for manage_condition_providers_summary_nonzero (1398308139164964218) -->
-    <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="loading_notification_apps" msgid="5031818677010335895">"Апп-уудыг ачаалж байна..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Бүгдийг блокло"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Энэ апп-н мэдэгдлийг хэзээ ч харуулахгүй"</string>
@@ -2458,17 +2487,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"Горимын нэр"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Горим нэмэх"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Горимыг устгах"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<xliff:g id="RULE">%1$s</xliff:g>\" горимыг устгах уу?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Устгах"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Дүрмийн төрөл"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Тодорхойгүй"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Дүрмийг тохируулах"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Цагийн хуваарийн дүрэм"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Горим олдсонгүй."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Өдөр"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Байхгүй"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Өдөр бүр"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Хэзээ ч үгүй"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Дуудлага"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Зурвасууд"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Авсан дуудлага/зурвасууд"</string>
@@ -2478,15 +2513,66 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Сэрүүлэг"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Сануулагч"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Үйл явдал"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Сонгосон дуудлага хийгч"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Давтан дуудлага хийгч"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Хэрэв нэг хүн <xliff:g id="MINUTES">%d</xliff:g> минутын дотор хоёр дахь удаагаа дуудлага хийвэл үүнийг хүлээн авна."</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> дараагийн өдөр"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Тасалдал"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Дуудлага болон мэдэгдэл ирэх үед"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Танд хэзээ саад болж болох вэ?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Хэр удаан?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Тасалдлыг байнга зөвшөөрөх"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"унтраах,бүх,бүх зүйл"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Зөвхөн нэн тэргүүний тасалдлыг зөвшөөрөх"</string>
+    <string name="zen_mode_option_voice_important_synonyms" msgid="6120004096615029102">"чухал ач холбогдолтой, нэн тэргүүнд, нэн тэргүүний мэдэгдэл"</string>
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Зөвхөн анхааруулгыг зөвшөөрөх"</string>
+    <string name="zen_mode_option_voice_alarms_synonyms" msgid="7463720676061371446">"анхааруулгууд"</string>
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Бүү саад бол"</string>
+    <string name="zen_mode_option_voice_no_interruptions_synonyms" msgid="6196235656198436233">"байхгүй, юу ч байхгүй, мэдэгдэл байхгүй"</string>
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Тодорхойгүй"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> минутууд</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> минут</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> цагууд</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> цаг</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Тодорхой бус хугацаагаар \"чухал мэдэгдэл харуулах\" горимд шилжих"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">\"Чухал мэдэгдлийг харуулах\" горимд  <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> хүртэл <xliff:g id="DURATION">%1$d</xliff:g> минутын турш шилжихl</item>
+      <item quantity="one">\"Чухал мэдэгдлийг харуулах\" горимд <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> хүртэл нэг минутын турш шилжих</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">\"Чухал мэдэгдлийг харуулах\" горимд (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> хүртэл) <xliff:g id="DURATION">%1$d</xliff:g> цагийн турш шилжих </item>
+      <item quantity="one">\"Чухал мэдэгдлийг харуулах\" горимд <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> хүртэл нэг цагийн турш шилжих</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Тодорхой бус хугацаатай анхааруулганд шилжих"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">\"Анхааруул\" горимд (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> хүртэл) зөвхөн <xliff:g id="DURATION">%1$d</xliff:g> минутын турш шилжих</item>
+      <item quantity="one">\"Анхааруул\" горимд <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> хүртэл зөвхөн нэг минутын турш шилжих</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">\"Анхааруул\" горимд <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> хүртэл зөвхөн <xliff:g id="DURATION">%1$d</xliff:g> цагийн турш шилжих</item>
+      <item quantity="one">\"Анхааруул\" горимд <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> хүртэл зөвхөн нэг цагийн турш шилжих</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Тодорхой бус хугацаагаар \"бүү саад бол\" горимд шилжих"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">\"Бүү саад бол\" горимд (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> хүртэл) <xliff:g id="DURATION">%1$d</xliff:g> минутын турш шилжих</item>
+      <item quantity="one">\"Бүү саад бол\" горимд <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> хүртэл нэг минутын турш шилжих</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">\"Бүү саад бол\" горимд <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> хүртэл <xliff:g id="DURATION">%1$d</xliff:g> цагийн турш шилжих</item>
+      <item quantity="one">\"Бүү саад бол\" горимд <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> хүртэл нэг цагийн турш шилжих</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Үргэлж саад бол горимд шилжих"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"үүрд"</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>
@@ -2551,7 +2637,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> зөвшөөрөл олгогдсон </item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> зөвшөөрөл олгогдсон </item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_3">%d</xliff:g>-аас <xliff:g id="COUNT_2">%d</xliff:g> зөвшөөрөл олгогдсон</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>-аас <xliff:g id="COUNT_0">%d</xliff:g> зөвшөөрөл олгогдсон байна</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Зарим үндсэн тохиргоонуудыг суулгасан"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Ямар ч үндсэн тохиргоог суулгаагүй байна"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Бүх апп-ууд"</string>
@@ -2562,8 +2651,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Чухал"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Нууц"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Домэйн хаягуудын хамт"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Бүх апп дээрх эрхэмлэх тохиргоог анхны хэлбэрт оруулах"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> апп суулгасан байна. Үүнд системийн болон татаж авсан апп-уудыг оруулсан"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Админ идэвхгүй болгосон"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Боловсронгуй"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Үл мэдэгдэх апп"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Профайлаа сонгоно уу"</string>
@@ -2578,4 +2666,10 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> апп-ууд нь өөрийн домайн URL-уудыг нээж чадна</item>
       <item quantity="one">Нэг апп нь өөрийн домайн URL-уудыг нээж чадна</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Танигдахгүй байна"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Үндсэн Апликейшн"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Хөтөч апп"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Үндсэн веб хөтөч байхгүй"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Үндсэн)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Апп-ны санах ой"</string>
 </resources>
diff --git a/res/values-mr-rIN/arrays.xml b/res/values-mr-rIN/arrays.xml
index a4ec5a4..92b10c5 100644
--- a/res/values-mr-rIN/arrays.xml
+++ b/res/values-mr-rIN/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"सिम"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"पुश बटण"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"निम्न"</item>
     <item msgid="4212263919458209842">"गंभीर"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"बंद"</item>
-    <item msgid="5656544177755411222">"मर्यादित व्यत्यय"</item>
-    <item msgid="8735337502532332056">"शून्य व्यत्यय"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"सामान्य"</item>
     <item msgid="866544120205026771">"मध्यम"</item>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 1412d27..cf06b4f 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD कार्ड"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"प्रॉक्सी सेटिंग्ज"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"होय"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"नाही"</string>
-    <string name="forget" msgid="7267115980248732932">"विसरा"</string>
+    <string name="forget" msgid="1400428660472591263">"विसरा"</string>
+    <string name="save" msgid="879993180139353333">"जतन करा"</string>
+    <string name="done" msgid="6942539184162713160">"पूर्ण झाले"</string>
     <string name="settings_label" msgid="1626402585530130914">"सेटिंग्ज"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"सेटिंग्ज"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"सेटिंग्ज शॉर्टकट"</string>
@@ -374,7 +372,6 @@
     <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_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>
@@ -521,7 +518,7 @@
     <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="ble_scan_notify_text" msgid="9019985398053764737">"स्थान अचूकता सुधारण्यासाठी, ब्लूटुथ बंद असले तरी देखील, Google सेवा ब्लूटुथ डिव्हाइसेससाठी स्कॅन करतील. आपण हे LINK_BEGINस्कॅनिंग सेटिंग्जLINK_END मध्ये बदलू शकता."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"स्थान अचूकता सुधारण्यासाठी, ब्लूटुथ बंद असले तरी देखील, अ‍ॅप्स आणि सेवा ब्लूटुथ डिव्हाइसेससाठी स्कॅन करतील. आपण हे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कॅनिंग सेटिंग्ज<xliff:g id="LINK_END_1">LINK_END</xliff:g> मध्ये बदलू शकता."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"यावर कनेक्ट करा…"</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>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"स्थान अचूकता सुधारण्यासाठी, वाय-फाय बंद असले तरीदेखील, Google सेवा वाय-फाय नेटवर्कसाठी स्कॅन करतील. आपण हे LINK_BEGINस्कॅनिंग सेटिंग्जLINK_END मध्ये हे बदलू शकता."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"स्थान अचूकता सुधारण्यासाठी, वाय-फाय बंद असले तरी देखील, अ‍ॅप्स आणि सेवा वाय-फाय नेटवर्कसाठी स्कॅन करतील. आपण हे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कॅनिंग सेटिंग्ज<xliff:g id="LINK_END_1">LINK_END</xliff:g> मध्‍ये बदलू शकता."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"पुन्हा दर्शवू नका"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"निष्क्रिय असताना वाय-फाय चालू ठेवा"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"निष्क्रिय करा दरम्यान वाय-फाय चालू"</string>
@@ -604,8 +601,6 @@
     <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_apps" msgid="6003687912727859577">"अॅप्स दर्शवा"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"वायफाय सामर्थ्य दर्शवा"</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>
@@ -663,6 +658,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"कनेक्ट करा"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"या नेटवर्कमध्‍ये इंटरनेट प्रवेश नाही. तरीही हे नेटवर्क वापरायचे?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"या नेटर्वकसाठी पुन्हा विचारू नका"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"कनेक्ट करा"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"नेटवर्कशी कनेक्‍ट करण्‍यात अयशस्वी"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"विसरा"</string>
@@ -734,14 +731,12 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"वाय-फाय प्राधान्यकृत"</item>
     <item msgid="5267397515594230396">"सेल्युलर प्राधान्यकृत"</item>
-    <item msgid="3132912693346866895">"केवळ वाय-फाय"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"वाय-फाय कॉलिंग चालू असताना, आपला फोन आपल्या प्राधान्यावर आणि कोणता सिग्नल मजबूत आहे याच्या आधारावर, वाय-फाय नेटवर्क किंवा आपल्या वाहकाच्या नेटवर्कद्वारे कॉल मार्गस्थ करू शकतो. हे वैशिष्ट्य चालू करण्यापूर्वी, फी शी आणि इतर तपशीलांशी संबंधित आपल्या वाहकासह तपासा."</string>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"वाय-फाय कॉलिंग चालू असताना, आपला फोन आपल्या प्राधान्यावर आणि कोणता सिग्नल मजबूत आहे याच्या आधारावर, वाय-फाय नेटवर्क किंवा आपल्या वाहकाच्या नेटवर्कद्वारे कॉल मार्गस्थ करू शकतो. हे वैशिष्ट्य चालू करण्यापूर्वी, फी आणि इतर तपशीलांच्या संबंधात आपल्या वाहकास विचारा."</string>
     <string name="home_settings" msgid="212375129455718176">"घर"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"प्रदर्शित करा"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ध्वनी"</string>
@@ -913,12 +908,12 @@
     <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="5128673488173839077">"अ‍ॅप्स आणि अ‍ॅप डेटा"</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_media_misc_usage" msgid="235452944021647124">"संकीर्ण"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"इतर फायली"</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>
@@ -951,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"अनमाउंट प्रगतीवर"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"संचयन स्थान संपत आहे"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"संकालन करणे यासारखी, काही सिस्टम कार्ये, योग्यरितीने कार्य करू शकत नाही. अॅप्स किंवा मीडिया सामग्री यासारखे, आयटम हटवून किंवा अनपिन करून स्थान मोकळे करण्याचा प्रयत्न करा."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"पुनर्नामित करा"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"माउंट करा"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"बाहेर काढा"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"मिटवा आणि स्वरूपित करा"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"मिटवा आणि अंतर्गत संचयन म्हणून स्वरूपित करा"</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>
@@ -961,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"MIDI सक्षम असलेल्या अनुप्रयोगांना आपल्या संगणकावर MIDI सॉफ्टवेअरसह USB वर कार्य करू द्या."</string>
     <string name="storage_other_users" msgid="808708845102611856">"इतर वापरकर्ते"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"डिव्‍हाइस संचयन"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"काढण्‍यायोग्य संचयन"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> विनामूल्य (एकूण <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> माउंट केले"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g> माउंट करणे शक्य झाले नाही"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> सुरक्षितपणे बाहेर काढले"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g> सुरक्षितपणे बाहेर काढणे शक्य झाले नाही"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> स्वरूपित झाले"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> स्वरूपित करणे शक्य झाले नाही"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"संचयन पुनर्नामित करा"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"स्वरूपनानंतर, आपण हे <xliff:g id="NAME_0">^1</xliff:g> इतर डिव्‍हाइसेसमध्‍ये वापरू शकता. \n\nया <xliff:g id="NAME_1">^1</xliff:g> वरील सर्व डेटा मिटविला जाईल. बॅकअप घेण्‍याचा प्रथम विचार करा. \n\n"<b>"फोटो आणि इतर मीडियाचा बॅकअप घ्‍या"</b>" \nया डिव्‍हाइस वरील वैकल्पिक संचयनावर आपल्‍या मीडिया फायली हलवा किंवा USB केबल वापरून त्या संगणकावर स्थानांतरित करा. \n\n"<b>"अ‍ॅप्सचा बॅकअप घ्‍या"</b>" \nया <xliff:g id="NAME_6">^1</xliff:g> वर संचयित केलेले सर्व अ‍ॅप्स विस्थापित केले जातील आणि त्यांचा डेटा मिटविला जाईल. हे अ‍ॅप्स ठेवण्‍यासाठी, ते या डिव्‍हाइस वरील वैकल्पिक संचयनावर हलवा."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"आपण <xliff:g id="NAME_0">^1</xliff:g> बाहेर काढता तेव्‍हा, त्यावर संचयित केलेले अ‍ॅप्स कार्य करणे थांबवतील आणि ते पुन्हा घातले जाईपर्यंत त्यावर संचयित केलेल्‍या मीडिया फायली उपलब्ध असणार नाहीत."</b>" \n\n हे <xliff:g id="NAME_1">^1</xliff:g> केवळ या डिव्‍हाइसवर कार्य करण्‍यासाठी स्वरूपित केले आहे. ते इतर कशावरही कार्य करणार नाही."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"आपले <xliff:g id="NAME">^1</xliff:g> सेट करा"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"पोर्टेबल संचयन म्हणून वापरा"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"डिव्‍हाइसेस मध्‍ये फोटो आणि इतर मीडिया हलविण्‍यासाठी."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"अंतर्गत संचयन म्हणून वापरा"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"केवळ या डिव्‍हाइसवर अ‍ॅप्स आणि फोटोंसह काहीही संचयित करण्‍यासाठी. स्वरूपनाची आवश्‍यकता असते जे यास इतर डिव्‍हाइसेसह कार्य करण्यास प्रतिबंधित करते."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"अंतर्गत संचयन म्हणून स्वरूपित करा"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"हे सुनिश्चित करण्‍यासाठी यास <xliff:g id="NAME_0">^1</xliff:g> स्वरूपित होणे आवश्यक आहे. \n\nस्वरूपित केल्‍यानंतर, हे <xliff:g id="NAME_1">^1</xliff:g> केवळ या डिव्‍हाइसमध्‍ये कार्य करेल. \n\n"<b>"स्वरूपित करण्‍यामुळे <xliff:g id="NAME_2">^1</xliff:g> वर सध्‍या संचयित केलेला सर्व डेटा मिटविला जातो."</b>" डेटा गमावला जाणे, टाळण्‍यासाठी त्याचा बॅकअप घेण्‍याचा विचार करा."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"मिटवा आणि स्वरूपित करा"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> स्वरूपित करीत आहे…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"स्वरूपित करताना <xliff:g id="NAME">^1</xliff:g> काढू नका."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"डेटा नवीन संचयनावर हलवा"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"आपण आपले फोटो, फायली अ‍ॅप डेटा या नवीन <xliff:g id="NAME">^1</xliff:g> वर हलवू शकता. \n\nहलविण्‍यास सुमारे <xliff:g id="TIME">^2</xliff:g> लागू शकतो आणि अंतर्गत संचयनावर <xliff:g id="SIZE">^3</xliff:g> स्थान रिक्त केले जाईल. काही अ‍ॅप्‍स सुरु असताना कदाचित कार्य करू शकणार नाही."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"आता हलवा"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"नंतर हलवा"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"आता डेटा हलवा"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"हलविण्‍यास सुमारे <xliff:g id="TIME">^1</xliff:g> लागू शकतो. ते <xliff:g id="SIZE">^2</xliff:g> अंतर्गत संचयन रिक्त करेल."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"हलवा"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"डेटा हलवित आहे…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"हलविण्‍यादरम्यान: \n• <xliff:g id="NAME">^1</xliff:g> काढू नका. \n• काही अ‍ॅप्स योग्यरित्या कार्य करणार नाहीत. \n• डिव्‍हाइस चार्ज केलेले ठेवा."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> सज्ज आहे"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"आपले <xliff:g id="NAME">^1</xliff:g> फोटो आणि इतर मीडियासह वापरण्‍यासाठी तयार आहे."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"आपले नवीन <xliff:g id="NAME">^1</xliff:g> कार्य करीत आहे. \n\nया डिव्‍हाइसवर फोटो, फायली आणि अ‍ॅप डेटा हलविण्‍यासाठी, सेटिंग्ज &gt; संचयनावर जा."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> हलवा"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<xliff:g id="APP">^1</xliff:g> आणि त्याचा डेटा <xliff:g id="NAME_0">^2</xliff:g> वर हलविण्‍यास केवळ काही क्षण लागतील. हलविणे पूर्ण होईपर्यंत आपण अ‍ॅप वापरण्‍यास सक्षम असणार नाहीत. \n\nहलविण्‍यादरम्यान <xliff:g id="NAME_1">^2</xliff:g> काढू नका."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> हलवित आहे…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"हलविण्‍यादरम्यान <xliff:g id="NAME">^1</xliff:g> काढू नका. \n\nहलविणे पूर्ण होईपर्यंत या डिव्‍हाइसवरील <xliff:g id="APP">^2</xliff:g> अ‍ॅप उपलब्‍ध नसेल."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"हलविणे रद्द करा"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"बॅटरी स्थिती"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"बॅटरी पातळी"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1005,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"डीफॉल्टवर रीसेट करा"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"रीसेट डीफॉल्ट APN सेटिंग्ज पूर्ण."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"नेटवर्क सेटिंग्ज रीसेट केले"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"यांच्या समावेशासह हे फॅक्‍टरी डीफॉल्टच्या नेटवर्किंग संबंधित सर्व सेटिंग्ज रीसेट करेल: \n\n"<li>"वायफाय"</li>\n<li>"मोबाइल डेटा"</li>\n<li>"ब्लूटुथ"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"हे सर्व नेटवर्क सेटिंग्ज रीसेट करेल, यासह:\n\n"<li>"वाय-फाय"</li>\n<li>"सेल्‍युलर डेटा"</li>\n<li>"ब्लूटुथ"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"सेटिंग्ज रीसेट करा"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"सर्व नेटवर्क सेटिंग्ज रीसेट करायच्या? आपण ही क्रिया उलट करू शकत नाही!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"सर्व नेटवर्क सेटिंग्ज रीसेट करायच्या? आपण ही क्रिया पूर्ववत करू शकत नाही!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"सेटिंग्ज रीसेट करा"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"नेटवर्क सेटिंग्ज रीसेटचे पुष्‍टीकरण करण्‍यासाठी आपल्‍याला आपला अनलॉक नमुना रेखांकित करण्‍याची आवश्यकता आहे."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"रीसेट करायचे?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"नेटवर्क सेटिंग्ज रीसेट केले"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"नेटवर्क सेटिंग्ज रीसेट केल्या गेल्या आहेत"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"डिव्हाइस रीसेट करा"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"फॅक्‍टरी डेटा रीसेट"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"हे आपल्या टॅब्लेटच्या "<b>"अंतर्गत संचयना"</b>" वरील सर्व डेटा मिटवेल,                                                                     यासह:\n\n"<li>"आपले Google खाते"</li>\n<li>"सिस्टम आणि अॅप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेले अॅप्स"</li></string>
@@ -1027,9 +1065,8 @@
     <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="1062841478823409667">"आपली सर्व वैयक्तिक माहिती आणि डाउनलोड केलेले अॅप्स मिटवायचे? आपण ही क्रिया पूर्ववत करू शकत नाही!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"प्रत्येकगोष्ट मिटवा"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"या वापरकर्त्यासाठी फॅक्‍टरी रीसेट उपलब्‍ध नाही"</string>
@@ -1046,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"व्हॉइसमेल, कॉल अग्रेषण, कॉल प्रतीक्षा, कॉलर ID सेट करा"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB टेदरिंग"</string>
@@ -1079,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"मदत"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"सेल्युलर नेटवर्क"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"मोबाईल योजना"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"डीफॉल्ट SMS अॅप"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS अ‍ॅप"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS अॅप बदलायचा?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"<xliff:g id="CURRENT_APP">%2$s</xliff:g> च्याऐवजी <xliff:g id="NEW_APP">%1$s</xliff:g> आपला SMS अॅप म्हणून वापरायचा?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"आपला SMS अॅप म्हणून <xliff:g id="NEW_APP">%s</xliff:g> वापरायचा?"</string>
@@ -1110,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"स्थान निर्धारीत करण्यासाठी GPS चा वापर करा"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"स्कॅन करत आहे"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"स्कॅन करत आहे"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"वाय-फाय स्कॅन करणे"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"अ‍ॅप्स आणि सेवांना वाय-फाय बंद असताना देखील वाय-फाय नेटवर्कसाठी स्कॅन करण्याची अनुमती देऊन स्‍थान सुधारा"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ब्लूटुथ स्कॅन करणे"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"ब्लूटुथ बंद असले तरी देखील, सिस्‍टीम सेवांना ब्लूटुथ डिव्हाइसेससाठी स्कॅन करण्याची अनुमती देऊन स्थान सुधारा"</string>
     <string name="location_network_based" msgid="6010456018401296590">"वाय-फाय आणि सेल्युलर नेटवर्क स्थान"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"आपल्या स्थानाचा अधिक जलद अंदाज घेण्यासाठी अॅप्सना Google ची स्थान सेवा वापरू द्या. अनामित स्थान डेटा संकलित केला जाईल आणि Google कडे पाठविला जाईल."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"वाय-फाय द्वारे निर्धारीत केलेले स्थान"</string>
@@ -1155,11 +1194,15 @@
     <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="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"सुरु ठेवण्‍यासाठी आपला डिव्‍हाइस नमुना वापरा."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"सुरु ठेवण्‍यासाठी आपले डिव्‍हाइस पिन प्रविष्‍ट करा."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"सुरु ठेवण्‍यासाठी आपला डिव्‍हाइस संकेतशब्द प्रविष्‍ट करा."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"चुकीचा पिन"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"चुकीचा संकेतशब्द"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"चुकीचा नमुना"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"डिव्हाइस सुरक्षितता"</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>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"मदतीसाठी मेनू दाबा."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"पूर्ण झाल्यावर बोट सोडा"</string>
@@ -1181,8 +1224,7 @@
     <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" msgid="6909161623701848863">"खूप चुकीचे प्रयत्न. <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>
@@ -1233,7 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"आकारानुसार क्रमवारी लावा"</string>
     <string name="show_running_services" msgid="5736278767975544570">"चालू सेवा दर्शवा"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"कॅशे केलेल्या प्रक्रिया दर्शवा"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"डीफॉल्ट आणीबाणी अॅप"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"आणीबाणी अ‍ॅप"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"अॅप प्राधान्यता रीसेट करा"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"अॅप प्राधान्ये रीसेट करायचे?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"हे यासाठी सर्व प्राधान्ये रीसेट करेल:\n\n "<li>"अक्षम असलेले अॅप्स"</li>\n" "<li>"अक्षम असलेली अॅप सूचना"</li>\n" "<li>"क्रियांसाठी डीफॉल्ट अनुप्रयोग"</li>\n" "<li>"अॅप्ससाठी पार्श्वभूमी डेटा प्रतिबंध"</li>\n" "<li>"कोणतेही परवानगी प्रतिबंध"</li>\n\n" आपण कोणताही अॅप डेटा गमावणार नाही."</string>
@@ -1437,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"सर्व ब HCI पॅकेट एका फाईलमध्ये कॅप्चर करा"</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="select_logd_size_title" msgid="7433137108348553508">"लॉगर बफर आकार"</string>
@@ -1739,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 तास"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 दिवस"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"सिस्टम दर्शवा"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"सिस्‍टीम लपवा"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss वापरा"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"आकडेवारी प्रकार"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"पार्श्वभूमी"</string>
@@ -1835,7 +1876,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_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>
@@ -2210,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"वापरकर्ता"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"प्रतिबंधित प्रोफाईल"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"नवीन वापरकर्ता जोडायचा?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"आपण अतिरिक्त वापरकर्ते तयार करून इतर लोकांबरोबर हे डिव्हाइस सामायिक करू शकता. प्रत्येक वापरकर्त्यास त्यांचे स्वतःचे स्थान असते, जे ते त्यांच्या स्वतःच्या अॅप्ससह, वॉलपेपरसह आणि याप्रकारे सानुकूल करू शकतात. वापरकर्ते प्रत्येकावर प्रभाव करणार्‍या वाय-फाय सारख्या डिव्हाइस सेटिंग्ज देखील समायोजित करू शकतात.\n\nआपण एक नवीन वापरकर्ता जोडता, तेव्हा व्यक्तीस त्यांचे स्थान सेट करण्याची आवश्यकता असते.\n\nकोणताही वापरकर्ता सर्व इतर वापरकर्त्यांसाठी अॅप्स अद्यतनित करू शकतो."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"आपण अतिरिक्त वापरकर्ते तयार करून इतर लोकांसह हे डिव्हाइस सामायिक करू शकता. प्रत्येक वापरकर्त्यास त्यांचे स्वतःचे स्थान असते, जे ते त्यांच्या अ‍ॅप्स, वॉलपेपर आणि यासारख्‍या गोष्टींसह सानुकूल करू शकतात. वापरकर्ते प्रत्येकजणास प्रभावित करणार्‍या वाय-फाय सारख्या डिव्हाइस सेटिंग्ज देखील समायोजित करू शकतात.\n\nआपण एक नवीन वापरकर्ता जोडता तेव्हा, त्या व्यक्तीस त्यांचे स्थान सेट करण्याची आवश्यकता असते.\n\nकोणताही वापरकर्ता इतर सर्व वापरकर्त्यांसाठी अ‍ॅप्स अद्यतनित करू शकतो."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"आपण एक नवीन वापरकर्ता जोडता, तेव्हा व्यक्तीस त्यांचे स्थान सेट करण्याची आवश्यकता असते.\n\nकोणताही वापरकर्ता सर्व इतर वापरकर्त्यांसाठी अॅप्स अद्यतनित करू शकतो."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"आता वापरकर्ता सेट करायचा?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"डिव्हाइस घेण्यासाठी आणि त्यांचे स्थान सेट करण्यासाठी व्यक्ती उपलब्ध असल्याचे सुनिश्चित करा"</string>
@@ -2393,6 +2433,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"आणीबाणी आइस अॅप डीफॉल्ट"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"अॅप्स डाउनलोड अनुप्रयोग सिस्टीम"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"अॅप्स परवानग्या सुरक्षितता"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"अ‍ॅप्‍स डीफॉल्‍ट"</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>
@@ -2407,14 +2448,12 @@
     <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="6948120138640252732">"व्यत्यय अवरोधित करा"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"केवळ प्राधान्य अनुमती देते"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"स्वयंचलित नियम"</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_alarms" msgid="7380265858042606857">"केवळ अलार्मना अनुमती द्या"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"व्यत्यय आणू नका"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"केवळ प्राधान्य"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"केवळ अलार्म"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"कोणतेही व्यत्यय नाहीत"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"फोन रिंगटोन"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"डिफॉल्ट सूचना रींगटोन"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"कॉल साठी कंपन देखील"</string>
@@ -2447,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"कोणतेही सूचना श्रोते स्थापित केलेले नाहीत."</string>
     <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">"कोणतेही अॅप्स शर्ती प्रदान करतात"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="one">%d अॅप्स नियम प्रदान करतात</item>
-      <item quantity="other">%d अॅप्स नियम प्रदान करतात</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="loading_notification_apps" msgid="5031818677010335895">"अॅप्स लोड करीत आहे..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"सर्व अवरोधित करा"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"या अॅपकडील सूचना कधीही दर्शवू नका"</string>
@@ -2469,17 +2499,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"नियमाचे नाव"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"नियम जोडा"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"नियम हटवा"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<xliff:g id="RULE">%1$s</xliff:g>\" नियम हटवायचा?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"हटवा"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"नियम प्रकार"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"अज्ञात"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"नियम कॉन्‍फिगर करा"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"अनुसूची नियम"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"नियम आढळला नाही."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"दिवस"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"काहीही नाही"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"दररोज"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"कधीही नाही"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> ते <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"कॉल"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"संदेश"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"कडील कॉल/संदेश"</string>
@@ -2489,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"अलार्म"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"स्मरणपत्रे"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"इव्हेंट"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"निवडलेले कॉलर"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"कॉलरची पुनरावृत्ती करा"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"दुसर्‍या वेळी समान व्‍यक्ती <xliff:g id="MINUTES">%d</xliff:g> मिनिटाच्या कालावधीत कॉल करीत असल्यास, त्यास अनुमती द्या"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> पुढील दिवशी"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"आपल्‍या कामात कधी व्यत्यय आणले जाऊ शकते?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"किती वेळ?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"अनिश्‍चितपणे"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> मिनिट</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> मिनिटे</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> तास</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> तास</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"केवळ अनिश्चितपणे प्राधान्य सूचनांवर बदला"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> पर्यंत <xliff:g id="DURATION">%1$d</xliff:g> मिनिटासाठी केवळ प्राधान्य सूचनांवर बदला</item>
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> पर्यंत <xliff:g id="DURATION">%1$d</xliff:g> मिनिटांसाठी केवळ प्राधान्य सूचनांवर बदला</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one"><xliff:g id="DURATION">%1$d</xliff:g> तासासाठी (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> पर्यंत) केवळ प्राधान्य सूचनांवर बदला</item>
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> तासांसाठी (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> पर्यंत) केवळ प्राधान्य सूचनांवर बदला</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"अनिश्चितपणे केवळ अलार्म वर बदला"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one"> <xliff:g id="DURATION">%1$d</xliff:g> मिनिटासाठी (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> पर्यंत) अलार्म वर बदला</item>
+      <item quantity="other"> <xliff:g id="DURATION">%1$d</xliff:g> मिनिटांसाठी (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> पर्यंत) अलार्म वर बदला</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="one"> <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> पर्यंत <xliff:g id="DURATION">%1$d</xliff:g> तासासाठी अलार्म वर बदला</item>
+      <item quantity="other"> <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> पर्यंत <xliff:g id="DURATION">%1$d</xliff:g> तासांसाठी अलार्म वर बदला</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"अनिश्चितपणे व्यत्यय आणू नका वर बदला"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one"> <xliff:g id="DURATION">%1$d</xliff:g> मिनिटासाठी (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> पर्यंत) व्यत्यय आणू नका वर बदला</item>
+      <item quantity="other"> <xliff:g id="DURATION">%1$d</xliff:g> मिनिटांसाठी (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> पर्यंत) व्यत्यय आणू नका वर बदला</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> पर्यंत <xliff:g id="DURATION">%1$d</xliff:g> तासासाठी व्यत्यय आणू नका वर बदला</item>
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> पर्यंत <xliff:g id="DURATION">%1$d</xliff:g> तासांसाठी व्यत्यय आणू नका वर बदला</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"नेहमी व्‍यत्यय आणा वर बदला"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"कायमचे"</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>
@@ -2562,7 +2659,10 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> परवानगीस मंजूरी दिली</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> परवानग्यांना मंजूरी दिली</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_3">%d</xliff:g> पैकी <xliff:g id="COUNT_2">%d</xliff:g> परवानग्यांना मंजूरी दिली</item>
+      <item quantity="other"><xliff:g id="COUNT_3">%d</xliff:g> पैकी <xliff:g id="COUNT_2">%d</xliff:g> परवानग्यांना मंजूरी दिली</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"काही डीफॉल्‍ट सेट केले"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"कोणतेही डीफॉल्ट सेट केले नाही"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"सर्व अ‍ॅप्स"</string>
@@ -2573,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"प्राधान्य"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"संवेदनशील"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"डोमेन URL सह"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"सर्व अॅप्सवरील प्राधान्ये डीफॉल्‍टमध्ये रीसेट करा"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"सिस्टीम आणि डाउनलोड केलेल्या अॅप्ससह, <xliff:g id="COUNT">%d</xliff:g> अॅप्स स्थापित झाले"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"प्रशासकाद्वारे अक्षम केलेले"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"प्रगत"</string>
     <string name="unknown_app" msgid="5275921288718717656">"अज्ञात अॅप"</string>
     <string name="choose_profile" msgid="8229363046053568878">"प्रोफाईल निवडा"</string>
@@ -2589,4 +2688,11 @@
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> अ‍ॅप त्याच्या डोमेन URL उघडू शकतो</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> अ‍ॅप्‍स त्यांच्या डोमेन URL उघडू शकतात</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"ओळखले नाही"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"डीफॉल्ट अ‍ॅप्स"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"ब्राउझर अ‍ॅप"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"कोणतेही डीफॉल्‍ट ब्राउझर नाही"</string>
+    <string name="default_app" msgid="6864503001385843060">"(डीफॉल्ट)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-ms-rMY/arrays.xml b/res/values-ms-rMY/arrays.xml
index 3f8122d..910ec7d 100644
--- a/res/values-ms-rMY/arrays.xml
+++ b/res/values-ms-rMY/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Butang tekan"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"rendah"</item>
     <item msgid="4212263919458209842">"kritikal"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Mati"</item>
-    <item msgid="5656544177755411222">"Gangguan terhad"</item>
-    <item msgid="8735337502532332056">"Gangguan sifar"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Biasa"</item>
     <item msgid="866544120205026771">"Sederhana"</item>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index d06d7fb..f1b8018 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Kad SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Tetapan proksi"</string>
     <string name="cancel" msgid="6859253417269739139">"Batal"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"BATAL"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"TERUSKAN"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"YA"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"TIDAK"</string>
-    <string name="forget" msgid="7267115980248732932">"LUPAKAN"</string>
+    <string name="forget" msgid="1400428660472591263">"Lupakan"</string>
+    <string name="save" msgid="879993180139353333">"Simpan"</string>
+    <string name="done" msgid="6942539184162713160">"Selesai"</string>
     <string name="settings_label" msgid="1626402585530130914">"Tetapan"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Tetapan"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Pintasan tetapan"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Pasangkan palam pengecas anda dan cuba lagi."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Tiada PIN kunci skrin atau kata laluan"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Anda perlu menetapkan PIN atau kata laluan kunci skrin sebelum anda boleh memulakan penyulitan."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Anda perlu melukiskan corak buka kunci anda untuk mengesahkan menyulitkan peranti anda."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Sulitkan?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Operasi penyegerakan ini tidak boleh dibalikkan dan sekiranya anda mengganggunya, anda akan kehilangan data. Penyulitan mengambil masa sejam atau lebih dan dalam masa yang sama tablet akan dimulakan semula beberapa kali."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Operasi penyegerakan ini tidak boleh dibalikkan dan sekiranya anda mengganggunya, anda akan kehilangan data. Penyulitan mengambil masa sejam atau lebih, dalam masa yang sama fon akan dimulakan semula beberapa kali."</string>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Lanjutan"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth Lanjutan"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Peranti boleh berkomunikasi jika Bluetooth hidup."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"Untuk meningkatkan ketepatan lokasi, perkhidmatan Google akan mengimbas untuk mengesan peranti Bluetooth, meskipun semasa Bluetooth dimatikan. Anda boleh menukarnya dalam LINK_BEGINtetapan pengimbasanLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Untuk meningkatkan ketepatan lokasi, apl dan perkhidmatan akan mengimbas untuk mengesan peranti Bluetooth, meskipun semasa Bluetooth dimatikan. Anda boleh menukarnya dalam <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>tetapan pengimbasan<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Sambung ke..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputuskan dari media audio."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputuskan dari audio bebas tangan."</string>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"Untuk meningkatkan ketepatan lokasi, perkhidmatan Google akan mengimbas untuk mengesan rangkaian Wi-Fi, meskipun semasa Wi-Fi dimatikan. Anda boleh menukarnya dalam LINK_BEGINtetapan pengimbasanLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Untuk meningkatkan ketepatan lokasi, apl dan perkhidmatan akan mengimbas untuk mengesan rangkaian Wi-Fi, meskipun semasa Wi-Fi dimatikan. Anda boleh menukarnya dalam <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>tetapan pengimbasan<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Jangan tunjukkan lagi"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Biarkan Wi-Fi aktif semasa tidur"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi aktif semasa tidur"</string>
@@ -604,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Langsung"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Imbas"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Terperinci"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Paparkan Apl"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Papar Kekuatan WiFi"</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>
@@ -663,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Log masuk untuk menyambung?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> mahu anda log masuk sblm menyambung ke rangkaian."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"SAMBUNG"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Rangkaian ini tiada akses Internet. Gunakan rangkaian ini juga?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Jangan minta rangkaian ini lagi"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Sambung"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Gagal menyambung ke rangkaian."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Lupakan"</string>
@@ -734,12 +731,10 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi diutamakan"</item>
     <item msgid="5267397515594230396">"Selular diutamakan"</item>
-    <item msgid="3132912693346866895">"Wi-Fi sahaja"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Apabila panggilan Wi-Fi dihidupkan, telefon anda boleh menghalakan panggilan melalui rangkaian Wi-Fi atau rangkaian pembawa anda, bergantung pada pilihan anda dan isyarat yang lebih kuat. Sebelum menghidupkan ciri ini, semak dengan pembawa anda berkenaan bayaran dan butiran lain."</string>
     <string name="home_settings" msgid="212375129455718176">"Skrin Utama"</string>
@@ -913,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Tersedia (baca-sahaja)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Jumlah ruang"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Mengira..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Apl (data apl &amp; kandungan media)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Apl &amp; data apl"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Muat turun"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Gambar, video"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (muzik, nada dering, podcast, dll.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Pelbagai"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Fail lain"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Data cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Nyahlekap storan kongsi"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Nyahlekap kad SD"</string>
@@ -951,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Penyahlekapan sedang berlangsung"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Ruang storan semakin berkurangan"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Beberapa fungsi sistem, seperti penyegerakan, mungkin tidak berfungsi dengan betul. Cuba kosongkan ruang dengan memadam atau menyahcemat item seperti apl atau kandungan media."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Namakan semula"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Lekap"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Keluar"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Padam &amp; format"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Pdm &amp; format sbg strn dlmn"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Sambungan komputer USB"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Sambungan komputer USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Sambung sebagai"</string>
@@ -961,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Benarkan aplikasi didayakan MIDI berfungsi melalui USB dengan perisian MIDI pada komputer anda."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Pengguna lain"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Storan peranti"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Storan boleh tanggal"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> kosong (Jumaat <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> dilekapkan"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Tidak dapat melekapkan <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> dikeluarkan dengan selamat"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Tidak dapat mengeluarkan <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> sudah diformatkan"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Tidak dapat memformat <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Namakan semula storan"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Selepas memformat, anda boleh menggunakan <xliff:g id="NAME_0">^1</xliff:g> ini dalam peranti lain. \n\nSemua data pada <xliff:g id="NAME_1">^1</xliff:g> ini akan dipadamkan. Pertimbangkan untuk membuat sandaran dahulu. \n\n"<b>"Sandarkan foto &amp; media lain"</b>" \nAlihkan fail meedia anda ke storan alternatif pada peranti ini atau pindahkannya ke komputer menggunakan kabel USB. \n\n"<b>"Sandarkan apl"</b>" \nSemua apl yang disimpan pada <xliff:g id="NAME_6">^1</xliff:g> ini akan dinyahpasang dan datanya akan dipadamkan. Untuk menyimpan apl ini, alihkannya ke storan alternatif pada peranti ini."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Apabila anda menanggalkan <xliff:g id="NAME_0">^1</xliff:g> ini, apl yang disimpan padanya akan berhenti berfungsi dan fail media yang disimpan padanya tidak akan tersedia sehingga storan itu dimasukkan semula."</b>" \n\n<xliff:g id="NAME_1">^1</xliff:g> ini diformatkan untuk berfungsi pada peranti ini sahaja. Storan ini tidak akan berfungsi pada peranti lain."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Sediakan <xliff:g id="NAME">^1</xliff:g> anda"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Gunakan sebagai storan mudah bawa"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Untuk mengalihkan foto dan media lain antara peranti."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Gunakan sebagai storan dalaman"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Untuk menyimpan apa-apa pada peranti ini sahaja, termasuk apl dan foto. Perlu diformat yang akan menghalangnya daripada berfungsi dengan peranti lain."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Format sebagai storan dalaman"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Proses ini memerlukan <xliff:g id="NAME_0">^1</xliff:g> diformatkan supaya menjadi lebih selamat. \n\nSelepas memformatnya, <xliff:g id="NAME_1">^1</xliff:g> ini hanya akan berfungsi di peranti ini sahaja. \n\n"<b>"Proses memformat akan memadamkan semua data yang disimpan pada <xliff:g id="NAME_2">^1</xliff:g>."</b>" Untuk mengelakkan daripada kehilangan data, pertimbangkan untuk membuat sandaran."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Padam &amp; format"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Memformat <xliff:g id="NAME">^1</xliff:g>..."</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Jangan tanggalkan <xliff:g id="NAME">^1</xliff:g> semasa sedang diformat."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Alihkan data ke storan baharu"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Anda boleh mengalihkan foto, fail dan data apl ke <xliff:g id="NAME">^1</xliff:g> baharu ini. \n\nPeralihan ini mengambil masa kira-kira <xliff:g id="TIME">^2</xliff:g> dan akan mengosongkan <xliff:g id="SIZE">^3</xliff:g> pada storan dalaman. Sesetengah apl tidak akan berfungsi semasa proses ini sedang dijalankan."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Alihkan sekarang"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Alihkan kemudian"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Alihkan data sekarang"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Peralihan itu mengambil masa kira-kira <xliff:g id="TIME">^1</xliff:g>. Sebanyak <xliff:g id="SIZE">^2</xliff:g> storan dalaman akan dikosongkan."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Alih"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Mengalihkan data..."</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Semasa peralihan: \n• Jangan tanggalkan <xliff:g id="NAME">^1</xliff:g>. \n• Sesetengah apl tidak akan berfungsi dengan betul. \n• Pastikan peranti terus dicas."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> sudah sedia"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> anda sudah disediakan untuk digunakan dengan foto dan media lain."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> baharu anda berfungsi. \n\nUntuk mengalihkan foto, fail dan data apl ke peranti ini, pergi ke Tetapan &gt; Storan."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Alihkan <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Mengalihkan <xliff:g id="APP">^1</xliff:g> dan datanya ke <xliff:g id="NAME_0">^2</xliff:g> akan mengambil sedikit masa sahaja. Anda tidak akan dapat menggunakan apl sehinga peralihan selesai. \n\nJangan tanggalkan <xliff:g id="NAME_1">^2</xliff:g> semasa peralihan."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Mengalihkan <xliff:g id="APP">^1</xliff:g>..."</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Jangan tanggalkan <xliff:g id="NAME">^1</xliff:g> semasa peralihan. \n\nApl <xliff:g id="APP">^2</xliff:g> pada peranti ini tidak akan tersedia sehingga peralihan selesai."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Batalkan peralihan"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Status bateri"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Aras bateri"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1005,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Tetapkan semula kepada lalai"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Penetapan semula tetapan lalai APN selesai."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Tetapan rangkaian sudah ditetapkan semula"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Ini akan menetapkan semula semua tetapan yang berkaitan dengan perangkaian kepada lalai kilang, termasuk:\n\n"<li>"Wi-Fi"</li>\n<li>"Data mudah alih"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Langkah ini akan menetapkan semula semua tetapan rangkaian, termasuk:\n\n"<li>"Wi‑Fi"</li>\n<li>"Data selular"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Tetapkan semula tetapan"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Tetapkan semula semua tetapan rangkaian? Anda tidak boleh menterbalikkan tindakan ini!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Tetapkan semula semua tetapan rangkaian? Anda tidak boleh membuat asal tindakan ini!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Tetapkan semula tetapan"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Anda perlu melukis corak buka kunci untuk mengesahkan penetapan semula tetapan rangkaian."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Tetapkan semula?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Tetapan rangkaian sudah ditetapkan semula"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Tetapan rangkaian telah ditetapkan semula"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Tetapkan semula peranti"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Tetapan semula data kilang"</string>
     <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>
@@ -1027,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Padamkan semua data pada kad SD, seperti muzik atau foto"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tetapkan semula tablet"</string>
     <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_desc" msgid="1062841478823409667">"Padamkan semua maklumat peribadi anda dan aplikasi yang dimuat turun? Anda tidak boleh membuat asal tindakan ini!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Padamkan semua"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Tetapan semula kilang tidak tersedia untuk pengguna ini"</string>
@@ -1046,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Tetapkan mel suara, pemajuan panggilan, panggilan menunggu, ID pemanggil"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Penambatan USB"</string>
@@ -1079,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Bantuan"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Rangkaian selular"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Pelan mudah alih"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Apl SMS lalai"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Apl SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Tukar apl SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Gunakan <xliff:g id="NEW_APP">%1$s</xliff:g> bukannya <xliff:g id="CURRENT_APP">%2$s</xliff:g> sebagai apl SMS anda?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Gunakan <xliff:g id="NEW_APP">%s</xliff:g> sebagai apl SMS anda?"</string>
@@ -1110,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Gunakan GPS untuk menentukan lokasi"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Mengimbas"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Mengimbas"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Pengimbasan Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Tingkatkan lokasi dengan membenarkan apl dan perkhidmatan mengimbas untuk mengesan rangkaian Wi‑Fi meskipun semasa Wi‑Fi dimatikan"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Pengimbasan Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Tingkatkan lokasi dengan membenarkan perkhidmatan sistem mengimbas untuk mengesan peranti Bluetooth, meskipun semasa Bluetooth dimatikan"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Lokasi Wi-Fi &amp; selular"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Biar apl guna perkhidmatan lokasi Google utk anggar lokasi lebih cepat. Data lokasi tanpa nama dikumpul dan dihantar kpd Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Lokasi ditentukan oleh Wi-Fi"</string>
@@ -1155,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Kata laluan sudah ditetapkan"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN belum ditetapkan"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Corak sudah ditetapkan"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Gunakan corak peranti anda untuk meneruskan."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Masukkan PIN peranti anda untuk meneruskan."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Masukkan kata laluan peranti anda untuk meneruskan."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN salah"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Kata laluan salah"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Corak salah"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Keselamatan peranti"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Tukar corak buka kunci"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Tukar PIN buka kunci"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Sahkan corak yang disimpan"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Cuba lagi:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Lukis corak buka kunci"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Tekan Menu untuk mendapatkan bantuan."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Alihkan jari apabila selesai"</string>
@@ -1181,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Tetapkan corak buka kunci"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Tukar corak buka kunci"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Cara melukis corak buka kunci"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Terlalu banyak percubaan yang salah!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Cuba lagi dalam <xliff:g id="NUMBER">%d</xliff:g> saat."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Terlalu banyak percubaan yang salah. Cuba lagi dalam <xliff:g id="NUMBER">%d</xliff:g> saat."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Aplikasi tidak dipasang pada telefon anda."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Urus aplikasi"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Urus dan alih keluar aplikasi yang dipasang"</string>
@@ -1233,7 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Isih mengikut saiz"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Tnjk prkhdmtn sdg dijlnkn"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Tunjuk proses yg dicache"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"Apl kecemasan lalai"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Apl kecemasan"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Tetapkan semula pilihan apl"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Tetapkan semula pilihan app?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Ini akan menetapkan semula semua pilihan untuk:\n\n "<li>"Apl dilumpuhkan"</li>\n" "<li>"Pemberitahuan apl dilumpuhkan"</li>\n" "<li>"Aplikasi lalai untuk tindakan"</li>\n" "<li>"Sekatan data latar belakang untuk apl"</li>\n" "<li>"Sebarang sekatan kebenaran"</li>\n\n" Anda tidak akan kehilangan apa-apa data apl."</string>
@@ -1437,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Tangkap semua paket HCI bluetooth dalam fail"</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="select_logd_size_title" msgid="7433137108348553508">"Saiz penimbal pengelog"</string>
@@ -1739,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 jam"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 hari"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Tunjukkan sistem"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Sembunyikan sistem"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Gunakan Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Jenis statistik"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Latar Belakang"</string>
@@ -1835,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Kata laluan semasa:"</string>
@@ -2210,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Pengguna"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil terhad"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Tambah pengguna baharu?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Anda boleh berkongsi peranti ini dengan orang lain dengan membuat pengguna tambahan Setiap pengguna mempunyai ruang mereka sendiri, yang boleh diperibadikan dengan kertas dinding mereka sendiri dan sebagainya Pengguna juga boleh melaraskan tetapan peranti seperti Wi-Fi yang akan memberi kesan kepada semua orang.\n\nApabila anda menambah pengguna baharu, orang itu perlu menyediakan ruang mereka.\n\nMana-mana pengguna boleh mengemas kini apl untuk semua pengguna lain."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Anda boleh berkongsi peranti ini dengan orang lain dengan membuat pengguna tambahan. Setiap pengguna mempunyai ruang mereka sendiri, yang boleh diperibadikan dengan apl, kertas dinding dan sebagainya. Pengguna turut boleh melaraskan tetapan peranti seperti Wi-Fi yang akan memberi kesan kepada semua orang.\n\nApabila anda menambahkan pengguna baharu, orang itu perlu menyediakan ruang mereka.\n\nMana-mana pengguna boleh mengemas kini apl untuk semua pengguna lain."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Apabila anda menambah pengguna baharu, orang itu perlu menyediakan ruang mereka.\n\nMana-mana pengguna boleh mengemas kini apl untuk semua pengguna lain."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Sediakan pengguna sekarang?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Pastikan orang itu tersedia untuk mengambil peranti dan menyediakan ruangan"</string>
@@ -2393,6 +2433,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"apl ais kecemasan lalai"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"app muat turun aplikasi sistem"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"keselamatan kebenaran apl"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"apl lalai"</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>
@@ -2407,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Kelantangan penggera"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Kelantangan deringan"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Kelantangan pemberitahuan"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Halang gangguan"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Benarkan keutamaan sahaja"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Peraturan automatik"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Apabila panggilan dan 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_alarms" msgid="7380265858042606857">"Benarkan penggera sahaja"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Jangan ganggu"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Keutamaan sahaja"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Penggera sahaja"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Tiada gangguan"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Nada dering telefon"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Nada dering pemberitahuan lalai"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Juga bergetar untuk panggilan"</string>
@@ -2447,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Tiada pendengar pemberitahuan dipasang."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Dayakan <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> akan dapat membaca semua pemberitahuan yang disiarkan oleh sistem atau mana-mana apl yang dipasang, yang mungkin termasuk maklumat peribadi seperti nama kenalan dan teks dalam mesej yang dihantar kepada anda. Pendengar juga akan dapat mengetepikan pemberitahuan ini atau menyentuh butang tindakan dalam pemberitahuan itu."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Pembekal keadaan"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Tiada apl yang menyediakan keadaan"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d apl menyediakan keadaan</item>
-      <item quantity="one">%d apl menyediakan keadaan</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Tiada pembekal keadaan dipasang."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Dayakan <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> akan dapat menambahkan keadaan keluar kepada mod Jangan Ganggu."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Memuatkan apl..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Sekat semua"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Jangan sekali-kali paparkan pemberitahuan dari apl ini"</string>
@@ -2469,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Keutamaan"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitif"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Nama peraturan"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Tambahkan peraturan"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Padam peraturan"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Padam peraturan \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Padam"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Jenis peraturan"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Tidak diketahui"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Peraturan konfigurasi"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Peraturan jadual"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Peraturan tidak ditemui."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Hari"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Tiada"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Setiap hari"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Tidak pernah"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> hingga <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2489,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Penggera"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Peringatan"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Acara"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Pemanggil dipilih"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Ulang pemanggil"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Jika orang yang sama memanggil sekali lagi dalam tempoh <xliff:g id="MINUTES">%d</xliff:g> minit, benarkannya"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Hidupkan secara automatik"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Jangan sekali-kali"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Setiap malam"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> hari seterusnya"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Bilakah anda ingin diganggu?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Untuk berapa lama?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Selama-lamanya"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minit</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minit</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> jam</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> jam</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Tukar kepada pemberitahuan keutamaan sahaja selama-lamanya"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Tukar kepada pemberitahuan utama hanya untuk <xliff:g id="DURATION">%1$d</xliff:g> minit sehingga <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Tukar kepada pemberitahuan utama hanya untuk satu minit sehingga <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Tukar kepada pemberitahuan utama hanya untuk <xliff:g id="DURATION">%1$d</xliff:g> jam (sehingga <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Tukar kepada pemberitahuan utama hanya untuk satu jam sehingga <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Tukar kepada penggera sahaja selama-lamanya"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Tukar kepada penggera hanya untuk <xliff:g id="DURATION">%1$d</xliff:g> minit (sehingga <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Tukar kepada penggera hanya untuk satu minit sehingga <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Tukar kepada penggera hanya untuk <xliff:g id="DURATION">%1$d</xliff:g> jam sehingga <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Tukar kepada penggera hanya untuk satu jam sehingga <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Tukar kepada jangan ganggu selama-lamanya"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Tukar kepada jangan ganggu selama <xliff:g id="DURATION">%1$d</xliff:g> minit (sehingga <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Tukar kepada jangan ganggu selama satu minit sehingga <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Tukar kepada jangan ganggu selama <xliff:g id="DURATION">%1$d</xliff:g> jam sehingga <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Tukar kepada jangan ganggu selama satu jam sehingga <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Tukar kepada sentiasa ganggu"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"selamanya"</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>
@@ -2562,7 +2659,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kebenaran diberikan</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kebenaran diberikan</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> daripada <xliff:g id="COUNT_3">%d</xliff:g> kebenaran diberikan</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> daripada <xliff:g id="COUNT_1">%d</xliff:g> kebenaran diberikan</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Beberapa lalai ditetapkan"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Tiada lalai ditetapkan"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Semua apl"</string>
@@ -2573,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Keutamaan"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensitif"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Dengan URL domain"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Tetapkan semula pilihan merentas semua apl kepada lalai"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> apl dipasang, termasuk apl sistem dan apl yang dimuat turun"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Dilumpuhkan oleh pentadbir"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Terperinci"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Apl tidak diketahui"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Pilih Profil"</string>
@@ -2589,4 +2688,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apl boleh membuka URL domain apl itu</item>
       <item quantity="one">Satu apl boleh membuka URL domain apl itu</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Tidak dikenali"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Apl Lalai"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Apl penyemak imbas"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Tiada Penyemak Imbas lalai"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Lalai)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-my-rMM/arrays.xml b/res/values-my-rMM/arrays.xml
index 3001364..83dafc8 100644
--- a/res/values-my-rMM/arrays.xml
+++ b/res/values-my-rMM/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"နှိပ်ရန်ခလုတ်"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"မီဒီယာ"</item>
     <item msgid="7924928667052300589">"စက်ပစ္စည်း"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"တည်နေရာအကြမ်း"</item>
+    <item msgid="5789673140227507995">"တည်နေရာအချော"</item>
+    <item msgid="1061584358377390581">"ဂျီပီအက်စ်"</item>
+    <item msgid="5387405117297558954">"တုန်ခါခြင်း"</item>
+    <item msgid="3434165993711230924">"အဆက်အသွယ်များဖတ်ရန်"</item>
+    <item msgid="616161687718081936">"အဆက်အသွယ်များအား ပြင်ဆင်ရန်"</item>
+    <item msgid="7638002295329050091">"ခေါ်ဆိုထားသော မှတ်တမ်းကိုဖတ်ရန်"</item>
+    <item msgid="6546959730920410907">"ခေါ်ဆိုထားသော မှတ်တမ်းကို ပြင်ဆင်ရန်"</item>
+    <item msgid="446877710771379667">"ပြက္ခဒိန်ဖတ်ရန်"</item>
+    <item msgid="7674458294386319722">"ပြက္ခဒိန်ပြင်ဆင်ရန်"</item>
+    <item msgid="8281201165558093009">"ဝိုင်ဖိုင် ရှာဖွေရန်"</item>
+    <item msgid="8694611243479480497">"အကြောင်းကြားချက်"</item>
+    <item msgid="7776439107987345446">"ဆဲလ်ဖြန့်ကြက်စူးစမ်းသည်"</item>
+    <item msgid="514615766544675057">"ဖုန်းခေါ်ရန်"</item>
+    <item msgid="8181415497109310680">"စာတိုဖတ်ရန်"</item>
+    <item msgid="6816551144382117307">"စာတိုရေးရန်"</item>
+    <item msgid="4600463921908905030">"စာတိုလက်ခံရန်"</item>
+    <item msgid="5958926493289432745">"အရေးပေါ်စာတိုလက်ခံရန်"</item>
+    <item msgid="4945269495221089540">"ရုပ်သံစာလက်ခံရန်"</item>
+    <item msgid="5570472453573929087">"WAP push လက်ခံရန်"</item>
+    <item msgid="7125408150230860501">"စာတိုပို့ရန်"</item>
+    <item msgid="7080337936612188061">"ကဒ်ထဲမှ စာတိုဖတ်ရန်"</item>
+    <item msgid="587124103118495063">"ICC စာတိုရေးရန်"</item>
+    <item msgid="2320577158869025503">"ဆက်တင်များ ပြင်ဆင်ရန်"</item>
+    <item msgid="1545733463471924009">"အပေါ်မှ ဆွဲရန်"</item>
+    <item msgid="3609046903962454582">"အကြောင်းကြားချက်များအား အသုံးပြုခွင့်"</item>
+    <item msgid="4671646036128214513">"ကင်မရာ"</item>
+    <item msgid="1097324338692486211">"အသံဖမ်းခြင်း"</item>
+    <item msgid="5031552983987798163">"အသံဖွင့်ခြင်း"</item>
+    <item msgid="8374996688066472414">"နောက်ခံမှတ်တမ်း ဖတ်ရန်"</item>
+    <item msgid="3045529469061083747">"နောက်ခံမှတ်တမ်းပြင်ဆင်ရန်"</item>
+    <item msgid="5124443975763747838">"မီဒီယာခလုတ်များ"</item>
+    <item msgid="4547883971364273343">"အသံပြတ်သားအောင်ချိန်ရန်"</item>
+    <item msgid="2603878814882344450">"ပင်မအသံအတိုးအကျယ်"</item>
+    <item msgid="7136963238377062018">"စကားသံအတိုးအကျယ်"</item>
+    <item msgid="4270236897655923007">"ဖုန်းမြည်သံ အတိုးအကျယ်"</item>
+    <item msgid="6325739889222559394">"မီဒီယာအသံအတိုးအကျယ်"</item>
+    <item msgid="5762123934816216821">"နှိုးစက်သံအတိုးအကျယ်"</item>
+    <item msgid="785049718065337473">"အကြောင်းကြားသံအတိုးအကျယ်"</item>
+    <item msgid="6700305533746877052">"ဘလူးတုသ်သံအတိုးအကျယ်"</item>
+    <item msgid="2029227495214047094">"ဖွင့်လျှက်ထားရှိရန်"</item>
+    <item msgid="26109888160231211">"တည်နေရာအား စောင့်ကြည့်စစ်ဆေးရန်"</item>
+    <item msgid="5753382310468855812">"စွမ်းအားမြင့် ဖန်သားပြင် တည်နေရာ"</item>
+    <item msgid="3356591542543137332">"သုံးစွဲမှု စာရင်းအင်းများကို ရယူရန်"</item>
+    <item msgid="3073734345226842233">"မိုက်ခရိုဖုန်း အသံတိတ်/မတိတ်ရန်"</item>
+    <item msgid="1148142988678569310">"ပရိုဂျက် မီဒီယာ"</item>
+    <item msgid="9130014005474445273">"VPN ကို စဖွင့်သုံးရန်"</item>
+    <item msgid="1165192162975045562">"နောက်ခံကိုရေးပါ"</item>
+    <item msgid="7129487923652967258">"ဖွဲ့စည်းပုံကိုကူညီရန်"</item>
+    <item msgid="1069023208100114540">"ဖန်သားပြင်ရိုက်ကွက်အားကူညီရန်"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"တည်နေရာ"</item>
+    <item msgid="8677040780775113033">"တည်နေရာ"</item>
+    <item msgid="1660743989948992916">"တည်နေရာ"</item>
+    <item msgid="8791172739860195290">"တုန်ခါခြင်း"</item>
+    <item msgid="383413555642128046">"အဆက်အသွယ်များဖတ်ရန်"</item>
+    <item msgid="3654594895269697313">"အဆက်အသွယ်များပြင်ဆင်ရန်"</item>
+    <item msgid="7928393476362362538">"ခေါ်ဆိုထားသော မှတ်တမ်းကိုဖတ်ရန်"</item>
+    <item msgid="6248591205254641116">"ခေါ်ဆိုထားသော မှတ်တမ်းကို ပြင်ဆင်ရန်"</item>
+    <item msgid="6093344633066170692">"ပြက္ခဒိန်ဖတ်ရန်"</item>
+    <item msgid="1334886368750347692">"ပြက္ခဒိန်ပြင်ဆင်ရန်"</item>
+    <item msgid="1638204101698708656">"တည်နေရာ"</item>
+    <item msgid="2154671955760380322">"အကြောင်းကြားစာကို တင်ရန်"</item>
+    <item msgid="4282477730595931828">"တည်နေရာ"</item>
+    <item msgid="4891423912898525905">"ဖုန်းခေါ်ရန်"</item>
+    <item msgid="2623604824935968113">"စာတို/ရုပ်သံစာ ဖတ်ရန်"</item>
+    <item msgid="4420177125221176306">"စာတို/ရုပ်သံစာ ရေးရန်"</item>
+    <item msgid="3986142739951490025">"စာတို/ရုပ်သံစာ လက်ခံရန်"</item>
+    <item msgid="3984213795861739778">"စာတို/ရုပ်သံစာ လက်ခံရန်"</item>
+    <item msgid="3656243523752472788">"စာတို/ရုပ်သံစာ လက်ခံရန်"</item>
+    <item msgid="8105802370238551510">"စာတို/ရုပ်သံစာ လက်ခံရန်"</item>
+    <item msgid="1407766984645388488">"စာတို/ရုပ်သံစာ ပို့ရန်"</item>
+    <item msgid="3527273606643794973">"စာတို/ရုပ်သံစာ ဖတ်ရန်"</item>
+    <item msgid="4370895547001583812">"စာတို/ရုပ်သံစာ ရေးရန်"</item>
+    <item msgid="4218544235221631789">"ဆက်တင်များ ပြင်ဆင်ရန်"</item>
+    <item msgid="736541391767350377">"အပေါ်မှ ဆွဲရန်"</item>
+    <item msgid="5530815681721654194">"အကြောင်းကြားချက်များအား အသုံးပြုခွင့်"</item>
+    <item msgid="781213371706962767">"ကင်မရာ"</item>
+    <item msgid="1720492593061838172">"အသံဖမ်းရန်"</item>
+    <item msgid="3493046322001257041">"အသံဖွင့်ရန်"</item>
+    <item msgid="136815868796597058">"နောက်ခံမှတ်တမ်း ဖတ်ရန်"</item>
+    <item msgid="5238692940326972503">"နောက်ခံမှတ်တမ်းပြင်ဆင်ရန်"</item>
+    <item msgid="5753789168376302997">"မီဒီယာခလုတ်များ"</item>
+    <item msgid="3265262911688671938">"အသံပြတ်သားအောင်ချိန်ရန်"</item>
+    <item msgid="2098976479485046797">"ပင်မအသံအတိုးအကျယ်"</item>
+    <item msgid="5660213838861789350">"စကားသံအတိုးအကျယ်"</item>
+    <item msgid="7983336752371254444">"ဖုန်းမြည်သံ အတိုးအကျယ်"</item>
+    <item msgid="7878027809189330917">"မီဒီယာအသံအတိုးအကျယ်"</item>
+    <item msgid="7260546305036218513">"နှိုးစက်သံအတိုးအကျယ်"</item>
+    <item msgid="9103719301075748925">"အကြောင်းကြားသံအတိုးအကျယ်"</item>
+    <item msgid="7025966722295861512">"ဘလူးတုသ်သံအတိုးအကျယ်"</item>
+    <item msgid="4665183401128289653">"ဖွင့်လျှက်ထားရှိရန်"</item>
+    <item msgid="8584357129746649222">"တည်နေရာ"</item>
+    <item msgid="7669257279311110599">"တည်နေရာ"</item>
+    <item msgid="3459320345690097795">"သုံးစွဲမှု စာရင်းအင်းများကို ရယူရန်"</item>
+    <item msgid="1312534577834048535">"မိုက်ခရိုဖုန်း အသံတိတ်/မတိတ်ရန်"</item>
+    <item msgid="5906017727368097853">"ပရိုဂျက် မီဒီယာ"</item>
+    <item msgid="2486614710846178542">"VPN ကို စဖွင့်သုံးရန်"</item>
+    <item msgid="5586547561693629602">"နောက်ခံရေးပါ"</item>
+    <item msgid="32794179825485062">"ဖွဲ့စည်းပုံကိုကူညီရန်"</item>
+    <item msgid="7872852746938272552">"ဖန်သားပြင်ရိုက်ကွက်အားကူညီရန်"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"အတို"</item>
     <item msgid="2560532955514699713">"အတော်အသင့်"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"နည်းနေသည်"</item>
     <item msgid="4212263919458209842">"စိုးရိမ်ရသည်"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"ပိတ်"</item>
-    <item msgid="5656544177755411222">"ကန့်သတ်ချက်ရှိသော အ​နှောင့်အယှက်များ"</item>
-    <item msgid="8735337502532332056">"အနှောင့်အယှက်မရှိ"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"ပုံမှန်"</item>
     <item msgid="866544120205026771">"အတော်အသင့်"</item>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index d98c49c..40338ec 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD ကဒ်"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"ပရော်စီအပြင်အဆင်များ"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"လုပ်မည်"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"မလုပ်"</string>
-    <string name="forget" msgid="7267115980248732932">"မေ့ပစ်လိုက်"</string>
+    <string name="forget" msgid="1400428660472591263">"မေ့ပစ်ရန်"</string>
+    <string name="save" msgid="879993180139353333">"သိမ်းဆည်းရန်"</string>
+    <string name="done" msgid="6942539184162713160">"ပြီးပါပြီ"</string>
     <string name="settings_label" msgid="1626402585530130914">"ဆက်တင်များ"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"ဆက်တင်များ"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"ဆက်တင်အတိုကောက်"</string>
@@ -374,7 +372,6 @@
     <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_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>
@@ -419,8 +416,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"ပုံစံ"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"ပင်နံပါတ်"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"လျို့ဝှက် နံပါတ်"</string>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"ဖုန်းမျက်နှာပြင်လော့ချမှုစလုပ်သည့်အခါ ပြင်ဆင်ရွေးချယ်ရေးနှင့်လုံခြံရေးတွင် သင့်လက်ဗွေဖြင့်လည်းလော့ချနိုင်သည်။"</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>
@@ -522,8 +518,7 @@
     <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>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"တည်နေရာ မှန်ကန်မှု တိုးတက်စေရန်၊ အပ်ဖ်များနှင့် ဝန်ဆောင်မှုများသည် ဘလူးတုသ်ပိတ်ထားလျှင်တောင် ဘလူးတုသ်စက်ပစ္စည်းများကို ရှာဖွေပါလိမ့်မည်။ ၎င်းကိုသင် <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ရှာဖွေခြင်း ချိန်ညှိချက်များ<xliff:g id="LINK_END_1">LINK_END</xliff:g> တွင်ပြောင်းနိုင်ပါသည်။"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"ကိုချိတ်ဆက်ရန်"</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>
@@ -589,8 +584,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"တည်နေရာ မှန်ကန်မှု တိုးတက်စေရန်၊ အပ်ဖ်များနှင့် ဝန်ဆောင်မှုများသည် ဝိုင်ဖိုင်ပိတ်ထားလျှင်တောင် ဝိုင်ဖိုင်ကွန်ရက်များကို ရှာဖွေပါလိမ့်မည်၊ ၎င်းကိုသင် <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ရှာဖွေခြင်း ချိန်ညှိချက်များ<xliff:g id="LINK_END_1">LINK_END</xliff:g> တွင်ပြောင်းလဲနိုင်ပါသည်။"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"နောက်ထပ်မပြပါနှင့်"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"စက်နားနေစဉ် ဝိုင်ဖိုင်ဖွင့်ထားပါ"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"စက်နားနေစဉ် ကြိုးမဲ့ ဖွင့်ထားရန်"</string>
@@ -607,8 +601,6 @@
     <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_apps" msgid="6003687912727859577">"Appများကို ပြရန်"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"WiFi အားကို ပြရန်"</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>
@@ -666,6 +658,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ချိတ်ဆက်ရန်"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"ဤကွန်ယက်တွင် အင်တာနက်ဝင်ရောက်သုံးခွင့် မရှိပါ။ မည်သို့ပင်ဖြစ်စေ ဤကွန်ယက်အား သုံးမည်လား?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"ဤကွန်ယက်အား ထပ်မံမေးမြန်းခြင်း မပြုရန်"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"ချိတ်ဆက်ရန်"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ကွန်ရက်ကို ချိတ်ဆက်ရန် မအောင်မြင်ခဲ့ပါ"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"မေ့ပစ်ရန်"</string>
@@ -737,12 +731,10 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"ဝိုင်ဖိုင်အား ပိုနှစ်သက်သော"</item>
     <item msgid="5267397515594230396">"ဆယ်လူလာအား ပိုနှစ်သက်သော"</item>
-    <item msgid="3132912693346866895">"ကြိုးမဲ့အင်တာနက် သာလျှင်"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"၂"</item>
     <item msgid="1171822231056612021">"၁"</item>
-    <item msgid="3194458950573886239">"၀"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"သင့်ရွေးချယ်မှု သိုမ့ဟုတ်  စစ်ဂနယ် အားရှိမှုပေါ် မူတည်လျှက်၊ ဝိုင်ဖိုင်ခေါ်ဆိုမှု ဖွင့်ထားပါက၊ သင့်ဖုန်းသည် ဝိုင်ဖိုင်ကွန်ယက်များ သို့မဟုတ် သင့် မိုဘိုင်းဝန်ဆောင်မှုဌာန၏ ကွန်ယက်မှတဆင့် ခေါ်ဆိုမှုများအား ပေးပို့နိုင်သည်။ ဤလုပ်ဆောင်နိုင်ချက်အား မဖွင့်မီ၊ ကျသင့်ငွေနှင့် အခြားအသေးစိတ်များအတွက် သင့် မိုဘိုင်းဝန်ဆောင်မှုဌာနအား မေးမြန်းပါ။"</string>
     <string name="home_settings" msgid="212375129455718176">"ပင်မ​စာ​မျက်နှာ"</string>
@@ -916,12 +908,12 @@
     <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">"အပလီကေးရှင်းများ(အပလီကေးရှင်းဒေတာ &amp; မီဒီယာမာတိကာ)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"အပ်ဖ် &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_music_usage" msgid="1363785144783011606">"အသံ (သီချင်း၊ တီးလုံး စသည်ဖြင့်)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"အသေးအဖွဲများ"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"အခြားဖိုင်များ"</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>
@@ -954,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"အထိုင်မှဖြုတ်နေပါသည်"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"သိမ်းဆည်းရန်နေရာနည်းနေသည်။"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"ထပ်တူညီအောင်လုပ်ခြင်းကဲ့သို့ အချို့ စနစ်လုပ်ဆောင်ချက်များသည် မှန်ကန်စွာ အလုပ်မလုပ်နိုင်ပါ။ သုံးနေကျမဟုတ်သော အပလီကေးရှင်းများ မီဒီယာအချက်အလက်များကို ဖျက်ခြင်းဖြင့်နေရာလွတ်ရရှိရန် ကြိုးစားကြည့်ပါ။"</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"အမည်ပြောင်းရန်"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"တပ်ဆင်ရန်"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"ထုတ်ရန်"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"ဖျက်ရန် &amp; ဖိုင်ပြန်စီရန်"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"ဖျက်&amp; သိုလှောင်မှုအဖြစ်ဖိုင်စီ"</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>
@@ -964,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"MIDI ဖွင့်ထားသည့်အပလီကေးရှင်းအား USB မှပေါ်မှ MIDI ဆော့ဖ်ဝဲဖြင့် သင့်ကွန်ပျူတာပေါ်တွင် အလုပ်လုပ်စေနိုင်ပါသည်။"</string>
     <string name="storage_other_users" msgid="808708845102611856">"အခြားသုံးစွဲသူများ"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"စက်ပစ္စည်းသိုလှောင်မှု"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"ဖြုတ်၍ရသည့် သိုလှောင်မှု"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> အလွတ် (စုစုပေါင်း <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> ကိုတပ်ဆင်ထားသည်"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g>ကိုတပ်ဆင်၍မရပါ"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g>ကိုလုံခြုံစွာ ထုတ်လိုက်ပြီ"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g>ကိုလုံခြုံစွာ မထုတ်နိုင်ပါ"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> သည်ဖိုင်စီပြီးဖြစ်သည်"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> အားဖိုင်ပြန်မစီနိုင်ပါ"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"သိုလှောင်မှုကို အမည်​ပြောင်းမည်"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"ပုံစံပြန်ချပြီးနောက်၊ ဤ <xliff:g id="NAME_0">^1</xliff:g> ကိုအခြားစက်ပစ္စည်းများတွင် အသုံးပြုနိုင်သည်။ \n\nဤ <xliff:g id="NAME_1">^1</xliff:g> ပေါ်ရှိဒေတာများအားလုံး ဖျက်ပစ်ပါမည်။ အရံကူးယူထားရန် စဉ်းစားပါ။ \n\n"<b>"ပုံများ &amp; အခြားမီဒီယာများ ကိုအရံကူးယူပါ "</b>" \nဤစက်ပစ္စည်းပေါ်ရှိအခြား သိုလှောင်မှုသို့ သင့်မီဒီယာများကို ရွှေ့ပါ၊ သို့မဟုတ် USB ကြိုးအသုံးပြု၍ ကွန်ပျူတာသို့ လွှဲပြောင်းပါ။ \n\n"<b>"အပ်ဖ်များ အရံကူးယူပါ"</b>" \nဤ <xliff:g id="NAME_6">^1</xliff:g> ပေါ်တွင်သိုလှောင်ထားသည့် အပ်ဖ်များကို ဖြုတ်ပစ်မည်ဖြစ်ပြီး ၎င်းတို့၏ဒေတာများကို ဖျက်ပစ်ပါမည်။ ဤအပ်ဖ်များကို ထားရှိရန်၊ ဤစက်ပစ္စည်းပေါ်ရှိ အခြားသိုလှောင်မှုသို့ ရွှေ့ပါ။"</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"<xliff:g id="NAME_0">^1</xliff:g> ကိုသင်ထုတ်လိုက်လျှင်၊ ၎င်းပေါ်တွင်သိုလှောင်ထားသည့် အပ်ဖ်များသည် အလုပ်လုပ်တော့မည်မဟုတ်ဘဲ ၎င်းပေါ်တွင် သိုလှောင်ထားသည့် မီဒီယာဖိုင်များလည်း ၎င်းကိုပြန် မထည့်မချင်းရနိုင်တော့မည်မဟုတ်ပါ။ "</b>" \n\n<xliff:g id="NAME_1">^1</xliff:g> ကိုဤစက်ပစ္စည်းပေါ်တွင် အလုပ်လုပ်ရန်သာ ပုံစံချထားခြင်းဖြစ်သည်။ အခြားနေရာများတွင် အလုပ်လုပ်မည် မဟုတ်ပါ။"</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"သင့် <xliff:g id="NAME">^1</xliff:g> ကိုတပ်ဆင်မည်"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"ရွှေ့လျားနိုင်သည့် သိုလှောင်မှုအဖြစ် သုံးမည်"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"စက်ပစ္စည်းများအကြား ပုံများနှင့် အခြားမီဒီယာများရွှေ့လျားရန်အတွက်။"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"အတွင်းသိုလှောင်မှုအဖြစ် အသုံးပြုမည်"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"အပ်ဖ်များနှင့် ပုံများ အပါအဝင် ဤစက်ပစ္စည်းပေါ်တွင်သာ သိုလှောင်ရန်အတွက် ဖြစ်သည်။ ပုံစံချရန်လိုအပ်ပြီး ၎င်းသည်အခြားစက်ပစ္စည်းများနှင့် အလုပ်လုပ်ခြင်းမှ ကာကွယ်မည်ဖြစ်သည်။"</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"အတွင်းသိုလှောင်မှုအဖြစ် ပုံစံချမည်"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"လုံခြုံစေရန်အတွက် ၎င်းတွင် <xliff:g id="NAME_0">^1</xliff:g> ကိုပုံစံချထားရန် လိုအပ်ပါသည်။\n\nပုံစီချပြီးနောက်၊ <xliff:g id="NAME_1">^1</xliff:g> သည်ဤစက်ပစ္စည်းတွင်သာ အလုပ်လုပ်ပါမည်။ \n\n"<b>"ပုံစံချခြင်းဖြင့်<xliff:g id="NAME_2">^1</xliff:g>တွင်လက်ရှိသိုလှောင်ထားသည့် ဒေတာများအားလုံးကို ဖျက်ပစ်မည်ဖြစ်သည်။"</b>" ဒေတာများ ဆုံးရှုံးခြင်းမှ ကာကွယ်ရန်၊ အရံကူးယူထားရန် စဉ်းစားပါ။"</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"ဖျက်မည် &amp; ပုံစံချမည်"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g>ပုံစံချနေသည်…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"ပုံစံချနေစဉ်တွင် <xliff:g id="NAME">^1</xliff:g> ကိုအဖယ်ရှားပါနှင့်။"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ဒေတာကို သိုလှောင်မှုအသစ်သို့ ရွှေ့မည်"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"သင့်ပုံများ၊ ဖိုင်များနှင့် အပ်ဖ်ဒေတာများကို ဤ <xliff:g id="NAME">^1</xliff:g>အသစ်ပေါ်သို့ ရွှေ့လျားနိုင်ပါသည်။ \n\nရွှေ့လျားခြင်းသည် <xliff:g id="TIME">^2</xliff:g>ခန့်ကြာမည်ဖြစ်ပြီး အတွင်းသိုလှောင်မှုတွင် <xliff:g id="SIZE">^3</xliff:g> ခန့်နေရာလွတ်သွားပါမည်။ ၎င်းပြုလုပ်နေစဉ် အချို့သောအပ်ဖ်များ အလုပ်လုပ်မည်မဟုတ်ပါ။"</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"ယခုရွှေ့မည်"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"နောက်မှ ရွှေ့မည်"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"ဒေတာများယခု ရွှေ့မည်"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"ရွှေ့လျားမှုသည် <xliff:g id="TIME">^1</xliff:g> ခန့်ကြာပါမည်။ အတွင်းသိုလှောင်မှု <xliff:g id="SIZE">^2</xliff:g> ခန့်နေရာလွတ်သွားပါမည်။"</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"ရွေ့မည်"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"ဒေတာရွှေ့နေသည်…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"ရွှေ့နေစဉ်: \n• <xliff:g id="NAME">^1</xliff:g> ကိုမဖယ်ရှားပါနှင့်။ \n• အချို့အပ်ဖ်များ မှန်ကန်စွာ အလုပ်လုပ်မည်မဟုတ်ပါ။ \n• စက်ပစ္စည်းကို အားသွင်းထားပါ။"</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> သည်အဆင်သင့် ဖြစ်ပါပြီ"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"သင့် <xliff:g id="NAME">^1</xliff:g> သည်ဓာတ်ပုံများနှင့် အခြားမီဒီယာများဖြင့် အသုံးပြုရန် အဆင်သင့်ဖြစ်ပါပြီ။"</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"သင့်<xliff:g id="NAME">^1</xliff:g>အသစ်သည် အလုပ်လုပ်ပါပြီ။ \n\nဓာတ်ပုံများ၊ ဖိုင်များနှင့် အပ်ဖ်ဒေတာများကို ဤစက်ပစ္စည်းသို့ ရွှေ့ရန် ကြိုတင်ချိန်ညှိချက်များထဲမှ  &gt; သိုလှောင်မှုသို့ သွားပါ။"</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> ရွှေ့မည်"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<xliff:g id="APP">^1</xliff:g> နှင့်၎င်း၏ ဒေတာများကို<xliff:g id="NAME_0">^2</xliff:g> သို့ရွှေ့ခြင်းသည် အချိန်အနည်းငယ် ကြာပါမည်။ ရွှေ့လျားမှု မပြီးမြောက်မချင်း အပ်ဖ်များကို အသုံးပြု၍ရမည် မဟုတ်ပါ။ \n\nရွှေ့လျားနေစဉ် <xliff:g id="NAME_1">^2</xliff:g> ကိုမဖယ်ရှားပါနှင့်။"</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g>ရွှေ့နေသည်…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"ရွှေ့လျားနေစဉ် <xliff:g id="NAME">^1</xliff:g>ကိုမဖယ်ရှားပါနှင့်။ \n\nဤစက်ပစ္စည်းပေါ်ရှိ <xliff:g id="APP">^2</xliff:g> အပ်ဖ်ကို ရွှေလျားမှုမပြီးသ၍ အသုံးပြု၍ရမည်မဟုတ်ပါ။"</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ရွှေ့လျားမှု ပယ်ဖျက်မည်"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"ဘက်ထရီအခြေအနေ"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ဘက်ထရီ အားအဆင့်"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1008,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"စနစ်အား မူလစက်ရုံအခြအေနေထံ ပြန်လည်သတ်မှတ်ရန်"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN ၏မူရင်းအပြင်အဆင်များကို အစသို့ပြန်လည်စတင်မှုအား ပြီးဆုံးပါပြီ"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"ကွန်ရက် ချိန်ညှိမှုများ ပြန်လည်သတ်မှတ်ရန်"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"၎င်းသည် ကွန်ရက်နှင့် ပတ်သတ်သော ချိန်ညှိမှုများ အားလုံးကို စက်ရုံမူရင်းသို့ ပြန်လည်သတ်မှတ်ပါလိမ့်မည်၊ ပါဝင်သည်မှာ:\n\n"<li>"ဝိုင်ဖိုင်"</li>\n<li>"မိုဘိုင်းဒေတာ"</li>\n<li>"ဘလူးတုသ်"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"၎င်းသည် :\n\n"<li>"ဝိုင်ဖိုင်"</li>\n<li>"ဆဲလ်လူလာ ဒေတာ"</li>\n<li>"ဘလူးတုသ်"</li>" အပါအဝင် ကွန်ရက်ချိန်ညှိချက်များအားလုံး ပြန်လည်သတ်မှတ်ပါလိမ့်မည်"</string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"ချိန်ညှိချက်များ ပြန်လည်သတ်မှတ်ရန်"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"ကွန်ရက်ချိန်ညှိချက်များအားလုံးပြန်လည်သတ်မှတ်မည်လား? ဤလုပ်ဆောင်ချက်ကို ပြန်လည်နောက်ပြန်၍ မရပါ!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"ကွန်ရက်ချိန်ညှိချက်များအားလုံးပြန်လည်သတ်မှတ်မည်လား? ဤလုပ်ဆောင်ချက်ကို ပြန်လည်နောက်ပြန်၍ မရပါ!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"ချိန်ညှိချက်များ ပြန်လည်သတ်မှတ်ရန်"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"ကွန်ရက်ချိန်ညှိမှုများ ပြန်လည်သတ်မှတ်ရန် သော့ဖွင့်သည့်ပုံစံကို ဆွဲပြီး အတည်ပြုရန် လိုအပ်သည်။"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"ပြန်လည်စတင်ရန် ပြုလုပ်မလား?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"ကွန်ရက် ချိန်ညှိမှုများ ပြန်လည်သတ်မှတ်ရန်"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"ကွန်ရက်ချိန်ညှိချက်များ ပြန်လည်သတ်မှတ်ပြီးပါပြီ"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"ကိရိယာ ပြန်ညှိရန်"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"စက်ရုံထုတ်အခြေအနေပြန်ယူခြင်း"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ဤသည်မှာ သင့်တက်ဘလက်ထဲရှိ"<b></b>"သင့်ဂူးဂဲလ်အကောင့်\n\n"<li>"စနစ်နှင့် အပ်ပလီကေးရှင်းဒေတာနှင့် ဆက်တင်များ"</li>\n<li>"ဒေါင်းလုပ်ပြုလုပ်ထားသော အပ်ပလီကေးရှင်း"</li>"iအပါအဝင်\n"<li>"စက်အတွင်းသိမ်းဆည်းထားခြင်း"</li>"များကို ဖျက်ပါလိမ့်မည်"</string>
@@ -1030,9 +1065,8 @@
     <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="1062841478823409667">"သင့်ကိုယ်ပိုင်အချက်အလက်များနှင့် ဒေါင်းလုပ်ပြုလုပ်ထားသောအပလီကေးရှင်းများကို ဖျက်မည်လား? ဤလုပ်ဆောင်ချက်ကို ပြန်လည်နောက်ပြန်၍မရပါ!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"အားလုံးကိုဖျက်ရန်"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"ဤအသုံးပြုသူအတွက် စက်ရုံပြန်လည် သတ်မှတ်မှု မရပါ"</string>
@@ -1050,8 +1084,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_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>
@@ -1083,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"အကူအညီ"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"ဆယ်လူလာ ကွန်ရက်များ"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"မိုဘိုင်းလ်အစီအစဉ်"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"စာတိုပို့ရန်သုံး အပလီကေးရှင်း"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS အပ်ဖ်"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"စာတိုပို့ရန် အပလီကေးရှင်းပြောင်းမည်လား?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"သင့်စာတိုပို့ရန် အပလီကေးရှင်းအတွက် <xliff:g id="NEW_APP">%1$s</xliff:g> ကို <xliff:g id="CURRENT_APP">%2$s</xliff:g> အစား သုံးမည်လား?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g> ကို သင်၏စာတိုပို့ရန် အပလီကေးရှင်းအဖြစ် သုံးမည်လား ?"</string>
@@ -1114,6 +1146,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"တည်နေရာကို ဆုံးဖြတ်ရန် ဂျီပီအက်စ်ကို သုံးပါ။"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"သေချာစစ်ဆေးနေပါသည်။"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"သေချာစစ်ဆေးနေပါသည်။"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"ဝိုင်ဖိုင်ရှာဖွေနေသည်"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"ဝိုင်ဖိုင်ပိတ်ထားလျှင်တောင် အပ်ဖ်များနှင့် ဝန်ဆောင်မှုများကို ဝိုင်ဖိုင်ကွန်ရက်များအား ရှာဖွေစေခြင်းဖြင့် တည်နေရာကို တိုးတက်စေပါ"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ဘလူးတုသ်ရှာဖွေနေသည်"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"ဘလူးတုသ်ပိတ်ထားလျှင်တောင် ဘလူးတုသ်စက်ပစ္စည်းများကို စနစ်ဝန်ဆောင်မှုအား ရှာဖွေခွင့်ပေးခြင်းဖြင့် တည်နေရာကို တိုးတက်စေမည်"</string>
     <string name="location_network_based" msgid="6010456018401296590">"ကြိုးမဲ့ &amp; ဆယ်လူလာ ကွန်ရက် တည်နေရာ"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"သင့်တည်နေရာကို ခန့်မှန်းရာတွင် ပိုမြန်စေရန် အပလီကေးရှင်းကို ဂူဂယ်လ်၏ တည်နေရာဝန်ဆောင်မှု အသုံးပြုပါစေ။ အမည်မသိ တည်နေရာ အချက်အလက်များကို စု၍ ဂူဂဲလ်သို့ ပို့ပေးပါမည်။"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"ဝိုင်ဖိုင်မှ ဆုံးဖြတ်သော တည်နေရာ"</string>
@@ -1159,11 +1195,15 @@
     <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="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"ရှေ့ဆက်ရန် သင့်စက်ပစ္စည်းပုံစံကို အသုံးပြုပါ။"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"ရှေ့ဆက်ရန် သင့်စက်ပစ္စည်း ပင်ကုဒ်နံပါတ်ရိုက်ထည့်ပါ။"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"ရှေ့ဆက်ရန် သင့်စက်ပစ္စည်းစကားဝှက်ကို ရိုက်ထည့်ပါ။"</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"ပင် နံပါတ်အမှား"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"စကားဝှက်အမှား"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"ပုံစံအမှား"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"ကိရိယာ လုံခြုံရေး"</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>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"အကူအညီရယူရန် Menuကိုနှိပ်ပါ"</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"ပြီးဆုံးလျှင် လက်ချောင်းကို လွှတ်လိုက်ပါ။"</string>
@@ -1185,8 +1225,7 @@
     <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" msgid="6909161623701848863">"အလွန်များသည့် မမှန်ကန်သော ကြိုးစားမှုများရှိသည်။ <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>
@@ -1237,7 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"အရွယ်အစားအလိုက် စီရန်"</string>
     <string name="show_running_services" msgid="5736278767975544570">"လုပ်နေသောဆားဗစ်များပြရန်"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"cachedလုပ်ငန်းများပြသရန်"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"မူလ အရေးပေါ် app"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"အရေးပေါ်အပ်ဖ်"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"အပလီကေးရှင်း ဦးစားပေးချက်များ အစမှပြန်စရန်"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"အပလီကေးရှင်းဦးစားပေးချက်များကို အစမှ ပြန်စမည်လား?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"၎င်းသည် \n\n "<li>"အပလီကေးရှင်းများ မသုံးနိုင်အောင်ပိတ်ခြင်း "</li>\n" "<li>"အပလီကေးရှင်းအကြောင်းကြားချက်များ ပိတ်ခြင်း"</li>\n" "<li>"လုပ်ဆောင်ချက်အတွက်သတ်မှတ်အပလီကေးရှင်းများ"</li>\n" "<li>"အပလီကေးရှင်းများနောက်ခံအချက်အလက်အသုံးပြုမှုကန့်သတ်ခြင်းများ"</li>\n" "<li>"မည်သည့်ခွင့်ပြုမှုကန့်သတ်ချက်များမဆို"</li>" တို့၏ဦးစားပေးချက်အားလုံးကို အစမှ ပြန်စပါလိမ့်မည်။\n\n သင်၏ အပလီကေးရှင်းဒေတာများ မပျောက်ပျက်ပါ။"</string>
@@ -1441,8 +1480,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ဘလူးတုသ် HCI အစုလိုက်များကို ဖိုင်တစ်ခုတွင် ဖမ်းယူရန်"</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="select_logd_size_title" msgid="7433137108348553508">"လော့ဂါး ဘာဖား ဆိုက်များ"</string>
@@ -1743,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"၁၂ နာရီ"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"၁ ရက်"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"စနစ်ကိုပြသရန်"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"စနစ်ကို ဖျောက်မည်"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss သုံးခြင်း"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Stats အမျိုးအစားများ"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"နောက်ခံ"</string>
@@ -1839,7 +1877,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_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>
@@ -2214,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"သုံးစွဲသူ"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"ကန့်သတ်ထားသော ကိုယ်ရေးအချက်အလက်များ"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"အသုံးပြုသူ အသစ်ကို ထည့်ရမလား?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"သင်သည် ဒီကိရိယာကို ဖြည့်စွက် အသုံးပြုသူများကို ဖန်တီးပေးလျက် မျှဝေပေးနိုင်သည်။ အသုံးပြုသူတိုင်းဆီမှာ ၎င်း၏ ကိုယ်ပိုင် နေရာ ရှိမည် ဖြစ်ရာ သူတို့သည် ကိုယ်ပိုင် appများ၊ နောက်ခံပုံ၊ စသဖြင့် မိမိစိတ်ကြိုက် ပြုလုပ်နိုင်ကြမည်။ ထို့အပြင် အသုံးပြုသူတို့သည် လူတိုင်း အပေါ် အကျိုးသက်ရောက်နိုင်သည့် ကြိုးမဲ့လို ကိရိယာ ဆက်တင်များကိုပါ ညှိနှိုင်းနိုင်ကြသည်။\n\nသင်က အသုံးပြုသူ အသစ် တစ်ဦးကို ထည့်ပေးလိုက်လျှင်၊ ထိုသူသည် ၎င်း၏ နေရာကို သတ်မှတ်စီစဉ်ရန် လိုအပ်မည်။\n\n အသုံးပြုသူ မည်သူမဆို ကျန်အသုံးပြုသူ အားလုံးတို့အတွက် appများကို မွမ်းမံပေးနိုင်သည်။"</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"သင်သည် ဒီကိရိယာကို ဖြည့်စွက် အသုံးပြုသူများကို ဖန်တီးပေးလျက် မျှဝေပေးနိုင်သည်။ အသုံးပြုသူတိုင်းဆီမှာ ၎င်း၏ ကိုယ်ပိုင် နေရာ ရှိမည် ဖြစ်ရာ သူတို့သည် ကိုယ်ပိုင် အပ်ဖ်များ၊ နောက်ခံပုံ၊ စသဖြင့် မိမိစိတ်ကြိုက် ပြုလုပ်နိုင်ကြမည်။ ထို့အပြင် အသုံးပြုသူတို့သည် လူတိုင်း အပေါ် အကျိုးသက်ရောက်နိုင်သည့် ကြိုးမဲ့လို ကိရိယာ ဆက်တင်များကိုပါ ညှိနှိုင်းနိုင်ကြသည်။\n\nသင်က အသုံးပြုသူ အသစ် တစ်ဦးကို ထည့်ပေးလိုက်လျှင်၊ ထိုသူသည် ၎င်း၏ နေရာကို သတ်မှတ်စီစဉ်ရန် လိုအပ်မည်။\n\n အသုံးပြုသူ မည်သူမဆို ကျန်အသုံးပြုသူ အားလုံးတို့အတွက် အပ်ဖ်များကို မွမ်းမံပေးနိုင်သည်။"</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>
@@ -2397,6 +2434,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"မူလ အရေးပေါ် ice app"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"app များ ဒေါင်းလုပ်ရယူသော အပ္ပလီကေးရှင်းစနစ်"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"အပ်ဖ်များ ခွင့်ပြုချက်လုံခြုံရေး"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"apps များ ပုံမှန်"</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>
@@ -2411,14 +2449,12 @@
     <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="6948120138640252732">"ကြားဖြတ်ဝင်မှုကို ပိတ်ဆို့ရန်"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ဦးစားပေးများသာ ခွင့်ပြုရန်"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"အလိုအလျောက်စည်းမျဉ်းများ"</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_alarms" msgid="7380265858042606857">"နှိုးစက်များသာ ခွင့်ပြုရန်"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"ကြားဖြတ်ဖုန်း မဝင်ပါနှင့်"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"ဦးစားပေးများသာ"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"နှိုးစက်များသာ"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"ကြားဖြတ်ဝင်မှု ခွင့်မပြုရန်"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ဖုန်းဝင်တီးလုံး"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"အကြောင်းကြားချက် တီးလုံး"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ဖုန်းဝင်လျှင် တုန်ခါရန်"</string>
@@ -2451,15 +2487,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"အကြောင်းကြားချက် လက်ခံသူများ တစ်ခုမှ မထည့်သွင်းထားပါ။"</string>
     <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>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">app %d ခုသည် အခြေအနေများကို စီမံပေးသည်</item>
-      <item quantity="one">app %d ခုသည် အခြေအနေများကို စီမံပေးသည်</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="loading_notification_apps" msgid="5031818677010335895">"appများကို တင်နေ..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"အားလုံးကို ပိတ်ဆို့ရန်။"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ဒီappမှ အကြောင်းကြားချက်များကို ဘယ်တော့မှ မပြနှင့်"</string>
@@ -2473,17 +2500,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"စည်းမျဉ်းအမည်"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"စည်းမျဉ်း ထည့်ပါ"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"စည်းမျဉ်းအား ဖျက်မည်"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"စည်းမျဉ်း \"<xliff:g id="RULE">%1$s</xliff:g>\" ကိုဖျက်မလား?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"ဖျက်ရန်"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"စည်းမျဉ်းအမျိုးစား"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"မသိရ"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"စည်းမျဉ်း ပြုပြင်မည်"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"အချိန်ဇယား စည်းမျဉ်း"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"စည်းမျဉ်းမတွေ့ပါ။"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"ရက်"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"မရှိ"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"နေ့တိုင်း"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">"၊ "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"မည်သည့်အခါမှ"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> မှ <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"ခေါ်ဆိုမှုများ"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"စာများ"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"...ထံမှ ခေါ်ဆိုမှုများ/စာများ"</string>
@@ -2493,15 +2526,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"နှိုးစက်များ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"သတိပေးချက်များ"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ပွဲစဉ်များ"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ရွေးချယ်ထားသည့် ခေါ်ဆိုသူများ"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ခေါ်ဆိုသူများကို ပြန်ထပ်မည်"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"တစ် <xliff:g id="MINUTES">%d</xliff:g> မိနစ်အကြာတွင် တူညီသည့်လူမှ ဖုန်းပြန်ခေါ်လျှင် ခွင့်ပြုမည်"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> နောက်နေ့"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"သင်ဘယ်အချိန် ကြားဖြတ်စေလိုသလဲ?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"ဘယ်လောက်ကြာ အတွက်လဲ?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"အကန့်အသတ်မရှိစွာ"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> မိနစ်</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> မိနစ်</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> နာရီ</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> နာရီ</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"ဦးစားပေးအချက်ပေးမှုများသာသို့ အမြဲတမ်း ပြောင်းမည်"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>အထိ<xliff:g id="DURATION">%1$d</xliff:g>မိနစ်မျှ ဦးစားပေးအသိပေးချက်များသာလျှင် သို့ပြောင်းမည်</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>အထိတစ်မိနစ်မျှ ဦးစားပေးအသိပေးချက်များသာလျှင် သို့ပြောင်းမည်</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">(<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>အထိ)<xliff:g id="DURATION">%1$d</xliff:g>နာရီမျှ ဦးစားပေးအသိပေးချက်များသာလျှင် သို့ပြောင်းမည်</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>အထိတစ်နာရီမျှ ဦးစားပေးအသိပေးချက်များသာလျှင် သို့ပြောင်းမည်</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"နှိုးစက်သာလျှင်ကို အချိန်တိုင်းသို့ပြောင်းမည်"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">(<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>အထိ)<xliff:g id="DURATION">%1$d</xliff:g>မိနစ်မျှ နိုးစက်သာလျှင်သို့ပြောင်းမည်</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>အထိတစ်မိနစ်မျှ နိုးစက်သာလျှင်သို့ပြောင်းမည်</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>အထိ<xliff:g id="DURATION">%1$d</xliff:g>နာရီမျှ နိုးစက်သာလျှင်သို့ပြောင်းမည်</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>အထိတစ်နာရီမျှ နိုးစက်သာလျှင်သို့ပြောင်းမည်</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"ဘယ်တော့မှ ကြားမဖြတ်ရန်သို့ ပြောင်းမည်"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">(<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>အထိ)<xliff:g id="DURATION">%1$d</xliff:g>မိနစ်မျှ မနှောက်ယှက်ရ သို့ပြောင်းမည်</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>အထိတစ်မိနစ်မျှ မနှောက်ယှက်ရ သို့ပြောင်းမည်</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>အထိ<xliff:g id="DURATION">%1$d</xliff:g>မျှ မနှောက်ယှက်ရ သို့ပြောင်းမည်</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>အထိတစ်နာရီမျှ မနှောက်ယှက်ရ သို့ပြောင်းမည်</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"အမြဲတမ်း ကြားဖြတ်ရန်သို့ ပြောင်းမည်"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ထာဝရ"</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>
@@ -2566,7 +2660,10 @@
       <item quantity="other">ခွင့်ပြုချက် <xliff:g id="COUNT_1">%d</xliff:g> ခုပေးထားသည်</item>
       <item quantity="one">ခွင့်ပြုချက် <xliff:g id="COUNT_0">%d</xliff:g> ခုပေးထားသည်</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> / <xliff:g id="COUNT_3">%d</xliff:g> ခွင့်ပြုချက် ရရှိခဲ့၏</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g> ခွင့်ပြုချက် ရရှိခဲ့၏</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"တချို့အားပုံမှတ်အဖြစ်သတ်မှတ်"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"ပုံမှန်သတ်မှတ်ထားခြင်းမရှိ"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"appများ အားလုံး"</string>
@@ -2577,8 +2674,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ဦးစားပေးမှု"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"သိမ်မွေ့သော"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ဒိုမိန်း URL များဖြင့်"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"App များအားလုံးရှိ ရွေးချယ်စရာများအား မူလအတိုင်း ပြန်ညှိရန်"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"စနစ် နှင့် ဒေါင်းယူရယူထားသော app များ အပါအဝင်၊ သွင်းယူထားသော app အရေအတွက် <xliff:g id="COUNT">%d</xliff:g>"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"စီမံအုပ်ချုပ်မှ ပိတ်ထား"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"အဆင့်မြင့်"</string>
     <string name="unknown_app" msgid="5275921288718717656">"အမည်မသိ အပလီကေးရှင်း"</string>
     <string name="choose_profile" msgid="8229363046053568878">"ပရိုဖိုင်ရွေးရန်"</string>
@@ -2593,4 +2689,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> အပ်ဖ်များသည် ၎င်းတို့၏ URL များကိုဖွင့်နိုင်သည်</item>
       <item quantity="one">အပ်ဖ်တစ်ခုသည် ၎င်း၏ URL များကိုဖွင့်နိုင်သည်</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"အသိအမှတ်မပြုပါ"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"ပုံမှန် app များ"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"ဘရောင်ဇာအပ်ဖ်"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"ပုံမှန် ဘရောင်ဇာ မရှိပါ"</string>
+    <string name="default_app" msgid="6864503001385843060">"(မူသေ)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index bcfb4bf..0e7676d 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"Passord"</item>
+    <item msgid="8549485714107012129">"SIM-kort"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Trykk på knappen"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"lav"</item>
     <item msgid="4212263919458209842">"svært viktig"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Av"</item>
-    <item msgid="5656544177755411222">"Begrensede forstyrrelser"</item>
-    <item msgid="8735337502532332056">"Ingen forstyrrelser"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Moderat"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index d25a71c..5e1b0e5 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Minnekort"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Innstillinger for proxy-tjener"</string>
     <string name="cancel" msgid="6859253417269739139">"Avbryt"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"AVBRYT"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"FORTSETT"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"JA"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NEI"</string>
-    <string name="forget" msgid="7267115980248732932">"GLEM"</string>
+    <string name="forget" msgid="1400428660472591263">"Glem"</string>
+    <string name="save" msgid="879993180139353333">"Lagre"</string>
+    <string name="done" msgid="6942539184162713160">"Ferdig"</string>
     <string name="settings_label" msgid="1626402585530130914">"Innstillinger"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Innstillinger"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Snarvei for Innstillinger"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Sett inn laderen og prøv på nytt."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ingen personlig kode eller passord for å låse skjermen."</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Du må angi en PIN-kode eller et passord for skjermlås før du kan starte krypteringen."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Du må tegne opplåsingsmønsteret ditt for å bekrefte krypteringen av enheten din."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Vil du kryptere?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Krypteringshandlingen kan ikke angres, og hvis du avbryter den, risikerer du å miste data. Krypteringsprosessen tar minst én time, og nettbrettet kommer til å starte på nytt flere ganger underveis."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Krypteringshandlingen kan ikke angres, og hvis du avbryter den, risikerer du å miste data. Krypteringsprosessen tar minst én time, og telefonen kommer til å starte på nytt flere ganger underveis."</string>
@@ -515,13 +512,13 @@
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Koble til"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Koble fra"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Par med og koble til"</string>
-    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Fjern paring"</string>
+    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Koble fra"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Koble fra og fjern paring"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Innstillinger…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avansert"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Avansert Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Når Bluetooth er slått på, kan enheten kommunisere med andre Bluetooth-enheter i nærheten."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"For å forbedre posisjonsnøyaktigheten skanner Google-tjenester etter Bluetooth-enheter, selv når Bluetooth er slått av. Du kan endre dette i LINK_BEGINinnstillingene for skanningLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"For å forbedre posisjonsnøyaktigheten, skanner apper og tjenester etter Bluetooth-enheter – selv når Bluetooth er slått av. Du kan endre dette i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>innstillingene for skanning<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Koble til…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra medielyd."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra håndfrilyd."</string>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"For å forbedre posisjonsnøyaktigheten skanner Google-tjenester etter Wi-Fi-nettverk, selv når Wi-Fi er slått av. Du kan endre dette i LINK_BEGINinnstillingene for skanningLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"For å forbedre posisjonsnøyaktigheten, skanner apper og tjenester etter Wi-Fi-nettverk – selv når Wi-Fi er slått av. Du kan endre dette i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>innstillingene for skanning<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ikke vis igjen"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Hold Wi-Fi aktivert i dvalemodus"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi aktivert i hvilemodus"</string>
@@ -604,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skann"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avansert"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Vis apper"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Vis Wi-Fi-styrken"</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>
@@ -663,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Vil du logge på for å koble til?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> krever at du logger på nettet før du kobler til nettverket."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"KOBLE TIL"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Dette nettverket har ikke Internett-tilgang. Vil du bruke det uansett?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Ikke spør igjen for dette nettverket"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Koble til"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Kan ikke koble til nettverket"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Slett"</string>
@@ -729,21 +726,17 @@
     <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="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi-anrop"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Ringeinnstillinger"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi-ringemodus"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi er foretrukket"</item>
     <item msgid="5267397515594230396">"Mobil er foretrukket"</item>
-    <item msgid="3132912693346866895">"Bare Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Når Wi-Fi-ringing er slått på, kan telefonen din dirigere telefonsamtaler via Wi-Fi-nettverk eller operatørens nettverk, avhengig av hva du har angitt i innstillingene og hvilket signal som er sterkest. Før du slår på denne funksjonen, er det viktig å sjekke gebyrer og andre detaljer med med operatøren din."</string>
     <string name="home_settings" msgid="212375129455718176">"Startside"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skjerm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Lyd"</string>
@@ -915,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Tilgjengelig (skrivebeskyttet)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Total plass"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Beregner …"</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Apper (appdata og mediainnhold)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Apper og appdata"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Medier"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Nedlastinger"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Bilder, videoer"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Lyd (musikk, ringetoner, podcaster osv.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Diverse"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Andre filer"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Bufrede data"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Koble fra delt lagring"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Avmonter/løs ut minnekort"</string>
@@ -953,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Frakobling pågår"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Lite ledig lagringsplass"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Enkelte systemfunksjoner, som for eksempel synkronisering, fungerer muligens ikke slik de skal. Prøv å frigi plass ved å slette eller løsne elementer, slik som apper eller mediainnhold."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Gi nytt navn"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Montér"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Løs ut"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Slett og formatér"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Slett og formatér som intern lagring"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB-tilkoblingen til datamaskinen"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-tilkoblingen til datamaskinen"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Koble til som"</string>
@@ -963,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Gjør at MIDI-aktiverte apper fungerer via USB med MIDI-programvare på datamaskinen din."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Andre brukere"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Lagringsenhet"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Flyttbar lagring"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> ledig (totalt <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> er montert"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Kunne ikke montere <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> ble løst ut på en trygg måte"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Kunne ikke løse ut <xliff:g id="NAME">%1$s</xliff:g> på en trygg måte"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> er formatert"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Kunne ikke formatere <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Gi nytt navn til lagring"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Etter formatering kan du bruke <xliff:g id="NAME_0">^1</xliff:g> på andre enheter. \n\nAlle dataene på <xliff:g id="NAME_1">^1</xliff:g> blir slettet. Vurder å ta en sikkerhetskopi først. \n\n"<b>"Sikkerhetskopiér bilder og andre medier"</b>\n"Flytt mediefilene dine til en alternativ lagringsplass på denne enheten, eller overfør dem til en datamaskin ved hjelp av en USB-kabel. \n\n"<b>"Sikkerhetskopiér apper"</b>\n" Alle apper som er lagret på denne <xliff:g id="NAME_6">^1</xliff:g> avinstalleres, og appdata blir slettet. For å beholde disse appene, må du flytte dem til en alternativ lagringsplass på denne enheten."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Når du løser ut <xliff:g id="NAME_0">^1</xliff:g>, slutter apper som er lagret på den å virke, og mediefiler som er lagret på den, blir ikke tilgjengelige før lagringsmediet settes inn igjen."</b>\n\n"<xliff:g id="NAME_1">^1</xliff:g> er formatert til å kun fungere med denne enheten. Lagringsmediet fungerer ikke på andre enheter."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Konfigurer <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Bruk som bærbar lagring"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"For å flytte bilder og andre medier mellom enheter."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Bruk som intern lagring"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"For å lagre ting på bare denne enheten, inkludert apper og bilder. Krever formatering som hindrer den i å fungere med andre enheter."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatér som intern lagring"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Dette krever at <xliff:g id="NAME_0">^1</xliff:g> er formatert for å gjøre det sikkert. \n\nEtter formatering fungerer <xliff:g id="NAME_1">^1</xliff:g> bare med denne enheten. \n\n"<b>"Formatering sletter alle data som er lagret på <xliff:g id="NAME_2">^1</xliff:g> for øyeblikket."</b>" For å unngå at data går tapt, bør du vurdere å ta en sikkerhetskopi."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Slett og formatér"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formaterer <xliff:g id="NAME">^1</xliff:g> …"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Ikke fjern <xliff:g id="NAME">^1</xliff:g> mens det formateres."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Flytt data til ny lagring"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Du kan flytte bilder, filer og appdata til <xliff:g id="NAME">^1</xliff:g>. \n\nFlyttingen tar ca. <xliff:g id="TIME">^2</xliff:g> og frigjør <xliff:g id="SIZE">^3</xliff:g> intern lagringsplass. Noen apper kommer ikke til å fungere mens flyttingen pågår."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Flytt nå"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Flytt senere"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Flytt data nå"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Flyttingen tar ca. <xliff:g id="TIME">^1</xliff:g>. Den frigjør <xliff:g id="SIZE">^2</xliff:g> intern lagringsplass."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Flytt"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Flytter data …"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Under flyttingen: \n• Ikke fjern <xliff:g id="NAME">^1</xliff:g>. \n• Noen apper kommer ikke til å fungere skikkelig. \n• Hold enheten ladet."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> er klar"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> er klar til bruk med bilder og andre medier."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> fungerer. \n\nFor å flytte bilder, filer og programdata til denne enheten, gå til Innstillinger og lagring."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Flytt <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Det tar bare et par øyeblikk å flytte <xliff:g id="APP">^1</xliff:g> og tilhørende data til <xliff:g id="NAME_0">^2</xliff:g>. Du kan ikke bruke appen før flyttingen er ferdig. \n\nIkke fjern <xliff:g id="NAME_1">^2</xliff:g> mens flyttingen pågår."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Flytter <xliff:g id="APP">^1</xliff:g> …"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Ikke fjern <xliff:g id="NAME">^1</xliff:g> under flyttingen. \n\n<xliff:g id="APP">^2</xliff:g>-appen på denne enheten blir ikke tilgjengelig før flyttingen er ferdig."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Avbryt flyttingen"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Batteristatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Batterinivå"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Tilbakestill til standardvalg"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Tilbakestilling av standard APN-innstillinger er fullført."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Tilbakestill nettverksinnstillingene"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Dette tilbakestiller alle nettverksinnstillingene til fabrikkinnstillingene, inkludert:\n\n"<li>"Wi-Fi"</li>\n<li>"Mobildata"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Dette tilbakestiller alle nettverksinnstillingene, inkludert:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobildata"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Tilbakestill innstillinger"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Vil du tilbakestille alle nettverksinnstillingene? Du kan ikke angre denne handlingen."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Vil du tilbakestille alle nettverksinnstillingene? Du kan ikke angre denne handlingen."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Tilbakestill innstillinger"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Du må tegne opplåsingsmønsteret for å bekrefte tilbakestilling av nettverksinnstillingene."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Vil du tilbakestille?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Nettverksinnstillingene er tilbakestilt"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Nettverksinnstillingene er tilbakestilt"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Tilbakestill enheten"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrikkinnstillinger"</string>
     <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>
@@ -1029,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Slett alle data på SD-kortet, som for eksempel musikk eller bilder"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tilbakestill nettbrettet"</string>
     <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_desc" msgid="1062841478823409667">"Vil du slette den personlige informasjonen din og nedlastede apper? Du kan ikke angre denne handlingen."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Fjern alt"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Tilbakestilling til fabrikkstandard er ikke tilgjengelig for denne brukeren"</string>
@@ -1048,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Telefonsvarer, viderekobling, samtale venter, nummervisning"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-tilknytning"</string>
@@ -1081,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjelp"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobilnettverk"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilabonnement"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Standard SMS-app"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS-app"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vil du bytte SMS-app?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Vil du bruke <xliff:g id="NEW_APP">%1$s</xliff:g> i stedet for <xliff:g id="CURRENT_APP">%2$s</xliff:g> for SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Vil du bruke <xliff:g id="NEW_APP">%s</xliff:g> som SMS-app?"</string>
@@ -1112,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Bruk GPS til å fastslå posisjonen din"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Søker"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Søker"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi-skanning"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Forbedre posisjonen ved å la apper og tjenester skanne etter Wi-Fi-nettverk – selv når Wi-Fi er slått av"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth-skanning"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Forbedre posisjonen ved å la systemtjenester skanne etter Bluetooth-enheter – selv når Bluetooth er slått av"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi- og mobilnettverksposisjon"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Tillat at apper bruker posisjonstjenesten fra Google til å finne posisjonen din raskere. Anonym posisjonsdata blir samlet inn og sendt til Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Posisjon fastsatt av Wi-Fi"</string>
@@ -1157,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Passordet er angitt"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-kode er angitt"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Mønster er angitt"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Bruk enhetsmønsteret ditt for å fortsette."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Skriv inn enhets-PIN-koden din for å fortsette."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Skriv inn enhetspassordet ditt for å fortsette."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Feil PIN-kode"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Feil passord"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Feil mønster"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Enhetssikkerhet"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Opplåsingsmønster"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Endre PIN-kode for opplåsning"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Bekreft lagret mønster"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Prøv på nytt:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Tegn et opplåsingsmønster"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Trykk menyknappen for hjelp."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Slipp fingeren når du er ferdig."</string>
@@ -1183,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Opplåsingsmønster"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Opplåsingsmønster"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Hvordan tegne et opplåsingsmønster"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"For mange gale forsøk!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Prøv igjen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"For mange ugyldige forsøk. Prøv på nytt om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Appen er ikke installert på telefonen din."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrer apper"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrer og fjern installerte apper"</string>
@@ -1235,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sorter etter størrelse"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Vis kjørende tjenester"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Vis bufrede prosesser"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Nødapp"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Tilbakestill app-innstillingene"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Vil du tilbakestille app-innstillingene?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Dette tilbakestiller alle innstillinger for:\n\n"<li>"deaktiverte apper"</li>\n<li>"deaktiverte appvarsler"</li>\n<li>"standardapper for handlinger"</li>\n<li>"begrensninger for bakgrunnsdata for apper"</li>\n<li>"eventuelle tillatelsesbegrensninger"</li>\n\n" Du kommer ikke til å miste noe appdata."</string>
@@ -1440,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Samle alle Bluetooth HCI-pakker i en fil"</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="select_logd_size_title" msgid="7433137108348553508">"Bufferstørrelser for logg"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 timer"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"Én dag"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Vis system"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Skjul systemet"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Bruk Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistikktype"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Bakgrunn"</string>
@@ -1838,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nåværende passord:"</string>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Bruker"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Begrenset profil"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Vil du legge til en ny bruker?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Du kan dele denne enheten med andre ved å opprette flere brukere. Hver av brukerne har sitt eget område som kan tilpasses med egne apper, bakgrunnsbilder og så videre. Brukerne kan også justere enhetsinnstillinger (f.eks. Wi-Fi) som påvirker alle.\n\nNår du legger til en ny bruker, må vedkommende konfigurere sitt eget område.\n\nAlle brukere kan oppdatere apper for alle andre brukere."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Du kan dele denne enheten med andre folk ved å opprette flere brukere. Hver bruker har sin egen plass de kan tilpasse med apper, bakgrunner og annet. Brukere kan også endre enhetsinnstillinger, for eksempel Wi-Fi, som påvirker alle.\n\nNår du legger til en ny bruker, må vedkommende angi innstillinger for plassen sin.\n\nAlle brukere kan oppdatere apper for alle andre brukere."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Når du legger til en ny bruker, må vedkommende konfigurere sitt eget område.\n\nAlle brukere kan oppdatere apper for alle andre brukere."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Konfigurere brukeren nå?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Sørg for at vedkommende er tilgjengelig for å bruke enheten og konfigurere området sitt"</string>
@@ -2393,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"begrensning begrens begrenset"</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_reset_apps" msgid="6420313678620788457">"tilbakestill innstillinger standard"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"standard nødapp"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"apper last ned apper system"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"sikkerhet for apptillatelser"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"standardapper"</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>
@@ -2411,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmvolum"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Ringevolum"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Varselvolum"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Blokkér forstyrrelser"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritet tillater bare"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatiske regler"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Ved innkommende anrop og 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_alarms" msgid="7380265858042606857">"Bare tillat alarmer"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ikke forstyrr"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Bare prioritet"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Bare alarmer"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Ingen forstyrrelser"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ringetone"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Standard varslingslyd"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrer også når det ringer"</string>
@@ -2451,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Ingen varselslyttere er installert."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Vil du aktivere <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> kan lese alle varsler lagt inn av systemet eller installerte apper. Dette kan omfatte personlig informasjon, som for eksempel kontaktnavn og innholdet i meldinger som sendes til deg. Den kan også avvise disse varslene, eller trykke på handlingsknapper i dem."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Apper som inneholder vilkår"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ingen apper angir betingelser"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d apper angir betingelser</item>
-      <item quantity="one">%d app angir betingelser</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Ingen apper som angir vlkår er installert."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Vil du aktivere <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> kan legge til avslutsningsbetingelser for «Ikke forstyrr»-modusen."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Laster inn apper …"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokkér alle"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Vis aldri varsler fra denne appen"</string>
@@ -2473,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritet"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitivt"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Regelnavn"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Legg til regel"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Slett regel"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Vil du slette «<xliff:g id="RULE">%1$s</xliff:g>»-regelen?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Slett"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Regeltype"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Ukjent"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Konfigurer regel"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Timeplanregel"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Fant ikke regelen."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dager"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Ingen"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Hver dag"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Aldri"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> til <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2493,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmer"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Påminnelser"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Hendelser"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Utvalgte oppringere"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Gjentatte oppringere"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Tillat hvis den samme personen ringer enda en gang innen <xliff:g id="MINUTES">%d</xliff:g> minutter"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Slå på automatisk"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Aldri"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Hver kveld"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> neste dag"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Når vil du bli forstyrret?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Hvor lenge?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"På ubestemt tid"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutter</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minutt</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> timer</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> time</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Bytt til Bare prioritetsvarsler på ubestemt tid"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Bytt til Bare prioritetsvarsler i <xliff:g id="DURATION">%1$d</xliff:g> minutter til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Bytt til Bare prioritetsvarsler i ett minutt til <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Bytt til Bare prioritetsvarsler i <xliff:g id="DURATION">%1$d</xliff:g> timer (til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Bytt til Bare prioritetsvarsler i én time til <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Bytt til Bare alarmer på ubestemt tid"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Bytt til Bare alarmer i <xliff:g id="DURATION">%1$d</xliff:g> minutter (til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Bytt til Bare alarmer i ett minutt til <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Bytt til Bare alarmer i <xliff:g id="DURATION">%1$d</xliff:g> timer til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Bytt til Bare alarmer i én time til <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Bytt til Ikke forstyrr på ubestemt tid"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Bytt til Ikke forstyrr i <xliff:g id="DURATION">%1$d</xliff:g> minutter (til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Bytt til Ikke forstyrr i ett minutt til <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Bytt til Ikke forstyrr i <xliff:g id="DURATION">%1$d</xliff:g> timer til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Bytt til Ikke forstyrr i én time til <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Bytt til Alltid forstyrr"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"for alltid"</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>
@@ -2566,7 +2659,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tillatelser er gitt</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> tillatelse er gitt</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> av <xliff:g id="COUNT_3">%d</xliff:g> tillatelser er gitt</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> av <xliff:g id="COUNT_1">%d</xliff:g> tillatelser er gitt</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Noen standardvalg er angitt"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Ingen standardvalg er angitt"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Alle apper"</string>
@@ -2577,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritert"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensitivt"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Med nettadresser på domenet"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Tilbakestill innstillingene for alle apper til standardinnstillingene"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> apper er installert, inkludert systemapper og nedlastede apper"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Avslått av administratoren"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avansert"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Ukjent app"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Velg profil"</string>
@@ -2593,4 +2688,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apper kan åpne nettadressene på domenene sine</item>
       <item quantity="one">Én app kan åpne nettadressene på domenet sitt</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Ikke gjenkjent"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Standardapper"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Nettleserapp"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Ingen standard nettleser"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Standard)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-ne-rNP/arrays.xml b/res/values-ne-rNP/arrays.xml
index b7981f1..6a2a759 100644
--- a/res/values-ne-rNP/arrays.xml
+++ b/res/values-ne-rNP/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Push बटन"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"कम"</item>
     <item msgid="4212263919458209842">"चिन्ताजनक"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"बन्द"</item>
-    <item msgid="5656544177755411222">"सीमित रोकावट"</item>
-    <item msgid="8735337502532332056">"शून्य रोकावट"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"सामान्य"</item>
     <item msgid="866544120205026771">"मध्यम"</item>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 5904a87..39f4732 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD कार्ड"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"प्रोक्सी सेटिङहरू"</string>
     <string name="cancel" msgid="6859253417269739139">"रद्द गर्नुहोस्"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"रद्द गर्नुहोस्"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUE"</string>
     <string name="okay" msgid="1997666393121016642">"ठीक छ"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"हो"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"होइन"</string>
-    <string name="forget" msgid="7267115980248732932">"FORGET"</string>
+    <string name="forget" msgid="1400428660472591263">"बिर्सनुहोस्"</string>
+    <string name="save" msgid="879993180139353333">"सुरक्षित गर्नुहोस्"</string>
+    <string name="done" msgid="6942539184162713160">"सम्पन्न भयो"</string>
     <string name="settings_label" msgid="1626402585530130914">"सेटिङहरू"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"सेटिङहरू"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"सेटिङ सर्टकट"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"तपाईंको चार्जरमा प्लग इन गरेर फेरि प्रयास गर्नुहोस्।"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"कुनै लक स्क्रिन PIN वा पासवर्ड छैन"</string>
     <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>
@@ -521,7 +518,7 @@
     <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="ble_scan_notify_text" msgid="9019985398053764737">"स्थान सटीकता सुधार गर्न Google सेवाहरूले ब्लुटुथ बन्द भएको बेला पनि ब्लुटुथ यन्त्रहरू स्क्यान गर्ने छ। तपाईँले यसलाई LINK_BEGIN स्क्यानिङ सेटिङहरू LINK_END मा परिवर्तन गर्न सक्नुहुन्छ।"</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"स्थान सटीकता सुधार गर्न, अनुप्रयोगहरू र सेवाहरूले ब्लुटुथ बन्द हुँदा पनि, ब्लुटुथ यन्त्रहरूको स्क्यान गर्नेछ। तपाईँ यसलाई <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g> स्क्यान सेटिङहरू <xliff:g id="LINK_END_1">LINK_END</xliff:g> मा परिवर्तन गर्न सक्नुहुन्छ।"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"सँग जडान गर्नुहोस् ..."</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>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"स्थान सटीकता सुधार गर्न Google सेवाहरूले Wi-Fi बन्द भएको बेला पनि Wi-Fi नेटवर्कहरू स्क्यान गर्ने छ। तपाईँले यसलाई LINK_BEGIN स्क्यानिङ सेटिङहरू LINK_END मा परिवर्तन गर्न सक्नुहुन्छ।"</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"स्थान सटीकता सुधार गर्न, अनुप्रयोगहरू र सेवाहरूले Wi-Fi बन्द हुँदा पनि Wi-Fi नेटवर्कका लागि स्क्यान गर्नेछन्। तपाईँ यसलाई  <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g> स्क्यान सेटिङहरू <xliff:g id="LINK_END_1">LINK_END</xliff:g> मा परिवर्तन गर्न सक्नुहुन्छ।"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"फेरि नदेखाउनुहोस्"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"सुतेको बेलामा वाइफाइ खुला राख्नुहोस्"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"सुतेको बेलामा वाइफाइ"</string>
@@ -604,8 +601,6 @@
     <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_apps" msgid="6003687912727859577">"अनुप्रयोगहरु देखाउनुहोस्"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"वाइफाइ शक्ति देखाउनुहोस्"</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>
@@ -663,6 +658,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONNECT"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"यो सञ्जालमा कुनै इन्टरनेटमा पहुँच छैन। नभए पनि सञ्जाल प्रयोग गर्न चाँहनु हुन्छ?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"यस सञ्जालको लागि फेरि नसोध्नुहोस्"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"जडान गर्नुहोस्"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"सञ्जालमा जडान गर्न विफल"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"बिर्सनुहोस्"</string>
@@ -734,14 +731,12 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi को सुझाव गरियो"</item>
     <item msgid="5267397515594230396">"सेलुलरको सुझाव गरियो"</item>
-    <item msgid="3132912693346866895">"Wi-Fi मात्र"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wi-Fi कलिङ खुल्ला हुँदा तपाईँको प्राथमिकता र कुन संकेत बलियो छ भन्ने आधारमा तपाईँको फोनले कलहरूलाई Wi-Fi सञ्जालहरू वा तपाईँको वाहकको सञ्जालमार्फत पठाउन सक्छ। यो सुविधा खोल्नुअघि शुल्क र अन्य विवरणको बारेमा तपाईँको वाहकसँग जाँच गर्नुहोस्।"</string>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wi-Fi कलिङ सक्रिय हुँदा तपाईँको प्राथमिकता र कुन संकेत बलियो छ भन्ने आधारमा तपाईँको फोनले कलहरूलाई Wi-Fi नेटवर्हकरू वा तपाईँको वाहकको नेटवर्कमार्फत पठाउन सक्छ। यो सुविधा सक्रिय पार्न अघि शुल्क र अन्य विवरणको बारेमा तपाईँको वाहकसँग जाँच गर्नुहोस्।"</string>
     <string name="home_settings" msgid="212375129455718176">"गृह"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"प्रदर्शन"</string>
     <string name="sound_settings" msgid="5534671337768745343">"आवाज"</string>
@@ -913,12 +908,12 @@
     <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="5128673488173839077">"अनुप्रयोग &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_music_usage" msgid="1363785144783011606">"अडियो (संगीत, रिङ्गटोन, पडकास्ट, आदि)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"विविध"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"अन्य फाइलहरू"</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>
@@ -951,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"अनमाउन्ट प्रगतिमा"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"भण्डारण ठाउँ सकिँदै छ"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"केही प्रणाली प्रकार्यहरू जस्तै सिङ्क गर्ने, ठीकसँग काम नगर्न सक्छ। वस्तुहरू जस्तै अनुप्रयोग वा मिडिया सामग्री मेटाएर वा पिन हटाएर ठाउँ खाली बनाउनुहोस् ।"</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"पुन: नामाकरण गर्नुहोस्"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"माउन्ट गर्नुहोस्"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"निकाल्नुहोस्"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"मेट्ने &amp; फरम्याट"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"मेटेर &amp; आन्तरिक भण्डारणको रूपमा फरम्याट गर्नुहोस्"</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>
@@ -961,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"MIDI द्वारा सक्रिय अनुप्रयोगहरूलाई तपाईंको कम्प्युटरमा USB मार्फत MIDI सफ्टवेयरसँग काम गर्न दिन्छ।"</string>
     <string name="storage_other_users" msgid="808708845102611856">"अन्य प्रयोगकर्ताहरू"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"यन्त्र भण्डारण"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"हटाउन योग्य भण्डारण"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> खाली (कुल <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> माउन्ट गरियो"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g> लाई माउन्ट गर्न सकेन"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> सुरक्षित तवरले निकालिएको छ"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g> सुरक्षित तवरले निकाल्न सकिएन"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> फरम्याट गरियो"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> फरम्याट गर्न सकिएन"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"भण्डारण पुन: नामाकरण गर्नुहोस्"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"ढाँचामा मिलाएपछि, तपाईँले यसलाई <xliff:g id="NAME_0">^1</xliff:g> अन्य उपकरणहरू मा प्रयोग गर्न सक्नुहुन्छ। \n\nयसका <xliff:g id="NAME_1">^1</xliff:g> सबै डेटा मेटिनेछन्। पहिले जगेडा बनाउने विचार गर्नुहोस्। \n\n"<b>"तस्बिर &amp;amp जगेडा गर्नुहोस्; अन्य मिडिया"</b>" \n यस उपकरणमा वैकल्पिक भण्डारण गर्न आफ्नो मिडिया फाइलहरू सार्नुहोस्, वा USB केबल प्रयोग गरी कम्प्युटरको स्थानान्तरण गर्नुहोस्। \n\n"<b>"अनुप्रयोगहरू जगेडा गर्नुहोस्"</b>" \n यसमा <xliff:g id="NAME_6">^1</xliff:g> भण्डारित सबै अनुप्रयोगहरू हटाइने छन् र तिनका डेटा मेटिनेछन्। यी अनुप्रयोगहरू राख्न, यस उपकरणमा वैकल्पिक भण्डारण गर्न तिनीहरूलाई सार्नुहोस्।"</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"जब तपाईँले यसलाई <xliff:g id="NAME_0">^1</xliff:g> निकाल्नुहुन्छ, यसमा भण्डारित अनुप्रयोगहरूले काम गर्न रोकिनेछ, र यो पुनःनराखे सम्म यसमा भण्डारित मिडिया फाइलहरू उपलब्ध हुनेछैन। "</b>" \n\n यो <xliff:g id="NAME_1">^1</xliff:g> यस उपकरणमा मात्र काम गर्ने ढाँचामा छ। यो कुनै पनि अन्यमा काम गर्ने छैन।"</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"तपाईँको <xliff:g id="NAME">^1</xliff:g> सेट गर्नुहोस्"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"पोर्टेबल भण्डारणको रूपमा प्रयोग"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"उपकरणहरू बीच फोटो र अन्य माध्यम सार्नका लागि।"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"आन्तरिक भण्डारणको रूपमा प्रयोग"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"अनुप्रयोगहरू र फोटोहरू सहित, केवल यस उपकरणमा कुनै पनि भण्डारणका लागि। अन्य उपकरणहरू संग काम गर्न रोक्न ढाँचितको आवश्यकता छ।"</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"आन्तरिक भण्डारणको रुपमा फरम्याट"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"यो सुरक्षित बनाउन यसलाई <xliff:g id="NAME_0">^1</xliff:g> ढाँचा बनाउन आवश्यकता छ। \n\nढाँचामा मिलाएपछी, यो उपकरणमा यसले <xliff:g id="NAME_1">^1</xliff:g> मात्र काम गर्नेछ। \n\n"<b>" ढाँचा मिलाउँदा <xliff:g id="NAME_2">^1</xliff:g> मा हालैका भण्डारीत सबै डेटा मेटिन्छ।"</b>" डेटा गुमाउनुपर्ने बाट जोगिन, यसलाई जगेडा बनाउने विचार गर्नुहोस्।"</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"मेटाई फरम्याट गर्नुहोस्"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> फरम्याट गरिन्दै ..."</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"फरम्याट गर्ने क्रममा <xliff:g id="NAME">^1</xliff:g> नहटाउनुहोस्।"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"नयाँ भण्डारणमा डेटा सार्नुहोस्"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"तपाईँले यो नयाँ <xliff:g id="NAME">^1</xliff:g> मा आफ्नो फोटोहरू, फाइलहरू, र अनुप्रयोग डेटा सार्न सक्नुहुनेछ। \n\n यसरी सार्दा आन्तरिक भण्डारणमा करिब <xliff:g id="TIME">^2</xliff:g> लिन्छ र <xliff:g id="SIZE">^3</xliff:g> खालि गर्नेछ। यस क्रममा, जबकि केही अनुप्रयोगहरूले कार्य गर्ने छैन।"</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"अब सार्नुहोस्"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"पछि सार्नुहोस्"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"अब डेटा सार्नुहोस्"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"यसरी सार्दा करिब <xliff:g id="TIME">^1</xliff:g> लिन्छ। यसले आन्तरिक भण्डारणको <xliff:g id="SIZE">^2</xliff:g> खालि गर्नेछ।"</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"सार्नुहोस्"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"डेटा सार्दै..."</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"सार्दाको समयमा: \n• <xliff:g id="NAME">^1</xliff:g> हटाउने नगर्नुहोस्। \n• केही अनुप्रयोगहरूले सही काम गर्ने छैन। \n• उपकरण चार्जमा राख्नुहोस्।"</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> तयार छ"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"तपाईँको <xliff:g id="NAME">^1</xliff:g> फोटो र अन्य साधन साथप्रयोग गर्न सबै सेट छ।"</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"तपाईँको नयाँ <xliff:g id="NAME">^1</xliff:g> ले काम गर्दैछ। \n\n यो उपकरणमा फोटोहरू, फाइलहरू, र अनुप्रयोग डेटा सार्न, सेटिङ् &amp;gt मा जानुहोस्; भण्डारण गर्नुहोस्।"</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"सार्नुहोस् <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<xliff:g id="NAME_0">^2</xliff:g> मा <xliff:g id="APP">^1</xliff:g> र यसको डेटा सार्न केही बेर मात्र लिनेछ। तपाईँ सार्ने क्रम पूरा नहुन्जेल अनुप्रयोग प्रयोग गर्न सक्नुहुने छैन। \n\n सार्ने क्रममा <xliff:g id="NAME_1">^2</xliff:g> हटाउने नगर्नुहोस्।"</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"सार्दै <xliff:g id="APP">^1</xliff:g>..."</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"सार्ने क्रममा <xliff:g id="NAME">^1</xliff:g> हटाउने नगर्नुहोस्। \n\nसार्ने क्रम पूरा नहुन्जेल सम्म यो उपकरणमा यो <xliff:g id="APP">^2</xliff:g> अनुप्रयोग उपलब्ध हुने छैन।"</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"सार्ने रद्द गर्नुहोस्"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"ब्याट्रि स्थिति"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ब्याट्रि स्तर"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1005,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"पूर्वनिर्धारितमा पुनःसेट गर्नुहोस्"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"पूर्वनिर्धारित APN सेटिङहरू पुनःसेट पुरा भयो।"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"सञ्जाल सेटिङहरू रिसेट"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"यसले \n\n"<li>"Wifi"</li>\n<li>"मोबाइल डेटा"</li>\n<li>"ब्लूटुथ"</li>" सहितका सबै नेटवर्किङ सम्बन्धित सेटिङहरूलाई कारखाना पूर्वनिर्धारितहरूमा रिसेट गर्नेछ"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"यसले सबै नेटवर्क सेटिङहरू रिसेट गर्नेछ, \n\n"<li>"Wi‑Fi"</li>\n<li>"सेलुलर डेटा"</li>\n<li>"ब्लुटुथ"</li>" लगायत"</string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"सेटिङहरू रिसेट गर्नुहोस्"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"सबै सञ्जाल सेटिङहरू रिसेट गर्ने हो? तपाईँ यस कार्यलाई उल्टाउन सक्नुहुन्न!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"सबै नेटवर्क सेटिङहरू रिसेट गर्ने हो? तपाईँ यी कार्य अनडू गर्न सक्नुहुन्न!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"सेटिङहरू रिसेट गर्नुहोस्"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"तपाईंले एक सञ्जाल सेटिङहरू रिसेट गर्न पुष्टिको निम्ति तपाईँले आफ्नो अनलक ढाँचा कोर्न आवश्यक छ"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"रिसेट गर्ने हो?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"सञ्जाल सेटिङहरू रिसेट"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"सञ्जाल सेटिङ्हरू रिसेट गरियो"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"उपकरण पुनः सेट गर्नुहोस्"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"कारखाना डेटा रिसेट"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"यस कार्यले तपाईँको सम्पूर्ण डेटा मेटाउँछ ट्याब्लेटको "<b>" आन्तरिक भण्डारणबाट "</b>" : जसमा, \n \n "<li>" तपाईँको गुगल खाता "</li>" \n "<li>" प्रणाली र अनुप्रयोग डेटा र सेटिङहरू"</li>" \n "<li>" डाउनलोड गरिएका अनुप्रयोगहरू "</li></string>
@@ -1027,9 +1065,8 @@
     <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="1062841478823409667">"तपाईँका सबै व्यक्तिगत जानकारी र डाउनलोड गरिएका अनुप्रयोगहरू मेट्ने हो? तपाईँ यो कार्य अनडू गर्न सक्नुहुन्न!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"सबै मेटाउनुहोस्"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"यस प्रयोगकर्ताको लागि कारखाना पुनःसेट गर्ने उपलब्ध छैन"</string>
@@ -1046,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"भ्वाइस मेल, कल फर्वार्ड, कल प्रतीक्षा, र कलर ID सेटअप गर्नुहोस्"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB टेथर गर्दै"</string>
@@ -1079,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"मद्दत"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"सेलुलर सञ्जाल"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"मोबाईल योजना"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"पूर्वनिर्धारित SMS अनुप्रयोग"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS अनुप्रयोग"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS अनुप्रयोग परिवर्तन गर्ने हो?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"तपाईँको <xliff:g id="CURRENT_APP">%2$s</xliff:g> SMS अनुप्रयोगको सट्टामा <xliff:g id="NEW_APP">%1$s</xliff:g> प्रयोग गर्नुहुन्छ?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g>लाई SMS अनुप्रयोगको रूपमा प्रयोग गर्नुहुन्छ?"</string>
@@ -1110,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"स्थान निर्धारण गर्न GPS प्रयोग गर्नुहोस्"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"स्क्यान गर्दै"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"स्क्यान गर्दै"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi स्क्यान हुँदै"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Wi-Fi बन्द हुँदा पनि Wi-Fi नेटवर्कहरूको लागि स्क्यान गर्न प्रणाली सेवाहरू अनुमति दिएर स्थान सुधार गर्नुहोस्"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ब्लुटुथ स्क्यान हुँदै"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"ब्लुटुथ बन्द हुँदा पनि ब्लुटुथ यन्त्रहरूको लागि स्क्यान गर्न प्रणाली सेवाहरू अनुमति दिएर स्थान सुधार गर्नुहोस्"</string>
     <string name="location_network_based" msgid="6010456018401296590">"वाइफाइ र सेलुलर सञ्जाल स्थान"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"तपाईँको स्थानलाई सीघ्र अनुमान गर्न अनुप्रयोगहरूलाई गुगल स्थान सेवा प्रयोग गर्न अनुमति दिनुहोस्। बेनामी स्थान डेटा भेला गरिने छ र गुगलमा पठाइने छ।"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"वाइ-फाइद्वारा निर्धारित स्थान"</string>
@@ -1155,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"पासवर्ड सेट भएको छ"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN सेट भएको छ।"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"शैली सेट गरिएको छ।"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"जारी गर्न आफ्नो यन्त्र ढाँचा प्रयोग गर्नुहोस्।"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"जारी गर्न आफ्नो यन्त्र PIN प्रविष्ट गर्नुहोस्।"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"जारी गर्नका लागि तपाईँको यन्त्र पासवर्ड प्रविष्ट गर्नुहोस्।"</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"गलत PIN"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"गलत पासवर्ड"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"गलत ढाँचा"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"यन्त्र सुरक्षा"</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_wrong" msgid="4694973540770105678">"फेरि प्रयोग गर्नुहोस्:"</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>
@@ -1181,8 +1224,7 @@
     <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" msgid="6909161623701848863">"अत्यन्तै धेरै गलत प्रयास। <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>
@@ -1233,7 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"आकारद्वारा क्रमबद्ध गर्नुहोस्"</string>
     <string name="show_running_services" msgid="5736278767975544570">"चालु सेवाहरू देखाउनुहोस्"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"केस गरिएका प्रक्रियाहरू"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"पूर्वनिर्धारित आकस्मिक अनुप्रयोग"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"आकस्मिक अनुप्रयोग"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"अनुप्रयोग प्राथमिकताहरू पुनःसेट गर्नुहोस्"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"अनुप्रयोग प्राथमिकताहरू पुनःसेट गर्ने हो?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"यसले सबै  प्राथमिकताहरूलाई पुनःसेट गर्ने छ:\n\n "<li>"असक्षम पारिएका अनुप्रयोगहरू"</li>\n" "<li>"असक्षम पारिएका अनुप्रयोग सूचनाहरू"</li>\n" "<li>"कार्यका लागि पूर्वनिर्धारित अनुप्रयोगहरू"</li>\n" "<li>"अनुप्रयोगहरूको लागि पृष्ठभूमि डेटा प्रतिबन्धहरू"</li>\n" "<li>"कुनै अनुमति प्रतिबन्धहरू"</li>\n\n" तपाईँले कुनै पनि अनुप्रयोग डेटा गुमाउनु हुने छैन।"</string>
@@ -1437,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"सम्पूर्ण ब्लुटुथ HCI प्याकेटहरू एक फाइलमा कैद गर्नुहोस्"</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="select_logd_size_title" msgid="7433137108348553508">"लगर बफर आकारहरू"</string>
@@ -1739,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"१२ घण्टा"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"१ दिन"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"प्रणाली देखाउनुहोस्"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"प्रणाली लुकाउनुहोस्"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss प्रयोग गर्नुहोस्"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"तथ्याङ्क प्रकार"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"पृष्ठभूमि"</string>
@@ -1835,7 +1876,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_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>
@@ -2210,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"प्रयोगकर्ता"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"प्रतिबन्धित प्रोफाइल"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"नयाँ प्रयोगकर्ता थप्नुहुन्छ?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"तपाईं थप प्रयोगकर्ताहरू सिर्जना गरेर अन्य व्यक्तिसँग यो उपकरण साझेदारी गर्न सक्नुहुन्छ। प्रत्येक प्रयोगकर्ताको आफ्नै ठाउँ हुन्छ, जुन उनीहरूको आफ्नै अनुप्रयोगहरू, वालपेपर, र यस्तै सँग अनुकूलित गर्न सक्छन्। प्रयोगकर्ताले पनि सबैलाई असर हुने वाइफाइ जस्तै उपकरण सेटिङ समायोजन गर्न सक्नुहुन्छ। \n\n जब तपाईंले नयाँ प्रयोगकर्ता थप्नुहुन्छ, त्यो व्यक्तिले आफ्नो ठाउँ सेट गर्न आवश्यक छ।\n\nकुनै पनि प्रयोगकर्ताले सबै अन्य प्रयोगकर्ताहरूका लागि अनुप्रयोगहरू अद्यावधिक गर्न सक्छन्।"</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"यस यन्त्रलाई अन्य व्यक्तिसँग साझेदारी गर्न थप प्रयोगकर्ताहरू सिर्जना गरेर गर्न सक्नुहुनेछ। प्रत्येक प्रयोगकर्ताको आफ्नै ठाउँ हुन्छ, जसलाई तिनीहरूले अनुप्रयोगहरू, वालपेपर र अन्य धेरै अन्तर्गत अनुकूलन गर्न र सक्छन्। प्रयोगकर्ताले यन्त्र सेटिङ पनि मिलाउन सक्छन् जस्तै Wi-Fi, जसले सबैलाई असर गर्छ।\n\nजब तपाईँ नयाँ प्रयोगकर्ता थप्नु हुन्छ, त्यो व्यक्तिले आफ्नो ठाउँ सेटअप गर्न आवश्यक छ।\n\nकुनै पनि प्रयोगकर्ताले सबै अन्य प्रयोगकर्ताहरूको लागि अनुप्रयोगहरू अद्यावधिक गर्न सक्नेछ।"</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"जब तपाईंले नयाँ प्रयोगकर्ता थप्नुहुन्छ, त्यो व्यक्तिले आफ्नो ठाउँ सेट गर्न आवश्यक छ।\n\nकुनै पनि प्रयोगकर्ताले सबै अन्य प्रयोगकर्ताहरूका लागि अनुप्रयोगहरू अद्यावधिक गर्न सक्छन्।"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"अहिले प्रयोगकर्ता सेटअप गर्ने हो?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"उपकरण लिन र आफ्नो ठाउँ बनाउन व्यक्ति उपलब्ध छ भन्ने कुराको निश्चित गर्नुहोस्"</string>
@@ -2390,9 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"प्रतिबन्ध सीमित सीमित गरिएको"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"पाठ सुधार सही ध्वनि कम्पन स्वतः भाषा इशारा सुझाव दिनु सुझाव विषय आपत्तिजनक शब्द प्रकार इमोजी अन्तर्राष्ट्रिय"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"प्राथमिकताहरू पूर्वनिर्धारित रिसेट गर्नुहोस्"</string>
-    <string name="keywords_emergency_app" msgid="6542122071127391103">"आकस्मिक बरफ अनुप्रयोग पूर्वनिर्धारित"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"आकस्मिक आइस अनुप्रयोग पूर्वनिर्धारित"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"अनुप्रयोगहरू डाउनलोड गर्ने अनुप्रयोग प्रणाली"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"अनुप्रयोगहरू अनुमति सुरक्षा"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"पूर्वनिर्धारित अनुप्रयोगहरू"</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>
@@ -2407,14 +2448,12 @@
     <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="6948120138640252732">"अवरोधहरू रोक्नुहोस्"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"प्राथमिकताले अनुमति मात्र दिन्छ"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"प्राथमिकताले मात्र अनुमति  दिन्छ"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"स्वचालित नियमहरू"</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_alarms" msgid="7380265858042606857">"अलार्महरूलाई मात्र अनुमति दिनुहोस्"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"रुकावट नगर्नुहोस्"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"प्राथमिकता मात्र"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"अलार्महरू मात्र"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"कुनै अवरोधहरू छैनन्"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"फोन रिङटोन"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"पूर्वनिर्धारित सूचना रिङ्गटोन"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"कलका लागि भाइब्रेट पनि"</string>
@@ -2447,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"कुनै सूचना श्रोताहरू स्थापित गरिएका छैनन्।"</string>
     <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">"कुनै अनुप्रयोगहरूले सर्तहरु प्रदान गरेका छैनन्"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other"> %d अनुप्रयोगले सर्तहरू प्रदान गर्छ</item>
-      <item quantity="one">%d अनुप्रयोगले सर्तहरू प्रदान गर्छन्</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> ले Do not disturb ढाँचालाई निकास अवस्थामा थप गर्न सक्षम हुनेछ।"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"अनुप्रयोगहरू लोड हुँदै..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"सबै रोक्नुहोस्"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"यस अनुप्रयोगबाट सूचनाहरू कहिल्यै नदेखाउनुहोस्"</string>
@@ -2469,35 +2499,102 @@
     <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_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_rule_name" msgid="5149068059383837549">"नियम नाम"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"नियम थप्नुहोस्"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"नियम मेटाउनुहोस्"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\" <xliff:g id="RULE">%1$s</xliff:g> \" नियम मेटाउने हो?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"मेटाउनुहोस्"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"नियमको प्रकार"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"अज्ञात"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"नियम कन्फिगर गर्नुहोस्"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"नियम तालिका"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"नियम फेला परेन।"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"दिन"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"कुनै पनि होइन"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"प्रत्येक दिन"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"कहिले पनि होइन"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>बाट <xliff:g id="END">%2$s</xliff:g>सम्म"</string>
     <string name="zen_mode_calls" msgid="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_alarms" msgid="2165302777886552926">"आलार्महरू"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"अलार्महरू"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"रिमान्डरहरू"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"घटनाहरू"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"कलरहरू चयन गर्नुहोस्"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"कलरहरू दोरोर्‍याउनुहोस्"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"यदि एउटै व्यक्तिले <xliff:g id="MINUTES">%d</xliff:g> मिनेट अवधिभित्र दोस्रो पटक कल गर्छ भने यसलाई अनुमति दिनुहोस्।"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> अर्को दिन"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"कहिले तपाईँ आफुलाई रोक्न चाहनुहुन्छ?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"कति समय सम्मका लागि हो?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"अनिश्चितकालीन"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> मिनेट</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> मिनेट</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> घन्टा</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> घन्टा</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"प्राथमिकता सूचनाहरू अनिश्चितकालीन मात्र परिवर्तन गर्नुहोस्"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g>मिनेट मात्रका लागि प्राथमिकता सूचनाहरू<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> सम्मको लागि  परिवर्तन गर्नुहोस्</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> सम्मको लागि प्राथमिकता सूचनाहरू एक मिनेटमात्रका लागि परिवर्तन गर्नुहोस् </item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g>घन्टा<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> सम्मको लागि प्राथमिकता सूचनाहरूमा मात्र परिवर्तन गर्नुहोस्</item>
+      <item quantity="one">एक घन्टा <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> सम्मको लागि प्राथमिकता सूचनाहरूमा मात्र परिवर्तन गर्नुहोस्</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"अलार्महरूलाई अनिश्चितकालीन मात्र परिवर्तन गर्नुहोस्"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> मिनेट सम्मको अलार्मलाई <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> सम्मको लागि गर्न परिवर्तन गर्नुहोस्</item>
+      <item quantity="one">एक मिनेट सम्मको अलार्मलाई <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> सम्मको लागि गर्न परिवर्तन गर्नुहोस्</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> घन्टा सम्मको अलार्मलाई <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> सम्मको लागि गर्न परिवर्तन गर्नुहोस्</item>
+      <item quantity="one">एक घन्टा सम्मको <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> लागि मात्र अलार्म लाई परिवर्तन गर्नुहोस्</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"अनिश्चितकालीन अवरोध नपुर्याउने गरी परिवर्तन गर्नुहोस्"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> मिनेट सम्म अवरोध नगर्ने भनी परिवर्तन गर्नुहोस् (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> सम्मका लागि)</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> सम्मको लागि एक मिनेट अवरोध नगर्ने भनी परिवर्तन गर्नुहोस्</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> सम्मका लागि <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> घन्टा अवरोध नगर्ने भनी परिवर्तन गर्नुहोस्</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> सम्मको लागि एक घन्टाका लागि अवरोध नगर्ने भनी परिवर्तन गर्नुहोस्</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"सधैं अवरोध गर्ने गरी परिवर्तन गर्नुहोस्"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"सधैं"</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>
@@ -2544,7 +2641,7 @@
     <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"डोमेन URL हरू खोल्नुहोस्"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"अनुप्रयोगलाई डोमेन URL हरू खोल्न अनुमति दिनुहोस्"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"समर्थन गरिएका डोमेन URLहरू"</string>
-    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"अन्य पूर्वनिर्धारित"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"अन्य पूर्वनिर्धारितहरू"</string>
     <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> <xliff:g id="STORAGE_TYPE">%2$s</xliff:g> मा प्रयोग गरियो"</string>
     <string name="storage_type_internal" msgid="410824961149037234">"आन्तरिक मेमोरी"</string>
     <string name="storage_type_external" msgid="8928374515368986503">"बाह्य मेमोरी"</string>
@@ -2562,7 +2659,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> अनुमतिहरू दिइयो</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> अनुमति दिइयो</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_3">%d</xliff:g> मध्ये <xliff:g id="COUNT_2">%d</xliff:g> अनुमति प्रदान गरियो</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> मध्ये <xliff:g id="COUNT_0">%d</xliff:g> अनुमति प्रदान गरियो।</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"केही पूर्वनिर्धारितहरू सेट गरिएका छन्"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"कुनै पूर्वनिर्धारित सेट गरिएको छैन"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"सबै अनुप्रयोगहरू"</string>
@@ -2573,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"प्राथमिकता"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"संवेदनशील"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"डोमेन URLहरू मार्फत"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"सबै अनुप्रयोगहरूभरि प्राथमिकताहरू पूर्वनिर्धारितमा रिसेट गर्नुहोस्"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"प्रणाली र डाउनलोड गरिएका अनुप्रयोगहरूसहित <xliff:g id="COUNT">%d</xliff:g> अनुप्रयोगहरू स्थापना गरिए"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"प्रशासकद्वारा निष्क्रिय पारिएको"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"उन्नत"</string>
     <string name="unknown_app" msgid="5275921288718717656">"अज्ञात अनुप्रयोग"</string>
     <string name="choose_profile" msgid="8229363046053568878">"प्रोफाइल रोज्नुहोस्"</string>
@@ -2586,7 +2685,14 @@
     <string name="domain_urls_summary_one" msgid="3804994599497120956">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' खोल्नुहोस्"</string>
     <string name="domain_urls_summary_some" msgid="4859484048050301933">"\'<xliff:g id="DOMAIN">%s</xliff:g>\'र सम्बन्धित URLहरू खोल्नुहोस्"</string>
     <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> अनुप्रयोगहरूले उनीहरूका डोमेन URL हरू खोल्न सक्छन्</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> अनुप्रयोगहरूले तिनीहरूका डोमेन URL हरू खोल्न सक्छन्</item>
       <item quantity="one"> एउटा अनुप्रयोगले यसका डोमेन URLहरू खोल्न सक्छ।</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"चिनिएन"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"पूर्वनिर्धारित अनुप्रयोगहरू"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"ब्राउजर अनुप्रयोग"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"कुनै पूर्वनिर्धारित ब्राउजर छैन"</string>
+    <string name="default_app" msgid="6864503001385843060">"(पूर्वनिर्धारित)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 377a8b2..7e83544 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Knop indrukken"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"laag"</item>
     <item msgid="4212263919458209842">"kritiek"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Uit"</item>
-    <item msgid="5656544177755411222">"Beperkte onderbrekingen"</item>
-    <item msgid="8735337502532332056">"Geen onderbrekingen"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normaal"</item>
     <item msgid="866544120205026771">"Gemiddeld"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index f4fde33..edbb34f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -255,7 +255,7 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"SD-kaart scannen op media..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Gekop. USB-opsl. alleen-lezen."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"De gekoppelde SD-kaart is alleen-lezen."</string>
-    <string name="skip_label" msgid="47510779345218297">"\"Overslaan\""</string>
+    <string name="skip_label" msgid="47510779345218297">"Overslaan"</string>
     <string name="next_label" msgid="4693520878012668114">"Volgende"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Taal"</string>
     <string name="activity_picker_label" msgid="6295660302548177109">"Een activiteit kiezen"</string>
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kaart"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy-instellingen"</string>
     <string name="cancel" msgid="6859253417269739139">"Annuleren"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ANNULEREN"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"DOORGAAN"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"JA"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NEE"</string>
-    <string name="forget" msgid="7267115980248732932">"VERGETEN"</string>
+    <string name="forget" msgid="1400428660472591263">"Vergeten"</string>
+    <string name="save" msgid="879993180139353333">"Opslaan"</string>
+    <string name="done" msgid="6942539184162713160">"Gereed"</string>
     <string name="settings_label" msgid="1626402585530130914">"Instellingen"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Instellingen"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Snelkoppeling voor instellingen"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Sluit uw lader aan en probeer het opnieuw."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Geen PIN-code of wachtwoord voor schermvergrendeling"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"U moet een pincode of wachtwoord voor schermvergrendeling instellen voordat u de encryptie kunt starten."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"U moet uw ontgrendelingspatroon tekenen om te bevestigen dat u uw apparaat wilt versleutelen."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Versleutelen?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"De coderingsbewerking kan niet ongedaan worden gemaakt en als u de bewerking onderbreekt, gaan er gegevens verloren. Het coderen duurt een uur of langer en de tablet wordt meerdere keren opnieuw opgestart."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"De coderingsbewerking kan niet ongedaan worden gemaakt en als u de bewerking onderbreekt, gaan er gegevens verloren. Het coderen duurt een uur of langer en de telefoon wordt meerdere keren opnieuw opgestart."</string>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Geavanceerd"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Geavanceerde Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Als Bluetooth is ingeschakeld, kan uw apparaat communiceren met andere Bluetooth-apparaten in de buurt."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"Google-services scannen naar Bluetooth-apparaten, ook als Bluetooth is uitgeschakeld, om de nauwkeurigheid van locaties te verbeteren. U kunt dit wijzigen in de LINK_BEGINinstellingen voor scannenLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Apps en services scannen naar Bluetooth-apparaten (ook als Bluetooth is uitgeschakeld) om de nauwkeurigheid van locaties te verbeteren. U kunt dit wijzigen in de <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>instellingen voor scannen<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Verbinding maken met…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt ontkoppeld van audio van medium."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt ontkoppeld van handsfree audio."</string>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"Google-services scannen naar wifi-netwerken, ook als wifi is uitgeschakeld, om de nauwkeurigheid van locaties te verbeteren. U kunt dit wijzigen in de LINK_BEGINinstellingen voor scannenLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Apps en services scannen naar wifi-netwerken (ook als wifi is uitgeschakeld) om de nauwkeurigheid van locaties te verbeteren. U kunt dit wijzigen via de <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>scaninstellingen<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Niet opnieuw weergeven"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wifi behouden in slaapstand"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wifi aan in slaapstand"</string>
@@ -604,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wifi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scannen"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Geavanceerd"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Apps weergeven"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Wifi-sterkte weergvn"</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>
@@ -663,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Inloggen om te koppelen?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"Voor <xliff:g id="APP_NAME">%1$s</xliff:g> moet u online inloggen vóór u met het netwerk koppelt."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"KOPPELEN"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Dit netwerk heeft geen internettoegang. Wilt u dit netwerk toch gebruiken?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Niet meer vragen voor dit netwerk"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Verbinden"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Kan geen verbinding maken met het netwerk"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Vergeten"</string>
@@ -729,21 +726,17 @@
     <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> draagbare wifi-hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Bellen via wifi"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Voorkeur voor bellen"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Modus voor bellen via wifi"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Voorkeur voor wifi"</item>
     <item msgid="5267397515594230396">"Voorkeur voor mobiel"</item>
-    <item msgid="3132912693346866895">"Alleen wifi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wanneer bellen via wifi is ingeschakeld, kan uw telefoon oproepen doorschakelen via wifi-netwerken of het netwerk van uw provider, afhankelijk van uw voorkeur en welk signaal sterker is. Voordat u deze functie inschakelt, neemt u contact met uw provider op over de kosten en andere details."</string>
     <string name="home_settings" msgid="212375129455718176">"Startpagina"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Weergave"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Geluid"</string>
@@ -915,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Beschikbaar (alleen-lezen)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Totale ruimte"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Berekenen…"</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Apps (app-gegevens en media-inhoud)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Apps en app-gegevens"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Downloads"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Foto\'s, video\'s"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (muziek, beltonen, podcasts, enzovoort)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Diversen"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Andere bestanden"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Gegevens in het cachegeheugen"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Gedeelde opslag ontkoppelen"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD-kaart ontkoppelen"</string>
@@ -953,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Ontkoppelen wordt uitgevoerd"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Opslagruimte is bijna vol"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Bepaalde systeemfuncties, zoals synchronisatie, werken mogelijk niet correct. Probeer ruimte vrij te maken door items zoals apps of media-inhoud te verwijderen of los te maken."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Naam wijzigen"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Koppelen"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Uitwerpen"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Wissen en formatteren"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Wissen en formatteren als interne opslag"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB-computerverbinding"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-computerverbinding"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Verbinding maken als"</string>
@@ -963,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Hiermee kunnen apps met MIDI-functionaliteit via USB werken met MIDI-software op uw computer."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Andere gebruikers"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Apparaatopslag"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Verwijderbare opslag"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> beschikbaar (totaal <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> is gekoppeld"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Kan <xliff:g id="NAME">%1$s</xliff:g> niet koppelen"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> is veilig uitgeworpen"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Kan <xliff:g id="NAME">%1$s</xliff:g> niet veilig uitwerpen"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> is geformatteerd"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Kan <xliff:g id="NAME">%1$s</xliff:g> niet formatteren"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Naam van opslag wijzigen"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Na het formatteren kunt u deze <xliff:g id="NAME_0">^1</xliff:g> gebruiken in andere apparaten. \n\nAlle gegevens op deze <xliff:g id="NAME_1">^1</xliff:g> worden gewist. Misschien wilt u daarom eerst een back-up maken. \n\n"<b>"Maak back-ups van foto\'s en andere media"</b>" \nVerplaats uw mediabestanden naar alternatieve opslagruimte op dit apparaat of zet ze over naar een computer via een USB-kabel. \n\n"<b>"Maak back-ups van apps"</b>" \nAlle apps die zijn opgeslagen op deze <xliff:g id="NAME_6">^1</xliff:g>, worden verwijderd en de bijbehorende gegevens worden gewist. Als u deze apps wilt behouden, verplaatst u ze naar alternatieve opslagruimte op dit apparaat."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Wanneer u deze <xliff:g id="NAME_0">^1</xliff:g> uitwerpt, werken apps die erop zijn opgeslagen niet meer. Mediabestanden die hierop zijn opgeslagen, zijn pas weer beschikbaar als het opslagapparaat weer wordt geplaatst."</b>" \n\nDe <xliff:g id="NAME_1">^1</xliff:g> is geformatteerd voor gebruik in dit apparaat en werkt niet in andere apparaten."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Uw <xliff:g id="NAME">^1</xliff:g> configureren"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Gebruiken als draagbare opslag"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Voor het verplaatsen van foto\'s en andere media tussen apparaten."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Gebruiken als intern geheugen"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Voor het opslaan van dingen op alleen dit apparaat (waaronder apps en foto\'s). Hiervoor moet het apparaat worden geformatteerd, zodat het niet meer werkt met andere apparaten."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatteren als intern geheugen"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"De <xliff:g id="NAME_0">^1</xliff:g> moet worden geformatteerd om deze te beveiligen. \n\nNa het formatteren werkt deze <xliff:g id="NAME_1">^1</xliff:g> alleen in dit apparaat. \n\n"<b>"Wanneer u formatteert, worden alle gegevens gewist die momenteel op de <xliff:g id="NAME_2">^1</xliff:g> zijn opgeslagen."</b>" Als u wilt voorkomen dat u gegevens kwijtraakt, kunt u eerst een back-up maken."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Wissen en formatteren"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> formatteren…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Verwijder de <xliff:g id="NAME">^1</xliff:g> niet tijdens het formatteren."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Gegevens verpl. n. nieuwe opslag"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"U kunt uw foto\'s, bestanden en app-gegevens verplaatsen naar deze nieuwe <xliff:g id="NAME">^1</xliff:g>. \n\nHet overzetten duurt ongeveer <xliff:g id="TIME">^2</xliff:g> en maakt <xliff:g id="SIZE">^3</xliff:g> intern geheugen vrij. Tijdens het overzetten werken sommige apps niet."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Nu verplaatsen"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Later verplaatsen"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Gegevens nu verplaatsen"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Het overzetten duurt ongeveer <xliff:g id="TIME">^1</xliff:g>. Het maakt <xliff:g id="SIZE">^2</xliff:g> intern geheugen vrij."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Verplaatsen"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Gegevens verplaatsen…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Tijdens het verplaatsen: \n• Verwijder de <xliff:g id="NAME">^1</xliff:g> niet. \n• Sommige apps werken niet correct. \n• Zorg dat het apparaat voldoende opgeladen blijft."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> is klaar voor gebruik"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Uw <xliff:g id="NAME">^1</xliff:g> kan nu worden gebruikt voor foto\'s en andere media."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Uw nieuwe <xliff:g id="NAME">^1</xliff:g> werkt nu. \n\nAls u foto\'s, bestanden en app-gegevens naar dit apparaat wilt verplaatsen, gaat u naar \'Instellingen\' &gt; \'Opslagruimte\'."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> verplaatsen"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"U kunt <xliff:g id="APP">^1</xliff:g> en de bijbehorende gegevens snel overzetten naar de <xliff:g id="NAME_0">^2</xliff:g>. U kunt de app pas weer gebruiken nadat deze volledig is overgezet. \n\nVerwijder de <xliff:g id="NAME_1">^2</xliff:g> niet tijdens het overzetten."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> verplaatsen…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Verwijder de <xliff:g id="NAME">^1</xliff:g> niet tijdens het verplaatsen. \n\nDe app <xliff:g id="APP">^2</xliff:g> op dit apparaat is pas weer beschikbaar zodra het verplaatsen is voltooid."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Verplaatsen annuleren"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Accustatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Accuniveau"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN\'s"</string>
@@ -1007,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Standaardinstellingen herstellen"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Herstellen van standaard-APN-instellingen voltooid."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Netwerkinstellingen herstellen"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Hiermee worden de standaardwaarden van alle instellingen met betrekking tot netwerken hersteld, waaronder:\n\n"<li>"Wifi"</li>\n<li>"Mobiele gegevens"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Hiermee worden alle netwerkinstellingen opnieuw ingesteld, waaronder:\n\n"<li>"Wifi"</li>\n<li>"Mobiele gegevens"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Instellingen herstellen"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Alle netwerkinstellingen herstellen? U kunt deze actie niet ongedaan maken."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Alle netwerkinstellingen opnieuw instellen? U kunt deze actie niet ongedaan maken."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Instellingen herstellen"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"U moet uw ontgrendelingspatroon tekenen om het herstellen van de netwerkinstellingen te bevestigen."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Herstellen?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Netwerkinstellingen herstellen"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Netwerkinstellingen zijn opnieuw ingesteld"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Apparaat opnieuw instellen"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrieksinstellingen terug"</string>
     <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>
@@ -1029,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Alle gegevens op de SD-kaart wissen, zoals muziek en foto\'s"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tablet opnieuw instellen"</string>
     <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_desc" msgid="1062841478823409667">"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_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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Terugzetten op fabrieksinstellingen is niet beschikbaar voor deze gebruiker"</string>
@@ -1048,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Voicemail, oproepen doorschakelen, wisselgesprek, beller-id instellen"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-tethering"</string>
@@ -1081,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Help"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobiele netwerken"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobiel abonnement"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Standaard sms-app"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Sms-app"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Sms-app wijzigen?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Wilt u <xliff:g id="NEW_APP">%1$s</xliff:g> als uw sms-app gebruiken in plaats van <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Wilt u <xliff:g id="NEW_APP">%s</xliff:g> gebruiken als uw sms-app?"</string>
@@ -1112,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPS gebruiken om locatie te bepalen"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Scannen"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Scannen"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wifi-scannen"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Locatie verbeteren door apps en services te laten scannen naar wifi-netwerken, ook als wifi is uitgeschakeld"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth-scannen"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Locatie verbeteren door systeemservices toe te staan te scannen naar Bluetooth-apparaten, ook als Bluetooth is uitgeschakeld"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Locatie via wifi en mob. netw."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Apps toestaan de locatieservice van Google te gebruiken om uw locatie sneller te schatten. Anonieme locatiegegevens worden verzameld en verzonden naar Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Locatie bepaald via wifi"</string>
@@ -1157,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Wachtwoord is ingesteld"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-code is ingesteld"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Patroon is ingesteld"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Gebruik het patroon van uw apparaat om door te gaan."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Geef de pincode van uw apparaat op om door te gaan."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Geef het wachtwoord van uw apparaat op om door te gaan."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Onjuiste pincode"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Onjuist wachtwoord"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Onjuist patroon"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Apparaatbeveiliging"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Ontgrendelingspatroon wijzigen"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"PIN-code voor ontgrendelen wijzigen"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Opgeslagen patroon bevestigen"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Probeer het opnieuw:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Teken een ontgrendelingspatroon"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Druk op \'Menu\' voor hulp."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Haal uw vinger van het scherm als u klaar bent"</string>
@@ -1183,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Ontgrendelingspatroon instellen"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Ontgrendelingspatroon wijzigen"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"U tekent als volgt een ontgrendelingspatroon"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Te veel onjuiste pogingen!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Probeer het over <xliff:g id="NUMBER">%d</xliff:g> seconden opnieuw."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Te veel onjuiste pogingen. Probeer het over <xliff:g id="NUMBER">%d</xliff:g> seconden opnieuw."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Deze app is niet geïnstalleerd op uw telefoon."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Apps beheren"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Geïnstalleerde apps beheren en verwijderen"</string>
@@ -1235,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sorteren op grootte"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Actieve services weergeven"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Gecachte processen weerg."</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Nood-app"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Appvoorkeuren herstellen"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Appvoorkeuren herstellen?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Hiermee worden alle voorkeuren opnieuw ingesteld voor:\n\n "<li>"Uitgeschakelde apps"</li>\n" "<li>"Uitgeschakelde app-meldingen"</li>\n" "<li>"Standaardapps voor acties"</li>\n" "<li>"Beperkingen voor achtergrondgegevens voor apps"</li>\n" "<li>"Beperkingen voor machtigingen"</li>\n\n" U verliest geen app-gegevens."</string>
@@ -1440,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Alle Bluetooth-HCI-pakketten tot één bestand samenvoegen"</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="select_logd_size_title" msgid="7433137108348553508">"Logger-buffergrootten"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 uur"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dag"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Systeem weergeven"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Systeemprocessen verbergen"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"USS gebruiken"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistiektype"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Achtergrond"</string>
@@ -1838,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Huidig wachtwoord:"</string>
@@ -2213,7 +2250,7 @@
     <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 updaten voor alle andere gebruikers."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"U kunt dit apparaat met andere mensen delen door extra gebruikers te maken. Elke gebruiker heeft zijn eigen profiel dat hij onder andere kan aanpassen met zijn eigen apps en achtergrond. Gebruikers kunnen ook apparaatinstellingen, zoals wifi, aanpassen die van invloed zijn 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>
@@ -2393,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"beperking beperken beperkt"</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_reset_apps" msgid="6420313678620788457">"herstellen voorkeuren standaard"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"standaardapp voor noodgevallen"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"apps downloaden applicaties systeem"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"apps rechten beveiliging"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"standaard voor apps"</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>
@@ -2411,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmvolume"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Beltoonvolume"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Meldingsvolume"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Onderbrekingen blokkeren"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Alleen prioriteit toestaan"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatische regels"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Bij inkomende oproepen en 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_alarms" msgid="7380265858042606857">"Alleen alarmen toestaan"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Niet onderbreken"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Alleen prioriteit"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alleen alarmen"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Geen onderbrekingen"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Beltoon telefoon"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Standaardbeltoon voor meldingen"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Ook trillen voor oproepen"</string>
@@ -2451,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Er zijn geen listeners voor meldingen geïnstalleerd."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> inschakelen?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> kan alle meldingen lezen die door het systeem of een geïnstalleerde app worden gegenereerd, waaronder mogelijk persoonlijke gegevens zoals de namen van contacten en de tekst van berichten die naar u worden verzonden. De app kan deze meldingen ook sluiten of actieknoppen in de meldingen aanraken."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Apps die voorwaarden leveren"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Er zijn geen apps die voorwaarden leveren"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d apps leveren voorwaarden</item>
-      <item quantity="one">%d app levert voorwaarden</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Er zijn geen apps geïnstalleerd die voorwaarden leveren."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> inschakelen?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> kan voorwaarden voor sluiten toevoegen voor de modus \'Niet storen\'."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Apps laden..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Alles blokkeren"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nooit meldingen van deze app weergeven"</string>
@@ -2473,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioriteit"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Gevoelig"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Regelnaam"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Regel toevoegen"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Regel verwijderen"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Regel \'<xliff:g id="RULE">%1$s</xliff:g>\' verwijderen?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Verwijderen"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Regeltype"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Onbekend"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Regel configureren"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Planningsregel"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Regel niet gevonden."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dagen"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Geen"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Elke dag"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nooit"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> t/m <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2493,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmen"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Herinneringen"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Evenementen"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Geselecteerde bellers"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Terugkerende bellers"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Gesprekken toestaan wanneer dezelfde persoon binnen <xliff:g id="MINUTES">%d</xliff:g> minuten een tweede keer belt"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automatisch aan"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nooit"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Elke avond"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> de volgende dag"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Wanneer wilt u worden onderbroken?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Hoe lang?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Voor onbepaalde tijd"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minuten</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuut</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> uur</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> uur</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Wijzigen in \'Alleen prioriteitsmeldingen\' voor onbepaalde tijd"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Wijzigen in \'Alleen prioriteitsmeldingen\' gedurende <xliff:g id="DURATION">%1$d</xliff:g> minuten (tot <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Wijzigen in \'Alleen prioriteitsmeldingen\' gedurende één minuut (tot <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Wijzigen in \'Alleen prioriteitsmeldingen\' gedurende <xliff:g id="DURATION">%1$d</xliff:g> uur (tot <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Wijzigen in \'Alleen prioriteitsmeldingen\' gedurende één uur (tot <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Wijzigen in \'Alleen alarmen\' voor onbepaalde tijd"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Wijzigen in \'Alleen alarmen\' gedurende <xliff:g id="DURATION">%1$d</xliff:g> minuten (tot <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Wijzigen in \'Alleen alarmen\' gedurende één minuut (tot <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Wijzigen in \'Alleen alarmen\' gedurende <xliff:g id="DURATION">%1$d</xliff:g> uur (tot <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Wijzigen in \'Alleen alarmen\' gedurende één uur (tot <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Wijzigen in \'Niet storen\' voor onbepaalde tijd"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Wijzigen in \'Niet storen\' gedurende <xliff:g id="DURATION">%1$d</xliff:g> minuten (tot <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Wijzigen in \'Niet storen\' gedurende één minuut (tot <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Wijzigen in \'Niet storen\' gedurende <xliff:g id="DURATION">%1$d</xliff:g> uur (tot <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Wijzigen in \'Niet storen\' gedurende één uur (tot <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Wijzigen in \'Altijd onderbreken\'"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"Voor altijd"</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>
@@ -2566,7 +2659,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> machtigingen verleend</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> machtiging verleend</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> van <xliff:g id="COUNT_3">%d</xliff:g> rechten verleend</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> van <xliff:g id="COUNT_1">%d</xliff:g> recht verleend</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Enkele standaardwaarden ingesteld"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Geen standaardwaarden ingesteld"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Alle apps"</string>
@@ -2577,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioriteit"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Gevoelig"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Met domein-URL\'s"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Standaardwaarden van voorkeuren voor alle apps herstellen"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> apps geïnstalleerd, inclusief systeemapps en gedownloade apps"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Uitgeschakeld door beheerder"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Geavanceerd"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Onbekende app"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Profiel kiezen"</string>
@@ -2593,4 +2688,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps kunnen de domein-URL\'s openen</item>
       <item quantity="one">Eén app kan de domein-URL\'s openen</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Niet herkend"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Standaardapps"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Browser-app"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Geen standaardbrowser"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Standaard)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 0858e7a..cbc1086 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Naciśnij przycisk"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"niski poziom"</item>
     <item msgid="4212263919458209842">"poziom krytyczny"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Wył."</item>
-    <item msgid="5656544177755411222">"Nieliczne powiadomienia"</item>
-    <item msgid="8735337502532332056">"Brak powiadomień"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normalny"</item>
     <item msgid="866544120205026771">"Umiarkowany"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 67e6545..02752ba 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -270,12 +270,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Karta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Ustawienia proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Anuluj"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ANULUJ"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"DALEJ"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"TAK"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NIE"</string>
-    <string name="forget" msgid="7267115980248732932">"ZAPOMNIJ"</string>
+    <string name="forget" msgid="1400428660472591263">"Zapomnij"</string>
+    <string name="save" msgid="879993180139353333">"Zapisz"</string>
+    <string name="done" msgid="6942539184162713160">"Gotowe"</string>
     <string name="settings_label" msgid="1626402585530130914">"Ustawienia"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Ustawienia"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Skrót do ustawień"</string>
@@ -378,7 +376,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Podłącz ładowarkę i spróbuj ponownie."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Brak kodu PIN lub hasła blokowania ekranu"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Przed rozpoczęciem szyfrowania musisz ustawić kod PIN lub hasło blokady ekranu."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Aby potwierdzić zaszyfrowanie urządzenia, musisz narysować wzór odblokowania."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Zaszyfrować?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Operacja szyfrowania jest nieodwracalna, a jej przerwanie grozi utratą danych. Szyfrowanie trwa co najmniej godzinę, a tablet zostanie w tym czasie kilkakrotnie uruchomiony ponownie."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Operacja szyfrowania jest nieodwracalna, a jej przerwanie grozi utratą danych. Szyfrowanie trwa co najmniej godzinę, a telefon zostanie w tym czasie kilkakrotnie uruchomiony ponownie."</string>
@@ -537,7 +534,7 @@
     <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 innymi urządzeniami Bluetooth w pobliżu."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"Aby poprawić dokładność lokalizacji, usługi Google będą szukać urządzeń Bluetooth, nawet gdy Bluetooth jest wyłączony. Możesz to zmienić w LINK_BEGINustawieniach skanowaniaLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Aby poprawić dokładność lokalizacji, aplikacje i usługi będą szukać urządzeń Bluetooth, nawet gdy Bluetooth jest wyłączony. Możesz to zmienić w <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ustawieniach skanowania<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Połącz z siecią…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie odłączone od funkcji audio multimediów."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie odłączone od zestawu głośnomówiącego."</string>
@@ -603,7 +600,7 @@
     <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" msgid="8382526568324164356">"Aby poprawić dokładność lokalizacji, usługi Google będą szukać sieci Wi‑Fi, nawet gdy Wi‑Fi jest wyłączone. Możesz to zmienić w LINK_BEGINustawieniach skanowaniaLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Aby zwiększyć dokładność lokalizacji, aplikacje i usługi będą skanować sieci Wi-Fi, nawet gdy Wi-Fi jest wyłączone. Możesz to zmienić w <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ustawieniach skanowania<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Nie pokazuj ponownie"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi włączone w trybie uśpienia"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi działa po uśpieniu"</string>
@@ -620,8 +617,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skanuj"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Zaawansowane"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Pokaż aplikacje"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Pokaż moc Wi-Fi"</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>
@@ -679,6 +674,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Zalogować się, by połączyć?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> przed połączeniem z siecią wymaga zalogowania się online."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"POŁĄCZ"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Ta sieć nie ma dostępu do internetu. Użyć jej mimo to?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Nie pytaj ponownie o tę sieć"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Połącz"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nie można nawiązać połączenia z siecią"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Zapomnij"</string>
@@ -745,21 +742,17 @@
     <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="wifi_calling_settings_title" msgid="4102921303993404577">"Połączenia przez Wi-Fi"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Ustawienia połączeń"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Tryb połączeń przez Wi-Fi"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Preferuj sieć Wi-Fi"</item>
     <item msgid="5267397515594230396">"Preferuj sieć komórkową"</item>
-    <item msgid="3132912693346866895">"Tylko Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Gdy połączenia przez Wi-Fi są włączone, telefon może przekazywać połączenia przez sieci Wi-Fi lub sieć operatora (w zależności od ustawień i tego, który sygnał jest w danej chwili silniejszy). Przed włączeniem tej funkcji sprawdź koszt jej obsługi przez operatora."</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>
@@ -933,12 +926,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Dostępne (tylko do odczytu)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Całkowita pojemność"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Obliczanie..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplikacje (dane aplikacji i multimedia)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Aplikacje i ich dane"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Multimedia"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Pobrane"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Zdjęcia, filmy"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Dźwięk (muzyka, dzwonki, podcasty itp.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Różne"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Inne pliki"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Dane w pamięci podręcznej"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Odłącz pamięć współdzieloną"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Odłącz kartę SD"</string>
@@ -971,6 +964,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Odinstalowywanie w toku"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Kończy się miejsce"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Niektóre funkcje systemu (np. synchronizacja) mogą nie działać poprawnie. Zwolnij miejsce, usuwając lub odpinając takie elementy jak aplikacje i multimedia."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Zmień nazwę"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Podłącz"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Odłącz"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Wykasuj i sformatuj"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Wykasuj i sformatuj jako pamięć wew."</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Połączenie USB z komputerem"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Połączenie USB z komputerem"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Połącz jako:"</string>
@@ -981,6 +979,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Pozwala aplikacjom obsługującym MIDI na współpracę przez USB z oprogramowaniem MIDI na komputerze."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Inni użytkownicy"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Pamięć urządzenia"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Pamięć wymienna"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> wolne (łącznie <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Podłączono: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Nie udało się podłączyć: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"Bezpiecznie odłączono: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Nie udało się bezpiecznie odłączyć: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"Sformatowano: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Nie udało się sformatować: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Zmień nazwę pamięci"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Po sformatowaniu możesz używać tego nośnika (<xliff:g id="NAME_0">^1</xliff:g>) na innych urządzeniach. \n\nWszystkie dane, które zawiera <xliff:g id="NAME_1">^1</xliff:g>, zostaną wykasowane. Pamiętaj o wykonaniu kopii zapasowej. \n\n"<b>"Zrób kopię zapasową zdjęć i innych multimediów"</b>" \nPrzenieś pliki multimedialne w inne miejsce na tym urządzeniu lub prześlij je na komputer, używając kabla USB. \n\n"<b>"Zrób kopię zapasową aplikacji"</b>" \nWszystkie aplikacje, które zawiera <xliff:g id="NAME_6">^1</xliff:g>, zostaną odinstalowane, a ich dane zostaną wykasowane. Aby zachować te aplikacje, przenieś je w inne miejsce na urządzeniu."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Jeśli odłączysz ten nośnik (<xliff:g id="NAME_0">^1</xliff:g>), zapisane na nim aplikacje przestaną działać, a przechowywane pliki multimedialne będą niedostępne do momentu ponownego włożenia tego nośnika."</b>" \n\nTen nośnik (<xliff:g id="NAME_1">^1</xliff:g>) został sformatowany w taki sposób, że będzie działać tylko na tym urządzeniu. Nie będzie można z niego korzystać na żadnych innych urządzeniach."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Skonfiguruj: <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Użyj jako pamięci przenośnej"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Do przenoszenia zdjęć i innych multimediów z jednego urządzenia na drugie."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Użyj jako pamięci wewnętrznej"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Do zapisywania dowolnych danych (w tym aplikacji i zdjęć) tylko na tym urządzeniu. Wymaga sformatowania, które uniemożliwi korzystanie z tego nośnika na innych urządzeniach."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Sformatuj jako pamięć wewnętrzną"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Aby ten nośnik (<xliff:g id="NAME_0">^1</xliff:g>) był bezpieczny, musi zostać sformatowany. \n\nPo sformatowaniu <xliff:g id="NAME_1">^1</xliff:g> będzie działać tylko na tym urządzeniu. \n\n"<b>"Sformatowanie spowoduje wykasowanie wszystkich danych, które zawiera <xliff:g id="NAME_2">^1</xliff:g>."</b>" Aby uniknąć utraty danych, wykonaj ich kopię zapasową."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Wykasuj i sformatuj"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatuję: <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Nie wyjmuj tego nośnika (<xliff:g id="NAME">^1</xliff:g>) w trakcie formatowania."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Przenieś dane w nowe miejsce"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Na ten nowy nośnik (<xliff:g id="NAME">^1</xliff:g>) możesz przenieść swoje zdjęcia, pliki i dane aplikacji. \n\nPotrwa to około <xliff:g id="TIME">^2</xliff:g> i zwolni <xliff:g id="SIZE">^3</xliff:g> w pamięci wewnętrznej. W trakcie przenoszenia niektóre aplikacje nie będą działać."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Przenieś teraz"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Przenieś później"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Przenieś dane teraz"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Przenoszenie potrwa około <xliff:g id="TIME">^1</xliff:g> i zwolni <xliff:g id="SIZE">^2</xliff:g> w pamięci wewnętrznej."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Przenieś"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Przenoszę dane…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"W trakcie przenoszenia: \n• Nie wyjmuj nośnika (<xliff:g id="NAME">^1</xliff:g>). \n• Niektóre aplikacje nie będą działać prawidłowo. \n• Urządzenie musi być naładowane."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> już działa"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Nośnik <xliff:g id="NAME">^1</xliff:g> jest gotowy do przechowywania zdjęć i innych multimediów."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Twój nowy nośnik (<xliff:g id="NAME">^1</xliff:g>) już działa. \n\nAby przenieść zdjęcia, pliki i dane aplikacji na to urządzenie, kliknij Ustawienia &gt; Pamięć."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Przenieś aplikację <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Przeniesienie aplikacji <xliff:g id="APP">^1</xliff:g> i jej danych na ten nośnik (<xliff:g id="NAME_0">^2</xliff:g>) potrwa tylko chwilę. Do jego zakończenia nie będzie można korzystać z aplikacji. \n\nNie wyjmuj nośnika (<xliff:g id="NAME_1">^2</xliff:g>) w trakcie przenoszenia danych."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Przenoszę aplikację <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Nie wyjmuj nośnika (<xliff:g id="NAME">^1</xliff:g>) w trakcie przenoszenia danych. \n\nAplikacja <xliff:g id="APP">^2</xliff:g> na tym urządzeniu będzie niedostępna, dopóki przenoszenie się nie zakończy."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Anuluj przenoszenie"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Stan baterii"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Poziom naładowania baterii"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Nazwy APN"</string>
@@ -1025,13 +1062,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Resetuj ustawienia"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Przywracanie domyślnych ustawień APN zostało ukończone."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Ustawienia sieciowe zostały zresetowane"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Spowoduje to zresetowanie do ustawień fabrycznych wszystkich opcji dotyczących sieci, takich jak:\n\n"<li>"Wi-Fi"</li>\n<li>"Dane komórkowe"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"To spowoduje zresetowanie wszystkich ustawień sieciowych, takich jak:\n\n"<li>"Wi‑Fi"</li>\n<li>"Dane komórkowe"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Zresetuj ustawienia"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Zresetować wszystkie ustawienia sieciowe? Nie można tego cofnąć."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Zresetować wszystkie ustawienia sieciowe? Nie można tego cofnąć."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Zresetuj ustawienia"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Musisz narysować wzór odblokowania, by potwierdzić zresetowanie ustawień sieciowych."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Zresetować?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Ustawienia sieciowe zostały zresetowane"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Ustawienia sieciowe zostały zresetowane"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Resetuj urządzenie"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Ustawienia fabryczne"</string>
     <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>
@@ -1047,9 +1083,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Wymaż wszystkie dane z karty SD, np. pliki muzyczne i zdjęcia."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Resetuj tablet"</string>
     <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_desc" msgid="1062841478823409667">"Wymazać wszystkie Twoje informacje osobiste i pobrane aplikacje? Nie można tego cofnąć."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Wymaż wszystko"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Przywracanie ustawień fabrycznych nie jest dostępne dla tego użytkownika"</string>
@@ -1066,8 +1101,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Poczta głosowa, przekierowanie połączeń, poł. oczekujące, ID rozmówcy"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering przez USB"</string>
@@ -1099,7 +1132,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoc"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Sieci komórkowe"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Taryfa komórkowa"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Domyślna aplikacja do SMS-ów"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplikacja do SMS-ów"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Zmienić aplikację do SMS-ów?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Chcesz używać aplikacji <xliff:g id="NEW_APP">%1$s</xliff:g> zamiast <xliff:g id="CURRENT_APP">%2$s</xliff:g> do wysłania i otrzymywania SMS-ów?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Użyć <xliff:g id="NEW_APP">%s</xliff:g> jako aplikacji do SMS-ów?"</string>
@@ -1130,6 +1163,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Określaj lokalizację przez GPS"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Skanowanie"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skanowanie"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Skanowanie Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Popraw lokalizację, zezwalając aplikacjom i usługom na szukanie sieci Wi-Fi, nawet gdy Wi-Fi jest wyłączone"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Skanowanie Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Popraw lokalizację, zezwalając usługom systemowym na szukanie urządzeń Bluetooth, nawet gdy Bluetooth jest wyłączony"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Sieć komórkowa i Wi-Fi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Zezwalaj aplikacjom na używanie usługi lokalizacji Google do szybszego określania Twojego położenia. Anonimowe dane o lokalizacji będą zbierane i przesyłane do Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Lokalizacja określona na podstawie Wi-Fi"</string>
@@ -1175,11 +1212,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Hasło zostało ustawione"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Kod PIN został ustawiony"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Wzór został ustawiony"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Podaj wzór używany na urządzeniu, by kontynuować."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Podaj kod PIN używany na urządzeniu, by kontynuować."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Podaj hasło używane na urządzeniu, by kontynuować."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Nieprawidłowy kod PIN"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Nieprawidłowe hasło"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Nieprawidłowy wzór"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Zabezpieczenia urządzenia"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Zmień wzór odblokowania"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Zmień kod PIN odblokowania"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potwierdź zapisany wzór"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Spróbuj ponownie:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Narysuj wzór odblokowania"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Naciśnij Menu, aby uzyskać pomoc."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Odsuń palec, gdy skończysz"</string>
@@ -1201,8 +1242,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Ustaw wzór odblokowania"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Zmień wzór odblokowania"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Jak narysować wzór odblokowania"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Zbyt wiele nieudanych prób!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Spróbuj ponownie za <xliff:g id="NUMBER">%d</xliff:g> sekund."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Zbyt wiele nieudanych prób. Spróbuj ponownie za <xliff:g id="NUMBER">%d</xliff:g> s."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Aplikacja nie jest zainstalowana na telefonie."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Zarządzaj aplikacjami"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Zarządzaj zainstalowanymi aplikacjami i usuwaj je."</string>
@@ -1253,8 +1293,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sortuj według rozmiaru"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Pokaż działające usługi"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Pokaż procesy z pamięci podręcznej"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Aplikacja alarmowa"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Resetuj opcje aplikacji"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Zresetować opcje aplikacji?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"To działanie zresetuje wszystkie ustawienia:\n\n "<li>"wyłączonych aplikacji,"</li>\n" "<li>"powiadomień wyłączonych aplikacji,"</li>\n" "<li>"domyślnych aplikacji dla wybranych czynności,"</li>\n" "<li>"ograniczeń danych w tle dla aplikacji,"</li>\n" "<li>"wszystkich ograniczeń uprawnień."</li>\n\n" Nie utracisz żadnych danych aplikacji."</string>
@@ -1458,8 +1497,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Przechwyć wszystkie pakiety Bluetooth HCI do pliku"</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="select_logd_size_title" msgid="7433137108348553508">"Rozmiary bufora Rejestratora"</string>
@@ -1760,6 +1797,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 godzin"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dzień"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Pokaż systemowe"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Ukryj systemowe"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Użyj USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Typ statystyk"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Tło"</string>
@@ -1856,7 +1894,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Bieżące hasło:"</string>
@@ -2231,7 +2268,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Użytkownik"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil ograniczony"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Dodać nowego użytkownika?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Możesz udostępnić to urządzenie innym osobom, dodając do niego dodatkowych użytkowników. Każdy użytkownik ma własną przestrzeń, na której może mieć swoje aplikacje, tapety itd. Może również zmieniać ustawienia urządzenia wpływające na wszystkich użytkowników, takie jak Wi‑Fi.\n\nGdy dodasz nowego użytkownika, musi on skonfigurować swoją przestrzeń.\n\nKażdy użytkownik może uaktualniać aplikacje wszystkich innych użytkowników."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Z tego urządzenia możesz korzystać wraz z innymi osobami, dodając na nim konta użytkowników. Każdy użytkownik ma własne miejsce na swoje aplikacje, tapety i inne dane. Może też zmieniać ustawienia, które wpływają na wszystkich użytkowników urządzenia (np. Wi‑Fi).\n\nGdy dodasz nowego użytkownika, musi on skonfigurować swoje miejsce na dane.\n\nKażdy użytkownik może aktualizować aplikacje w imieniu wszystkich pozostałych użytkowników."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Gdy dodasz nowego użytkownika, musi on skonfigurować swoją przestrzeń.\n\nKażdy użytkownik może aktualizować aplikacje wszystkich innych użytkowników."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Skonfigurować ustawienia dla użytkownika?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Upewnij się, że ta osoba jest w pobliżu i może skonfigurować swój profil."</string>
@@ -2411,10 +2448,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"ograniczenie ogranicz ograniczony"</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_reset_apps" msgid="6420313678620788457">"resetuj ustawienia domyślne"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"domyślna aplikacja awaryjna do używania w nagłych przypadkach"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"aplikacje pobrane systemowe"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"zabezpieczenia uprawnień aplikacji"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"wartość domyślna aplikacji"</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>
@@ -2429,14 +2466,12 @@
     <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="6948120138640252732">"Blokuj powiadomienia"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Tylko priorytetowe"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatyczne reguły"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Gdy ktoś dzwoni/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_alarms" msgid="7380265858042606857">"Zezwalaj tylko na alarmy"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Nie zezwalaj na żadne dźwięki"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Tylko priorytetowe"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Tylko alarmy"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Bez przeszkadzania"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <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 przy połączeniach"</string>
@@ -2471,17 +2506,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Brak zainstalowanych odbiorników powiadomień."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Włączyć usługę <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Usługa <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> będzie w stanie odczytywać wszystkie wysyłane przez system lub dowolną zainstalowaną aplikację powiadomienia, które mogą zawierać informacje osobiste, takie jak nazwy kontaktów oraz tekst wiadomości wysłanych do Ciebie. Usługa będzie również mogła odrzucać te powiadomienia lub używać przycisków czynności w ich obrębie."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Dostawcy warunków"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Żadne aplikacje nie dostarczają warunków"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="few">Warunki dostarczają %d aplikacje</item>
-      <item quantity="many">Warunki dostarcza %d aplikacji</item>
-      <item quantity="other">Warunki dostarcza %d aplikacji</item>
-      <item quantity="one">Warunki dostarcza %d aplikacja</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Brak zainstalowanych dostawców warunków."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Włączyć usługę <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> będzie mieć możliwość dodania warunków zamknięcia do trybu Nie przeszkadzać."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Wczytuję aplikacje..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokuj wszystkie"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nigdy nie pokazuj powiadomień z tej aplikacji"</string>
@@ -2495,17 +2519,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priorytet"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Nazwa reguły"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Dodaj regułę"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Usuń regułę"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Usunąć regułę „<xliff:g id="RULE">%1$s</xliff:g>”?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Usuń"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Typ reguły"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Nieznany"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Skonfiguruj regułę"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Reguła harmonogramu"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Reguły nie znaleziono."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dni"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Brak"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Codziennie"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nigdy"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"Od: <xliff:g id="START">%1$s</xliff:g> do: <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Połączenia"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Wiadomości"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Połączenia lub wiadomości od:"</string>
@@ -2515,15 +2545,92 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmy"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Przypomnienia"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Wydarzenia"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Wybrani rozmówcy"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Dzwoniący powtórnie"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Jeśli ta sama osoba dzwoni po raz drugi w ciągu <xliff:g id="MINUTES">%d</xliff:g> minut, zezwól"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> następnego dnia"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Kiedy chcesz otrzymywać powiadomienia?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Na jak długo?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Na czas nieokreślony"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> minuty</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> minut</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minuty</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuta</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> godziny</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> godzin</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> godziny</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> godzina</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Zmień na same powiadomienia priorytetowe na czas nieokreślony"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="few">Zmień na same powiadomienia priorytetowe przez <xliff:g id="DURATION">%1$d</xliff:g> minuty, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Zmień na same powiadomienia priorytetowe przez <xliff:g id="DURATION">%1$d</xliff:g> minut, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Zmień na same powiadomienia priorytetowe przez <xliff:g id="DURATION">%1$d</xliff:g> minuty, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Zmień na same powiadomienia priorytetowe przez minutę, do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="few">Zmień na same powiadomienia priorytetowe przez <xliff:g id="DURATION">%1$d</xliff:g> godziny, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Zmień na same powiadomienia priorytetowe przez <xliff:g id="DURATION">%1$d</xliff:g> godzin, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Zmień na same powiadomienia priorytetowe przez <xliff:g id="DURATION">%1$d</xliff:g> godziny, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Zmień na same powiadomienia priorytetowe przez godzinę, do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Zmień na same alarmy na czas nieokreślony"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="few">Zmień na same alarmy przez <xliff:g id="DURATION">%1$d</xliff:g> minuty, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Zmień na same alarmy przez <xliff:g id="DURATION">%1$d</xliff:g> minut, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Zmień na same alarmy przez <xliff:g id="DURATION">%1$d</xliff:g> minuty, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Zmień na same alarmy przez minutę, do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="few">Zmień na same alarmy przez <xliff:g id="DURATION">%1$d</xliff:g> godziny, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Zmień na same alarmy przez <xliff:g id="DURATION">%1$d</xliff:g> godzin, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Zmień na same alarmy przez <xliff:g id="DURATION">%1$d</xliff:g> godziny, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Zmień na same alarmy przez godzinę, do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Zmień na brak powiadomień na czas nieokreślony"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="few">Zmień na brak powiadomień przez <xliff:g id="DURATION">%1$d</xliff:g> minuty, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Zmień na brak powiadomień przez <xliff:g id="DURATION">%1$d</xliff:g> minut, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Zmień na brak powiadomień przez <xliff:g id="DURATION">%1$d</xliff:g> minuty, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Zmień na brak powiadomień przez minutę, do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="few">Zmień na brak powiadomień przez <xliff:g id="DURATION">%1$d</xliff:g> godziny, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Zmień na brak powiadomień przez <xliff:g id="DURATION">%1$d</xliff:g> godzin, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Zmień na brak powiadomień przez <xliff:g id="DURATION">%1$d</xliff:g> godziny, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Zmień na brak powiadomień przez godzinę, do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Zmień na ciągle powiadamianie"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"bez końca"</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>
@@ -2590,7 +2697,12 @@
       <item quantity="other">Przyznano <xliff:g id="COUNT_1">%d</xliff:g> uprawnienia</item>
       <item quantity="one">Przyznano <xliff:g id="COUNT_0">%d</xliff:g> uprawnienie</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="few">Przyznane uprawnienia: <xliff:g id="COUNT_2">%d</xliff:g> z <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="many">Przyznane uprawnienia: <xliff:g id="COUNT_2">%d</xliff:g> z <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="other">Przyznane uprawnienia: <xliff:g id="COUNT_2">%d</xliff:g> z <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="one">Przyznane uprawnienia: <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g></item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Część ustawień domyślnych"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Brak ustawień domyślnych"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Wszystkie aplikacje"</string>
@@ -2601,8 +2713,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Priorytetowe"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Poufne"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Z URL-ami domeny"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Zresetuj ustawienia wszystkich aplikacji do wartości domyślnych"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"Zainstalowane aplikacje: <xliff:g id="COUNT">%d</xliff:g>, w tym systemowe i pobrane"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Wyłączone przez administratora"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Zaawansowane"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nieznana aplikacja"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Wybierz profil"</string>
@@ -2619,4 +2730,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikacji może otwierać URL-e swojej domeny</item>
       <item quantity="one">Jedna aplikacja może otwierać URL-e swojej domeny</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Nie rozpoznano"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Domyślne aplikacje"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Przeglądarka"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Brak domyślnej przeglądarki"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Domyślna)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 1a6f2be..726e407 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Premir botão"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"baixa"</item>
     <item msgid="4212263919458209842">"crítica"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Desativado"</item>
-    <item msgid="5656544177755411222">"Interrupções limitadas"</item>
-    <item msgid="8735337502532332056">"Sem interrupções"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Moderada"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 0179f06..9f09c4f 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Cartão SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Definições de proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancelar"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"CANCELAR"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUAR"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"SIM"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NÃO"</string>
-    <string name="forget" msgid="7267115980248732932">"ESQUECER"</string>
+    <string name="forget" msgid="1400428660472591263">"Esquecer"</string>
+    <string name="save" msgid="879993180139353333">"Guardar"</string>
+    <string name="done" msgid="6942539184162713160">"Concluído"</string>
     <string name="settings_label" msgid="1626402585530130914">"Definições"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Definições"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Atalho das definições"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Ligue o carregador e tente novamente."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Sem PIN nem palavra-passe de bloqueio de ecrã"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"É necessário configurar um PIN ou palavra-passe de bloqueio de ecrã antes de iniciar a encriptação."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Tem de desenhar a sua sequência de desbloqueio para confirmar a encriptação do seu dispositivo."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Encriptar?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"A operação de encriptação é irreversível e, se a interromper, perderá dados. A encriptação demora uma hora ou mais, durante a qual o tablet reiniciará várias vezes."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"A operação de encriptação é irreversível e, se a interromper, perderá dados. A encriptação demora uma hora ou mais, durante a qual o telemóvel reiniciará várias vezes."</string>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avançadas"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth Avançado"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Quando o Bluetooth está ativado, o disp. pode comunicar com outros disp. Bluetooth próximos."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"Para melhorar a precisão da localização, os serviços Google procuram dispositivos Bluetooth, mesmo quando o Bluetooth está desativado. Pode alterar esta opção nas LINK_BEGINdefinições de procuraLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Para melhorar a precisão da localização, as aplicações e os serviços procuram dispositivos Bluetooth mesmo quando o Bluetooth está desativado. Pode alterar esta opção nas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>definições de procura<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Ligar a..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado do áudio multimédia."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado do áudio mãos-livres."</string>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"Para melhorar a precisão da localização, os serviços Google procuram redes Wi‑Fi, mesmo quando o Wi‑Fi está desativado. Pode alterar esta opção nas LINK_BEGINdefinições de procuraLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Para melhorar a precisão da localização, as aplicações e os serviços procuram redes Wi-Fi mesmo quando o Wi-Fi está desativado. Pode alterar esta opção nas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>definições de procura<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Não mostrar de novo"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Manter Wi-Fi ligada durante suspensão"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi ligado durante suspensão"</string>
@@ -604,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Procurar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avançadas"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Mostrar aplicações"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Mostrar força Wi-Fi"</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>
@@ -663,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Iniciar sessão para ligar?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> necessita que inicie sessão online antes de se ligar à rede."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"LIGAR"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Esta rede não tem acesso à Internet. Pretende utilizar esta rede mesmo assim?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Não perguntar novamente para esta rede"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Ligar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Não foi possível estabelecer ligação à rede"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esquecer"</string>
@@ -729,21 +726,17 @@
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Zona Wi-Fi portátil <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="wifi_calling_settings_title" msgid="4102921303993404577">"Chamadas Wi-Fi"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Preferências das chamadas"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Modo de chamada Wi-Fi"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Rede Wi-Fi preferida"</item>
     <item msgid="5267397515594230396">"Rede móvel preferida"</item>
-    <item msgid="3132912693346866895">"Apenas Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Se as chamadas Wi-Fi estiverem ativadas, o telemóvel pode encaminhar as chamadas através de redes Wi-Fi ou da rede do seu operador, consoante as suas preferências e do sinal que for mais forte. Antes de ativar esta funcionalidade, verifique junto do seu operador questões como tarifas, entre outras."</string>
     <string name="home_settings" msgid="212375129455718176">"Página Inicial"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Visor"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
@@ -915,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Disponível (só de leitura)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espaço total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"A calcular..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplicações (dados das aplic. e cont. multimédia)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Aplicações e respetivos dados"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Multimédia"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Transferências"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Imagens, vídeos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Áudio (música, toques, podcasts, etc.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Diversos"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Outros ficheiros"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Dados em cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desmont. arm. partilhado"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desmontar cartão SD"</string>
@@ -953,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desmontagem em curso"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Está quase sem espaço de armaz."</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Algumas funções do sistema, como a sincronização, poderão não funcionar corretamente. Tente libertar espaço eliminando ou soltando itens, nomeadamente aplicações ou conteúdos multimédia."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Mudar o nome"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Montar"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Ejetar"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Apagar e formatar"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Apagar e formatar como armaz. interno"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Ligação USB do computador"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Ligação USB do computador"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Ligado como"</string>
@@ -963,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Deixe as aplicações compatíveis com MIDI serem executadas através de USB com software MIDI no seu computador."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Outros utilizadores"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Armazenamento do dispositivo"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Armazenamento amovível"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> livre(s) (Total de <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> está montado"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Não foi possível montar <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> foi ejetado com segurança"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Não foi possível ejetar com segurança <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> está formatado"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Não foi possível formatar <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Mudar o nome do armazenamento"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Após a formatação, pode utilizar este <xliff:g id="NAME_0">^1</xliff:g> noutros dispositivos. \n\nTodos os dados de <xliff:g id="NAME_1">^1</xliff:g> são apagados. Considere fazer uma cópia de segurança primeiro. \n\n"<b>"Fazer uma cópia de segurança das fotos e de outros conteúdos multimédia"</b>" \nMova os seus ficheiros multimédia para um armazenamento alternativo neste dispositivo ou transfira-os para um computador com um cabo USB. \n\n"<b>"Fazer uma cópia de segurança das aplicações"</b>" \nTodas as aplicações armazenadas neste <xliff:g id="NAME_6">^1</xliff:g> são desinstaladas e os respetivos dados são apagados. Para manter estas aplicações, mova-as para um armazenamento alternativo neste dispositivo."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Quando ejetar este <xliff:g id="NAME_0">^1</xliff:g>, as aplicações armazenadas no mesmo deixam de funcionar e os ficheiros multimédia armazenados deixam de estar disponíveis até voltar a inseri-lo."</b>" \n\nEste <xliff:g id="NAME_1">^1</xliff:g> está formatado para funcionar apenas neste dispositivo. Não funciona em mais nenhum."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurar o <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utilizar como armazenamento portátil"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Para mover fotos e outros conteúdos multimédia entre dispositivos."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Utilizar como memória de armazenamento interno"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Para armazenar algo apenas neste dispositivo, incluindo aplicações e fotos. Requer formatação, o que impede o funcionamento com outros dispositivos."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Format. como mem. armaz. interno"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Isto requer que o <xliff:g id="NAME_0">^1</xliff:g> seja formatado para o tornar seguro. \n\nApós a formatação, este <xliff:g id="NAME_1">^1</xliff:g> apenas funciona neste dispositivo. \n\n"<b>"A formatação apaga todos os dados atualmente armazenados no <xliff:g id="NAME_2">^1</xliff:g>."</b>" Para evitar perder os dados, considere fazer uma cópia de segurança."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Apagar e formatar"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"A formatar <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Não remova o <xliff:g id="NAME">^1</xliff:g> enquanto estiver a decorrer a formatação."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Mover dados p/ novo armazenamen."</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Pode mover as fotos, os ficheiros e os dados das aplicações para o novo <xliff:g id="NAME">^1</xliff:g>. \n\nA transferência demora cerca de <xliff:g id="TIME">^2</xliff:g> e liberta <xliff:g id="SIZE">^3</xliff:g> na memória de armazenamento interno. Algumas aplicações não funcionam enquanto estiver a decorrer."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Mover agora"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Mover mais tarde"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Mover dados agora"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"A transferência demora cerca de <xliff:g id="TIME">^1</xliff:g>. Liberta <xliff:g id="SIZE">^2</xliff:g> na memória de armazenamento interno."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Mover"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"A mover dados…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Ao mover: \n• Não remova o <xliff:g id="NAME">^1</xliff:g>. \n• Algumas aplicações não funcionam corretamente. \n• Mantenha o dispositivo carregado."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> está pronto"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"O seu <xliff:g id="NAME">^1</xliff:g> está configurado para a utilização com fotos e outros conteúdos multimédia."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"O seu novo <xliff:g id="NAME">^1</xliff:g> está a funcionar. \n\nPara mover fotos, ficheiros e dados das aplicações para este dispositivo, aceda a Definições &gt; Armazenamento."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Mover <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"A transferência da aplicação <xliff:g id="APP">^1</xliff:g> e dos respetivos dados para <xliff:g id="NAME_0">^2</xliff:g> demora apenas alguns minutos. Não é possível utilizar a aplicação até a ação terminar. \n\nNão remova o <xliff:g id="NAME_1">^2</xliff:g> no decorrer da mesma."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"A mover <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Não remova o <xliff:g id="NAME">^1</xliff:g> durante a transferência. \n\nA aplicação <xliff:g id="APP">^2</xliff:g> neste dispositivo não está disponível até terminar a transferência."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancelar transferência"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Estado da bateria"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nível da bateria"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1007,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Repor predefinição"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Reposição de predefinições de APN concluída."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Reposição das definições de rede"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Esta ação repõe as predefinições de fábrica de todas as definições relacionadas com a rede, incluindo:\n\n"<li>"Wi-Fi"</li>\n<li>"Dados móveis"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Esta ação repõe todas as definições de rede, incluindo:\n\n"<li>"Wi‑Fi"</li>\n<li>"Dados móveis"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Repor definições"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Pretende repor todas as definições de rede? Não é possível reverter esta ação!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Pretende repor todas as definições de rede? Não é possível anular esta ação!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Repor definições"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"É necessário desenhar a sequência de desbloqueio para confirmar uma reposição de definições de rede."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Pretende repor?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Reposição das definições de rede"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"As definições de rede foram repostas"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Repor dispositivo"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Reposição dos dados de fábrica"</string>
     <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>
@@ -1029,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Apagar todos os dados do cartão SD, como músicas ou fotografias"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Repor o tablet"</string>
     <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_desc" msgid="1062841478823409667">"Pretende apagar todas as informações pessoais e as aplicações transferidas? Não é possível anular esta ação!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Apagar tudo"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"A reposição de fábrica não está disponível para este utilizador"</string>
@@ -1048,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configurar correio de voz, reencaminhamento de chamadas, chamada em espera, ID do autor da chamada"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Ligação USB"</string>
@@ -1081,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajuda"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Redes móveis"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plano de telemóvel"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Aplicação de SMS predefinida"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplicação de SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Alterar aplicação de SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Utilizar <xliff:g id="NEW_APP">%1$s</xliff:g> em vez de <xliff:g id="CURRENT_APP">%2$s</xliff:g> como a aplicação de SMS predefinida?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Utilizar <xliff:g id="NEW_APP">%s</xliff:g> como a aplicação de SMS predefinida?"</string>
@@ -1112,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utilizar o GPS para determinar a localização"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"A analisar"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"A analisar"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Procurar por Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Melhorar a localização ao permitir que as aplicações e os serviços procurem redes Wi-Fi mesmo quando o Wi-Fi está desativado"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Procurar por Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Melhorar a localização ao permitir que os serviços do sistema procurem dispositivos Bluetooth mesmo quando o Bluetooth está desativado"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi e localiz. de rede móvel"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que aplic. usem o serv. localiz. Google p/ calcular mais rapida/ a sua localização. Dados localização recolhidos e enviados à Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Localização determinada por Wi-Fi"</string>
@@ -1157,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"A palavra-passe foi definida"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"O PIN foi definido"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"O padrão foi definido"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Utilize a sequência do dispositivo para continuar."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Introduza o PIN do dispositivo para continuar."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Introduza a palavra-passe do dispositivo para continuar."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN incorreto"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Palavra-passe incorreta"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Sequência incorreta"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Segurança do dispositivo"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Mudar padrão de desbloqueio"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Alterar PIN de desbloqueio"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmar padrão guardado"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Tente novamente:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Desenhar um padrão de desbloqueio"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Prima Menu para obter ajuda."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Retirar dedo quando concluído"</string>
@@ -1183,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Definir padrão de desbloqueio"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Mudar padrão de desbloqueio"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Como desenhar um padrão de desbloqueio"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Demasiadas tentativas incorrectas!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Tente novamente dentro de <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Demasiadas tentativas incorretas. Tente novamente dentro de <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"A aplicação não está instalada no telemóvel."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gerir aplicações"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gerir e remover aplicações instaladas"</string>
@@ -1235,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Ordenar por tamanho"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Mostrar serv. em execução"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Mostrar proc. em cache"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Aplicação de emergência"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Repor pref. de aplic."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Repor pref. de aplic.?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Isto irá repor todas as preferências de:\n\n "<li>"Aplicações desativadas"</li>\n" "<li>"Notificações de aplicações desativadas"</li>\n" "<li>"Aplicações predefinidas para ações"</li>\n" "<li>"Restrições de dados em segundo plano para aplicações"</li>\n" "<li>"Todas as restrições de autorização"</li>\n\n" Não irá perder quaisquer dados das aplicações."</string>
@@ -1440,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos os pacotes Bluetooth HCI num ficheiro"</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="select_logd_size_title" msgid="7433137108348553508">"Tamanhos da memória intermédia do registo"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 horas"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dia"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Mostrar sistema"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Ocultar sistema"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Utilizar Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipo de estatísticas"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Em segundo plano"</string>
@@ -1838,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Palavra-passe actual:"</string>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Utilizador"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil restrito"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Adicionar novo utilizador?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Pode partilhar este dispositivo com outras pessoas ao criar utilizadores adicionais. Cada utilizador possui o seu próprio espaço, que pode ser personalizado com as suas próprias aplicações, imagem de fundo, etc. Os utilizadores também podem ajustar as definições do dispositivo, como o Wi‑Fi, que afetam os restantes utilizadores.\n\nAo adicionar um novo utilizador, essa pessoa tem de configurar o respetivo espaço.\n\nQualquer utilizador pode atualizar aplicações para todos os outros utilizadores."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Pode partilhar este dispositivo com outras pessoas ao criar utilizadores adicionais. Cada utilizador possui o seu próprio espaço, que pode ser personalizado com aplicações, imagem de fundo, etc. Os utilizadores também podem ajustar as definições do dispositivo, como o Wi‑Fi, que afetam os restantes utilizadores.\n\nAo adicionar um novo utilizador, essa pessoa tem de configurar o respetivo espaço.\n\nQualquer utilizador pode atualizar aplicações para todos os outros utilizadores."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Ao adicionar um novo utilizador, essa pessoa tem de configurar o respetivo espaço.\n\nQualquer utilizador pode atualizar aplicações para todos os outros utilizadores."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurar o utilizador agora?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Certifique-se de que a pessoa está disponível para levar o dispositivo e configurar o seu espaço"</string>
@@ -2393,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"restrição restringir restrito"</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_reset_apps" msgid="6420313678620788457">"repor preferências predefinição"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"aplicação predefinida para casos de emergência"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"aplicações transferência sistema"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"aplicações autorizações segurança"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"aplicações predefinidas"</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>
@@ -2411,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume do alarme"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume do toque"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume de notificações"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Bloquear interrupções"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioridade permite apenas"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Regras automáticas"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Ao receber chamadas e 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_alarms" msgid="7380265858042606857">"Permitir apenas alarmes"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Não interromper"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Apenas prioridade"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Apenas alarmes"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Sem interrupções"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Toque do telefone"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Toque de notificação predefinido"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrar também para chamadas"</string>
@@ -2451,15 +2486,6 @@
     <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>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nenhuma aplicação fornece condições"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d aplicações fornecem condições</item>
-      <item quantity="one">%d aplicação fornece condições</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Não estão instalados fornecedores de condições."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Ativar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"Será possível a <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> adicionar condições de saída do modo não incomodar."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"A carregar aplicações..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear tudo"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nunca mostrar notificações desta aplicação"</string>
@@ -2473,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioridade"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensível"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Nome da regra"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Adicionar regra"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Eliminar regra"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Pretende eliminar a regra \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Eliminar"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Tipo de regra"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Desconhecido"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configurar regra"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Programar regra"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Regra não encontrada."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dias"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Nenhum"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Todos os dias"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nunca"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"De <xliff:g id="START">%1$s</xliff:g> a <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2493,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Lembretes"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Autores das chamadas selecionados"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Autores de chamadas repetentes"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Se a mesma pessoa telefonar uma segunda vez num período de <xliff:g id="MINUTES">%d</xliff:g> minutos, permitir"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Ligar autom."</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nunca"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Todas as noites"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do dia seguinte"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Quando gostaria de ser interrompido?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Durante quanto tempo?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Indefinidamente"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutos</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuto</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> horas</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hora</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Alterar para notificações prioritárias apenas, indefinidamente"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Alterar para notificações prioritárias apenas durante <xliff:g id="DURATION">%1$d</xliff:g> minutos, até às <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Alterar para notificações prioritárias apenas durante um minuto, até às <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Alterar para notificações prioritárias apenas durante <xliff:g id="DURATION">%1$d</xliff:g> horas, até às <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Alterar para notificações prioritárias apenas durante uma hora, até às <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Alterar para alarmes apenas, indefinidamente"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Alterar para alarmes apenas durante <xliff:g id="DURATION">%1$d</xliff:g> minutos, até às <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Alterar para alarmes apenas durante um minuto, até às <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Alterar para alarmes apenas durante <xliff:g id="DURATION">%1$d</xliff:g> horas até às <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Alterar para alarmes apenas durante uma hora até às <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Alterar para não interromper indefinidamente"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Alterar para não interromper durante <xliff:g id="DURATION">%1$d</xliff:g> minutos, até às <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Alterar para não interromper durante um minuto, até às <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Alterar para não interromper durante <xliff:g id="DURATION">%1$d</xliff:g> horas, até às <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Alterar para não interromper durante uma hora, até às <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Alterar para interromper sempre"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"para sempre"</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>
@@ -2566,7 +2659,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorizações concedidas</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> autorização concedida</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> de <xliff:g id="COUNT_3">%d</xliff:g> autorizações concedidas</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> autorização concedida</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Algumas predefinições definidas"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Nenhuma predefinição definida"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Todas as aplicações"</string>
@@ -2577,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritárias"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensíveis"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Com URLs de domínio"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Repor as predefinições das preferências para todas as aplicações"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> aplicações instaladas, incluindo aplicações do sistema e transferidas"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Desativado pelo administrador"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avançadas"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicação desconhecida"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Escolher perfil"</string>
@@ -2593,4 +2688,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicações podem abrir os seus URLs de domínio</item>
       <item quantity="one">Uma aplicação pode abrir os seus URLs de domínio</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Não reconhecido"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Aplicações predefinidas"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Aplicação do navegador"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Nenhum navegador predefinido"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Predefinição)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index d274d55..61a136e 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Pressione o botão"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"baixo"</item>
     <item msgid="4212263919458209842">"crítico"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Desativado"</item>
-    <item msgid="5656544177755411222">"Interrupções limitadas"</item>
-    <item msgid="8735337502532332056">"Sem interrupções"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Moderado"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 88becfc..a8eb131 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Cartão SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Configurações de proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancelar"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"CANCELAR"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUAR"</string>
     <string name="okay" msgid="1997666393121016642">"Ok"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"SIM"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NÃO"</string>
-    <string name="forget" msgid="7267115980248732932">"ESQUECER"</string>
+    <string name="forget" msgid="1400428660472591263">"Ignorar"</string>
+    <string name="save" msgid="879993180139353333">"Salvar"</string>
+    <string name="done" msgid="6942539184162713160">"Concluída"</string>
     <string name="settings_label" msgid="1626402585530130914">"Configurações"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Configurar"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Atalho para as configurações"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Conecte seu carregador e tente novamente."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Não há PIN ou senha da tela de bloqueio"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"É necessário definir um PIN ou uma senha para a tela de bloqueio antes de iniciar a criptografia."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Você precisa desenhar o seu padrão de desbloqueio para confirmar a criptografia do dispositivo."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Criptografar?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"A operação de criptografia é irreversível e, se for interrompida, você perderá seus dados. A criptografia leva cerca de uma hora ou mais, e nesse período o tablet será reiniciado várias vezes."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"A operação de criptografia é irreversível e, se for interrompida, você perderá seus dados. A criptografia leva uma hora ou mais, e nesse período o telefone será reiniciado várias vezes."</string>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avançado"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth avançado"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Dispositivo pode se comunicar c/ Bluetooth ativado"</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"Para aumentar a precisão da localização, os Serviços do Google verificarão dispositivos Bluetooth, mesmo quando o Bluetooth estiver desativado. É possível alterar essas LINK_BEGINconfigurações de verificaçãoLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Para aumentar a precisão da localização, apps e serviços verificam dispositivos Bluetooth, mesmo quando o Bluetooth está desativado. Essa opção pode ser alterada nas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configurações de verificação<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Conectar-se a..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desconectado do áudio da mídia."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desconectado do áudio do viva-voz."</string>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"Para aumentar a precisão da localização, os Serviços do Google procurarão redes Wi‑Fi, mesmo quando o Wi‑Fi estiver desativado. É possível alterar essas LINK_BEGINconfigurações de verificaçãoLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Para melhorar a precisão da localização, apps e serviços verificam redes Wi‑Fi, mesmo quando o Wi‑Fi está desativado. É possível alterar essas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configurações de verificação<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Não mostrar novamente"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Manter Wi-Fi durante inatividade"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi ativ. durante suspensão"</string>
@@ -604,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Verificar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avançado"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Mostrar apps"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Mostrar força Wi-Fi"</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>
@@ -663,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Fazer login para conectar?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> requer login on-line antes de conectar à rede."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONECTAR"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Esta rede não tem acesso à Internet. Usar a rede assim mesmo?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Não perguntar novamente para esta rede"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Falha ao conectar à rede"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esquecer"</string>
@@ -734,12 +731,10 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi preferido"</item>
     <item msgid="5267397515594230396">"Celular preferido"</item>
-    <item msgid="3132912693346866895">"Somente Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Quando a chamada por Wi-Fi está ativada, seu smartphone pode enviar chamadas por redes Wi-Fi ou pela rede da sua operadora, dependendo da sua preferência e de qual sinal está mais forte. Antes de ativar esse recurso, verifique as taxas e outros detalhes com sua operadora."</string>
     <string name="home_settings" msgid="212375129455718176">"Início"</string>
@@ -913,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Disponível (somente leitura)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espaço total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calculando..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Dados de apps e conteúdo de mídia"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Apps e dados de apps"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Mídia"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Downloads"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Imagens, vídeos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Áudio (música, toques, podcasts)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Diversos"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Outros arquivos"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Dados em cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desconectar armaz. comp."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desmontar cartão SD"</string>
@@ -951,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desconexão em andamento"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Pouco espaço de armazenamento"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Algumas funções do sistema, como a sincronização, podem não funcionar corretamente. Tente liberar espaço excluindo ou desmarcando itens como apps ou conteúdo de mídia."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Renomear"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Ativar"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Ejetar"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Limpar e formatar"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Limpar e formatar como armazenamento interno"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Conexão USB do computador"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Conexão USB do computador"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Conectar-se como"</string>
@@ -961,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Permite que apps com MIDI ativado funcionem por meio de USB com o software MIDI no computador."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Outros usuários"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Armazenamento do dispositivo"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Armazenamento removível"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> livre(s). Total de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Ativação de <xliff:g id="NAME">%1$s</xliff:g> concluída"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Falha ao ativar <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> ejetado com segurança"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Não foi possível ejetar <xliff:g id="NAME">%1$s</xliff:g> com segurança"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"Formatação de <xliff:g id="NAME">%1$s</xliff:g> concluída"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Não foi possível concluir a formatação de <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Renomear armazenamento"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Após a formatação, você pode usar este <xliff:g id="NAME_0">^1</xliff:g> em outros dispositivos. \n\nTodos os dados deste <xliff:g id="NAME_1">^1</xliff:g> serão apagados. Faça backup primeiro. \n\n"<b>"Backup de fotos e outras mídias"</b>" \nMova seus arquivos de mídia para um local de armazenamento alternativo neste dispositivo ou transfira-os para um computador usando um cabo USB. \n\n"<b>"Backup de apps"</b>" \nTodos os apps armazenados neste <xliff:g id="NAME_6">^1</xliff:g> serão desinstalados, e os dados deles serão apagados. Para manter esses apps, mova-os para um local de armazenamento alternativo neste dispositivo."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Quando você ejetar este <xliff:g id="NAME_0">^1</xliff:g>, os apps armazenados nele deixarão de funcionar, e os arquivos de mídia não ficarão disponíveis até que ele seja inserido novamente."</b>" \n\nEste <xliff:g id="NAME_1">^1</xliff:g> é formatado para funcionar apenas neste dispositivo. Não funcionará em nenhum outro."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurar seu <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Usar como armazenamento portátil"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Para mover fotos e outras mídias entre dispositivos."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Usar como armazenamento interno"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Para armazenar qualquer coisa somente neste dispositivo, incluindo apps e fotos. Requer formatação, que o impede de funcionar com outros dispositivos."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatar como armazenamento interno"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"É necessário que <xliff:g id="NAME_0">^1</xliff:g> seja formatado para torná-lo seguro. \n\nDepois da formatação, este <xliff:g id="NAME_1">^1</xliff:g> funcionará somente neste dispositivo. \n\n"<b>"A formatação limpa todos os dados armazenados no <xliff:g id="NAME_2">^1</xliff:g>."</b>" Para evitar perder os dados, faça backup deles."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Limpar e formatar"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatando <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Não remova o <xliff:g id="NAME">^1</xliff:g> enquanto ele estiver sendo formatado."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Mover dados para novo armazenamento"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"É possível mover suas fotos, arquivos e dados de apps para este novo <xliff:g id="NAME">^1</xliff:g>. \n\nA transferência demora aproximadamente <xliff:g id="TIME">^2</xliff:g> e liberará <xliff:g id="SIZE">^3</xliff:g> no armazenamento interno. Alguns apps não funcionarão enquanto ela estiver em andamento."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Mover agora"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Mover mais tarde"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Mover dados agora"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"A transferência demora aproximadamente <xliff:g id="TIME">^1</xliff:g>. Ela liberará <xliff:g id="SIZE">^2</xliff:g> de armazenamento interno."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Mover"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Movendo dados..."</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Durante a transferência: \n• Não remova o <xliff:g id="NAME">^1</xliff:g>. \n• Alguns apps não funcionarão corretamente. \n• Mantenha o dispositivo carregado."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> está pronto"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Seu <xliff:g id="NAME">^1</xliff:g> está pronto para ser usado com fotos e outras mídias."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Seu novo <xliff:g id="NAME">^1</xliff:g> está funcionando. \n\nPara mover fotos, arquivos e dados de apps para este dispositivo, vá para \"Config.\" &gt; \"Armazenamento\"."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Mover <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"A transferência de <xliff:g id="APP">^1</xliff:g> e seus dados para <xliff:g id="NAME_0">^2</xliff:g> levará apenas alguns momentos. Você não conseguirá usar o app até que a transferência seja concluída. \n\nNão remova o <xliff:g id="NAME_1">^2</xliff:g> durante a transferência."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Movendo <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Não remova o <xliff:g id="NAME">^1</xliff:g> durante a transferência. \n\nO app <xliff:g id="APP">^2</xliff:g> deste dispositivo não ficará disponível até a conclusão da transferência."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancelar transferência"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Status da bateria"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nível da bateria"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1005,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Redefinir para o padrão"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Redefinição das configurações padrão do APN concluída."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Configurações de rede redefinidas"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Isso redefinirá todas as configurações relacionadas à rede para os padrões de originais, incluindo:\n\n"<li>"Wi-fi"</li>\n<li>"Dados móveis"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Isso redefinirá todas as configurações de rede, incluindo:\n\n"<li>"Wi‑Fi"</li>\n<li>"dados da rede celular"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Redefinir configurações"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Redefinir todas as configurações de rede? Não é possível reverter essa ação."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Redefinir todas as configurações de rede? Não é possível desfazer esta ação."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Redefinir configurações"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"É necessário que você desenhe seu padrão de desbloqueio para confirmar a redefinição das configurações de rede."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Redefinir?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Configurações de rede redefinidas"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"As configurações de rede foram redefinidas"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Redefinir dispositivo"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Configuração original"</string>
     <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>
@@ -1027,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Apagar todos os dados do cartão SD, como músicas e fotos"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Redefinir tablet"</string>
     <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_desc" msgid="1062841478823409667">"Limpar todas as suas informações pessoais e apps baixados por download? Não é possível desfazer esta ação."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Apagar tudo"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"A configuração original não está disponível para esse usuário"</string>
@@ -1046,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configurar correio voz, encaminhamento, espera etc."</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering USB"</string>
@@ -1079,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajuda"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Redes celulares"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plano de celular"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"App de SMS padrão"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"App de SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Alterar app de SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Usar o <xliff:g id="NEW_APP">%1$s</xliff:g> em vez do <xliff:g id="CURRENT_APP">%2$s</xliff:g> como app de SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Usar o <xliff:g id="NEW_APP">%s</xliff:g> como app de SMS?"</string>
@@ -1110,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Usar GPS para determinar local"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Verificação"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Verificação"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Verificação de Wi-Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Melhore a localização permitindo que os serviços do sistema verifiquem redes Wi-Fi, mesmo quando o Wi-Fi está desligado"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Verificação de Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Melhore a localização permitindo que os serviços do sistema verifiquem dispositivos Bluetooth, mesmo quando o Bluetooth está desligado"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Localiz. por Wi-Fi e rede cel."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que apps usem o serviço de localização do Google para determinar seu local mais rapidamente. Dados de localização anônimos serão coletados e enviados ao Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Localização determinada por Wi-Fi"</string>
@@ -1155,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"A senha foi definida"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"O PIN foi definido"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"O padrão foi definido"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Use o padrão do dispositivo para continuar."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Digite o PIN do dispositivo para continuar."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Digite a senha do dispositivo para continuar."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN incorreto"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Senha incorreta"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Padrão incorreto"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Segurança do dispositivo"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Mudar padrão de desbloqueio"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Mudar PIN de desbloqueio"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmar padrão salvo"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Tente novamente:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Desenhe um padrão de desbloqueio"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pressione Menu para obter ajuda."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Levante o dedo ao terminar"</string>
@@ -1181,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Padrão de desbloqueio"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Alterar padrão"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Como desenhar um padrão de desbloqueio"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Muitas tentativas incorretas!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Tente novamente em <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Excesso de tentativas incorretas. Tente novamente em <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"O app não está instalado no telefone."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gerenciar apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gerenciar e remover apps instalados"</string>
@@ -1233,7 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Classificar por tamanho"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Mostrar serviços em exec."</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Mostrar processo em cache"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"App de emergência padrão"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"App de emergência"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Redefinir preferências"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Redefinir preferências?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Isso redefinirá todas as preferências para: \n \n "<li>"apps desabilitados "</li>" \n "<li>" notificações de apps desabilitados "</li>" \n "<li>" apps padrão para ações "</li>" \n "<li>" restrições de dados em plano de fundo para apps "</li>" \n "<li>" quaisquer restrições de permissão "</li>" \n \n Você não perderá dados de apps."</string>
@@ -1437,8 +1479,6 @@
     <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="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="select_logd_size_title" msgid="7433137108348553508">"Tamanhos de buffer de logger"</string>
@@ -1739,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 horas"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dia"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Mostrar sistema"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Ocultar sistema"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Usar Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipo de estatísticas"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Segundo plano"</string>
@@ -1835,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Senha atual:"</string>
@@ -2210,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Usuário"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil restrito"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Adicionar novo usuário?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Você pode compartilhar este dispositivo com outras pessoas por meio da criação de usuários adicionais. Cada usuário tem seu próprio espaço, o qual pode ser personalizado com os próprios apps, plano de fundo, etc. Os usuários também podem ajustar as configurações do dispositivo, como Wi-Fi, que afetam a todos.\n\nQuando você adiciona um novo usuário, essa pessoa precisa configurar o próprio espaço.\n\nQualquer usuário pode atualizar apps para os demais usuários."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"É possível compartilhar esse dispositivo com outras pessoas criando usuários adicionais. Cada usuário tem seu próprio espaço, que pode ser personalizado com apps, planos de fundo etc. Os usuários também podem ajustar as configurações do dispositivo, como Wi‑Fi, que afetam a todos.\n\nQuando você adiciona um novo usuário, essa pessoa precisa configurar o próprio espaço.\n\nQualquer usuário pode atualizar apps para os demais usuários."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Quando você adiciona um novo usuário, essa pessoa precisa configurar o próprio espaço.\n\nQualquer usuário pode atualizar apps para os demais usuários."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurar o usuário agora?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Certifique-se de que a pessoa está disponível para assumir o dispositivo e configurar seu espaço"</string>
@@ -2390,9 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"restrição restringir restrito"</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_reset_apps" msgid="6420313678620788457">"redefinir preferências padrão"</string>
-    <string name="keywords_emergency_app" msgid="6542122071127391103">"app padrão para casos de emergência"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"app ICE padrão para casos de emergência"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"apps download aplicativos sistema"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"segurança das permissões de apps"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"apps padrão"</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>
@@ -2407,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume do alarme"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume do toque"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume das notificações"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Bloquear interrupções"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioridade: só permite"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Regras automáticas"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Ao receber chamadas e 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_alarms" msgid="7380265858042606857">"Permitir apenas alarmes"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Não interromper"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Somente prioridade"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Somente alarmes"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Sem interrupções"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Toque do telefone"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Toque de notificação padrão"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Também vibrar para chamadas"</string>
@@ -2447,15 +2486,6 @@
     <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> poderá ler todas as notificações postadas pelo sistema ou por qualquer app instalado, que poderão incluir informações pessoais como nomes de contatos e textos de mensagens enviadas para você. Também poderá dispensar essas notificações ou tocar em botões de ação incluídos nelas."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Fornecedores de condições"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nenhum app fornece condições"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="one">%d apps fornecem condições</item>
-      <item quantity="other">%d apps fornecem condições</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nenhum fornecedor de condições instalado."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Ativar <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> poderá adicionar condições de saída ao modo Não perturbe."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Carregando apps…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear tudo"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nunca mostrar notificações deste app"</string>
@@ -2469,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioridade"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Confidenciais"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Nome da regra"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Adicionar regras"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Excluir regra"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Excluir a regra \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Excluir"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Tipo de regra"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Desconhecido"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configurar regra"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Programar regra"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Regra não encontrada."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dias"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Nenhum"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Todos os dias"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nunca"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> a <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2489,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Lembretes"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Autores de chamadas selecionados"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Autores de chamadas repetidas"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Permitir que a mesma pessoa ligue uma segunda vez em um período de <xliff:g id="MINUTES">%d</xliff:g> minutos"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Ativação automática"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nunca"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Todas as noites"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do dia seguinte"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Quando você gostaria de ser interrompido?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Por quanto tempo?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Indefinidamente"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> minutos</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutos</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> horas</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> horas</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Alterar para \"Somente notificações prioritárias\" indefinidamente"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Alterar para \"Somente notificações prioritárias\" por <xliff:g id="DURATION">%1$d</xliff:g> minutos até <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Alterar para \"Somente notificações prioritárias\" por <xliff:g id="DURATION">%1$d</xliff:g> minutos até <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Alterar para \"Somente notificações prioritárias\" por <xliff:g id="DURATION">%1$d</xliff:g> horas (até <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Alterar para \"Somente notificações prioritárias\" por <xliff:g id="DURATION">%1$d</xliff:g> horas (até <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Alterar para \"Somente alarmes\" indefinidamente"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">Alterar para \"Somente alarmes\" por <xliff:g id="DURATION">%1$d</xliff:g> minutos (até <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Alterar para \"Somente alarmes\" por <xliff:g id="DURATION">%1$d</xliff:g> minutos (até <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="one">Alterar para \"Somente alarmes\" por <xliff:g id="DURATION">%1$d</xliff:g> horas, até <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Alterar para \"Somente alarmes\" por <xliff:g id="DURATION">%1$d</xliff:g> horas, até <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Alterar para \"Não interromper\" indefinidamente"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Alterar para \"Não interromper\" por <xliff:g id="DURATION">%1$d</xliff:g> minutos (até <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Alterar para \"Não interromper\" por <xliff:g id="DURATION">%1$d</xliff:g> minutos (até <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Alterar para \"Não interromper\" por <xliff:g id="DURATION">%1$d</xliff:g> horas, até <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Alterar para \"Não interromper\" por <xliff:g id="DURATION">%1$d</xliff:g> horas, até <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Alterar para \"Sempre interromper\""</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"sempre"</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>
@@ -2562,7 +2659,10 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> permissões concedidas</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> permissões concedidas</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> de <xliff:g id="COUNT_3">%d</xliff:g> permissões concedidas</item>
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> de <xliff:g id="COUNT_3">%d</xliff:g> permissões concedidas</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Alguns padrões definidos"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Nenhum padrão definido"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Todos os apps"</string>
@@ -2573,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritárias"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Confidenciais"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Com URLs de domínio"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Redefinir preferências em todos os apps para o padrão"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> apps instalados, incluindo o sistema e apps baixados"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Desativado pelo administrador"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avançadas"</string>
     <string name="unknown_app" msgid="5275921288718717656">"App desconhecido"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Escolher perfil"</string>
@@ -2589,4 +2688,11 @@
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> apps podem abrir os respectivos URLs de domínio</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps podem abrir os respectivos URLs de domínio</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Não reconhecido"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Apps padrão"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"App de navegador"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Nenhum navegador padrão"</string>
+    <string name="default_app" msgid="6864503001385843060">"Padrão"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index b936b05..ce0ff4b 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Buton WPS"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"Media"</item>
     <item msgid="7924928667052300589">"Dispozitiv"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"locație imprecisă"</item>
+    <item msgid="5789673140227507995">"locație exactă"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibrează"</item>
+    <item msgid="3434165993711230924">"citește agenda"</item>
+    <item msgid="616161687718081936">"modifică agenda"</item>
+    <item msgid="7638002295329050091">"citește jurnalul de apeluri"</item>
+    <item msgid="6546959730920410907">"modifică jurnalul de apeluri"</item>
+    <item msgid="446877710771379667">"citește calendarul"</item>
+    <item msgid="7674458294386319722">"modifică calendarul"</item>
+    <item msgid="8281201165558093009">"scanează Wi-Fi"</item>
+    <item msgid="8694611243479480497">"notificare"</item>
+    <item msgid="7776439107987345446">"scanează semnal mobil"</item>
+    <item msgid="514615766544675057">"apelează un telefon"</item>
+    <item msgid="8181415497109310680">"citește mesaje SMS"</item>
+    <item msgid="6816551144382117307">"scrie mesaje SMS"</item>
+    <item msgid="4600463921908905030">"primește mesaje SMS"</item>
+    <item msgid="5958926493289432745">"primește mesaje SMS de urgență"</item>
+    <item msgid="4945269495221089540">"primește mesaje MMS"</item>
+    <item msgid="5570472453573929087">"primește mesaje WAP push"</item>
+    <item msgid="7125408150230860501">"trimite mesaje SMS"</item>
+    <item msgid="7080337936612188061">"citește mesaje ICC SMS"</item>
+    <item msgid="587124103118495063">"scrie mesaje ICC SMS"</item>
+    <item msgid="2320577158869025503">"modifică setările"</item>
+    <item msgid="1545733463471924009">"desenează deasupra"</item>
+    <item msgid="3609046903962454582">"accesează notificări"</item>
+    <item msgid="4671646036128214513">"cameră foto"</item>
+    <item msgid="1097324338692486211">"înregistrează conținut audio"</item>
+    <item msgid="5031552983987798163">"redă conținut audio"</item>
+    <item msgid="8374996688066472414">"citește clipboardul"</item>
+    <item msgid="3045529469061083747">"modifică clipboardul"</item>
+    <item msgid="5124443975763747838">"butoane media"</item>
+    <item msgid="4547883971364273343">"focalizare audio"</item>
+    <item msgid="2603878814882344450">"volum principal"</item>
+    <item msgid="7136963238377062018">"volum voce"</item>
+    <item msgid="4270236897655923007">"volum sonerie"</item>
+    <item msgid="6325739889222559394">"volum media"</item>
+    <item msgid="5762123934816216821">"volum alarmă"</item>
+    <item msgid="785049718065337473">"volum notificări"</item>
+    <item msgid="6700305533746877052">"volumul Bluetooth"</item>
+    <item msgid="2029227495214047094">"mențineți activ"</item>
+    <item msgid="26109888160231211">"monitorizarea locației"</item>
+    <item msgid="5753382310468855812">"monitorizarea localizării cu consum ridicat de energie"</item>
+    <item msgid="3356591542543137332">"obțineți statistici de utilizare"</item>
+    <item msgid="3073734345226842233">"activați/dezactivați microfonul"</item>
+    <item msgid="1148142988678569310">"proiectați conținutul media"</item>
+    <item msgid="9130014005474445273">"activați serviciul VPN"</item>
+    <item msgid="1165192162975045562">"scrie imaginea de fundal"</item>
+    <item msgid="7129487923652967258">"structură de asistență"</item>
+    <item msgid="1069023208100114540">"captură de ecran de asistență"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Locație"</item>
+    <item msgid="8677040780775113033">"Locație"</item>
+    <item msgid="1660743989948992916">"Locație"</item>
+    <item msgid="8791172739860195290">"Vibrează"</item>
+    <item msgid="383413555642128046">"Citește agenda"</item>
+    <item msgid="3654594895269697313">"Modifică agenda"</item>
+    <item msgid="7928393476362362538">"Citește jurnalul de apeluri"</item>
+    <item msgid="6248591205254641116">"Modifică jurnalul de apeluri"</item>
+    <item msgid="6093344633066170692">"Citește calendarul"</item>
+    <item msgid="1334886368750347692">"Modifică calendarul"</item>
+    <item msgid="1638204101698708656">"Locație"</item>
+    <item msgid="2154671955760380322">"Postează o notificare"</item>
+    <item msgid="4282477730595931828">"Locație"</item>
+    <item msgid="4891423912898525905">"Apelează un telefon"</item>
+    <item msgid="2623604824935968113">"Citiți mesaje SMS/MMS"</item>
+    <item msgid="4420177125221176306">"Scrieți mesaje SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Primește mesaje SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Primește mesaje SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Primește mesaje SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Primește mesaje SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Trimite mesaje SMS/MMS"</item>
+    <item msgid="3527273606643794973">"Citiți mesaje SMS/MMS"</item>
+    <item msgid="4370895547001583812">"Scrieți mesaje SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Modifică setările"</item>
+    <item msgid="736541391767350377">"Desenează deasupra"</item>
+    <item msgid="5530815681721654194">"Accesează notificări"</item>
+    <item msgid="781213371706962767">"Cameră foto"</item>
+    <item msgid="1720492593061838172">"Înregistrează conținut audio"</item>
+    <item msgid="3493046322001257041">"Redă conținut audio"</item>
+    <item msgid="136815868796597058">"Citește clipboardul"</item>
+    <item msgid="5238692940326972503">"Modifică clipboardul"</item>
+    <item msgid="5753789168376302997">"Butoane media"</item>
+    <item msgid="3265262911688671938">"Focalizare audio"</item>
+    <item msgid="2098976479485046797">"Volum principal"</item>
+    <item msgid="5660213838861789350">"Volum voce"</item>
+    <item msgid="7983336752371254444">"Volum sonerie"</item>
+    <item msgid="7878027809189330917">"Volum media"</item>
+    <item msgid="7260546305036218513">"Volum alarmă"</item>
+    <item msgid="9103719301075748925">"Volum notificări"</item>
+    <item msgid="7025966722295861512">"Volum Bluetooth"</item>
+    <item msgid="4665183401128289653">"Păstrare în activitate"</item>
+    <item msgid="8584357129746649222">"Locație"</item>
+    <item msgid="7669257279311110599">"Locație"</item>
+    <item msgid="3459320345690097795">"Obțineți statistici de utilizare"</item>
+    <item msgid="1312534577834048535">"Activați/dezactivați microfonul"</item>
+    <item msgid="5906017727368097853">"Proiectați conținutul media"</item>
+    <item msgid="2486614710846178542">"Activați serviciul VPN"</item>
+    <item msgid="5586547561693629602">"Scrie imaginea de fundal"</item>
+    <item msgid="32794179825485062">"Structură de asistență"</item>
+    <item msgid="7872852746938272552">"Captură de ecran de asistență"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Scurtă"</item>
     <item msgid="2560532955514699713">"Medie"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"redusă"</item>
     <item msgid="4212263919458209842">"critică"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Dezactivat"</item>
-    <item msgid="5656544177755411222">"Întreruperi limitate"</item>
-    <item msgid="8735337502532332056">"Zero întreruperi"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normală"</item>
     <item msgid="866544120205026771">"Moderată"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index a9965fe..4718868 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -269,12 +269,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Card SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Setări proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Anulați"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ANULAȚI"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUAȚI"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"DA"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NU"</string>
-    <string name="forget" msgid="7267115980248732932">"ELIMINĂ"</string>
+    <string name="forget" msgid="1400428660472591263">"Ștergeți"</string>
+    <string name="save" msgid="879993180139353333">"Salvați"</string>
+    <string name="done" msgid="6942539184162713160">"Terminat"</string>
     <string name="settings_label" msgid="1626402585530130914">"Setări"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Setări"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Comandă rapidă pentru setări"</string>
@@ -376,7 +374,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Conectaţi încărcătorul și încercaţi din nou."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nu există un cod PIN sau o parolă pentru blocarea ecranului"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Trebuie să setaţi un cod PIN sau o parolă pentru blocarea ecranului înainte de a începe criptarea."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Trebuie să desenați modelul de deblocare pentru a confirma criptarea dispozitivului."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Criptaţi?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Operaţia de criptare este ireversibilă și întreruperea ei va duce la pierderea datelor. Criptarea durează cel puţin o oră, timp în care tableta se va reporni de mai multe ori."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Operaţia de criptare este ireversibilă și întreruperea ei va duce la pierderea datelor. Criptarea durează cel puţin o oră, timp în care telefonul se va reporni de mai multe ori."</string>
@@ -421,8 +418,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Model"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Parolă"</string>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"După ce ați configurat o blocare a ecranului, puteți să configurați amprenta din Setări &gt; Securitate."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Activaţi blocarea ecranului"</string>
     <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>
@@ -530,8 +526,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avansate"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Setări Bluetooth avansate"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Activarea Bluetooth permite comunicarea cu alte dispozitive Bluetooth din apropiere."</string>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Pentru a îmbunătăți precizia locației, aplicațiile și serviciile vor căuta dispozitive Bluetooth, chiar și atunci când conexiunea Bluetooth este dezactivată. Puteți să schimbați acest aspect din <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>setările de scanare<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Conectaţi-vă la..."</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 mâini libere."</string>
@@ -597,8 +592,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Pentru a îmbunătăți precizia locației, aplicațiile și serviciile vor căuta rețele Wi‑Fi, chiar și atunci când conexiunea Wi-Fi este dezactivată. Puteți să schimbați acest aspect din <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>setările de scanare<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Nu mai afișa"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Mențineți Wi-Fi activat în modul inactiv"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi pornit în modul inactiv"</string>
@@ -615,8 +609,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scanaţi"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avansate"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Afișați aplicații"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Afișați semnal Wi-Fi"</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>
@@ -674,6 +666,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Intrați în cont pentru a vă conecta?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> vă solicită conectarea la cont înainte de a vă conecta la rețea."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONECTAȚI"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Rețeaua nu are acces la internet. Folosiți această rețea oricum?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Nu mai întreba pentru această rețea"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectaţi-vă"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nu s-a putut stabili conexiunea la reţea"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Eliminaţi"</string>
@@ -740,21 +734,17 @@
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Hotspot Wi-Fi portabil <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="wifi_calling_settings_title" msgid="4102921303993404577">"Apelare prin Wi-Fi"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Preferință pentru apelare"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Modul Apelare prin Wi-Fi"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Se preferă conexiunea Wi-Fi"</item>
     <item msgid="5267397515594230396">"Se preferă conexiunea mobilă"</item>
-    <item msgid="3132912693346866895">"Numai Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Când Apelarea prin Wi-Fi este activată, puteți să direcționați apelurile prin rețele Wi-Fi sau prin rețeaua operatorului, în funcție de preferință și de intensitatea mai mare a semnalului. Înainte de a activa această funcție, consultați-vă operatorul în privința taxelor și a altor detalii."</string>
     <string name="home_settings" msgid="212375129455718176">"Ecran de pornire"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Afișaj"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sunet"</string>
@@ -927,12 +917,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Disponibil (numai în citire)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Spaţiu total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Se calculează..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplicații (date și conținut media)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Aplicațiile și datele aplicațiilor"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Descărcări"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Imagini, videoclipuri"</string>
     <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_misc_usage" msgid="6094866738586451683">"Alte fișiere"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Datele memorate în cache"</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>
@@ -965,6 +955,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Demontare în curs"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Spaţiu de stocare aproape ocupat"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Este posibil ca unele funcţii de sistem, cum ar fi sincronizarea, să nu funcţioneze corect. Încercaţi să eliberaţi spaţiu, ştergând elemente sau anulând fixarea acestora (de ex., aplicații sau conţinut media)."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Redenumiți"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Montați"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Scoateți"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Ștergeți și formatați"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Ștergeți și formatați ca memorie internă"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Conectare la computer prin USB"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Conectare la computer prin USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Conectaţi-vă ca"</string>
@@ -975,6 +970,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Permite aplicațiilor compatibile cu standardul MIDI să funcționeze prin USB cu software-ul MIDI de pe computer."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Alţi utilizatori"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Stocare dispozitiv"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Stocare amovibilă"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> liberi (în total <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> este montată"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g> nu a putut fi montată"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> este scoasă în siguranță"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g> nu a putut fi scoasă în siguranță"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> este formatată"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> nu a putut fi formatată"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Redenumiți stocarea"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"După formatare, puteți folosi <xliff:g id="NAME_0">^1</xliff:g> în alte dispozitive. \n\nToate datele de pe <xliff:g id="NAME_1">^1</xliff:g> vor fi șterse. Mai întâi, faceți backup. \n\n"<b>"Faceți backup la fotografii și la alte fișiere media"</b>" \nMutați fișierele media în altă stocare de pe acest dispozitiv sau transferați-le pe un computer folosind un cablu USB. \n\n"<b>"Faceți backup la aplicații"</b>" \nToate aplicațiile stocate pe <xliff:g id="NAME_6">^1</xliff:g> vor fi dezinstalate, iar datele acestora vor fi șterse. Pentru a păstra aceste aplicații, mutați-le în altă stocare de pe acest dispozitiv."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Când scoateți <xliff:g id="NAME_0">^1</xliff:g>, aplicațiile stocate pe acesta nu vor mai funcționa, iar fișierele media stocate pe acesta nu vor mai fi disponibile până când nu este introdus din nou."</b>" \n\n Acest <xliff:g id="NAME_1">^1</xliff:g> este formatat pentru a funcționa numai pe acest dispozitiv. Nu va funcționa pe alte dispozitive."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurați <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Folosiți ca stocare portabilă"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Pentru a muta fotografiile și alte fișiere media de pe un dispozitiv pe altul."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Folosiți ca memorie internă"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Pentru a stoca orice doar pe acest dispozitiv, inclusiv aplicații și fotografii. Este necesar să îl formatați pentru a-l împiedica să funcționeze cu alte dispozitive."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatați ca memorie internă"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Este necesar ca <xliff:g id="NAME_0">^1</xliff:g> să fie formatat pentru a fi securizat. \n\nDupă formatare, acest <xliff:g id="NAME_1">^1</xliff:g> va funcționa doar în acest dispozitiv. \n\n"<b>"Dacă îl formatați, toate datele stocate pe <xliff:g id="NAME_2">^1</xliff:g> vor fi șterse."</b>" Pentru a nu pierde datele, faceți backup."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Ștergeți și formatați"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Se formatează <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Nu scoateți <xliff:g id="NAME">^1</xliff:g> în timp ce se formatează."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Mutați datele în noua stocare"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Puteți muta fotografiile, fișierele și datele aplicațiilor pe acest nou <xliff:g id="NAME">^1</xliff:g>. \n\nAceastă acțiune va dura aproximativ <xliff:g id="TIME">^2</xliff:g> și va elibera <xliff:g id="SIZE">^3</xliff:g> din memoria internă. Unele aplicații nu vor funcționa în timpul procesului de mutare."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Mutați acum"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Mutați mai târziu"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Mutați datele acum"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Această acțiune va dura aproximativ <xliff:g id="TIME">^1</xliff:g>. Va elibera <xliff:g id="SIZE">^2</xliff:g> din memoria internă."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Mutați"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Se mută datele..."</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"În timpul procesului de mutare: \n• nu scoateți <xliff:g id="NAME">^1</xliff:g>; \n• unele aplicații nu vor funcționa corect; \n• păstrați dispozitivul încărcat."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> este gata"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> este gata pentru a se folosi cu fotografii și alte fișiere media."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Noul <xliff:g id="NAME">^1</xliff:g> funcționează. \n\nPentru a muta fotografii, fișiere și datele aplicațiilor pe acest dispozitiv, accesați Setări &gt; Stocare."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Mutați <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Va dura doar câteva momente să mutați <xliff:g id="APP">^1</xliff:g> și datele acesteia pe <xliff:g id="NAME_0">^2</xliff:g>. Nu veți putea folosi aplicația până când mutarea nu este finalizată. \n\nNu scoateți <xliff:g id="NAME_1">^2</xliff:g> în timpul procesului de mutare."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Se mută <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Nu scoateți <xliff:g id="NAME">^1</xliff:g> în timpul procesului de mutare. \n\nAplicația <xliff:g id="APP">^2</xliff:g> de pe acest dispozitiv nu va fi disponibilă până când mutarea nu este finalizată."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Anulați mutarea"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Stare baterie"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivelul bateriei"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Nume APN"</string>
@@ -1019,13 +1053,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Resetaţi la valorile prestabilite"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Resetarea setărilor APN prestabilite a fost finalizată."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Resetarea setărilor de rețea"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Astfel, toate setările legate de conectarea la rețele vor reveni la valorile prestabilite din fabrică, inclusiv:\n\n"<li>"Wi-Fi"</li>\n<li>"Date mobile"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Astfel, toate setările pentru rețea vor fi reinițializate, inclusiv:\n\n"<li>"Wi‑Fi"</li>\n<li>"Date mobile"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Resetați setările"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Resetați toate setările de rețea? Această acțiune este ireversibilă!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Reinițializați toate setările pentru rețea? Nu puteți anula această acțiune!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Resetați setările"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Pentru a confirma resetarea setărilor de rețea trebuie să desenați modelul de deblocare."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Resetați?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Resetarea setărilor de rețea"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Setările pentru rețea au fost reinițializate"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Resetați dispozitivul"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Resetarea configurării din fabrică"</string>
     <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>
@@ -1041,9 +1074,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Ștergeţi toate datele de pe cardul SD, cum ar fi muzica sau fotografiile"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Resetaţi tableta"</string>
     <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_desc" msgid="1062841478823409667">"Ștergeți toate datele 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_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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Revenirea la setările din fabrică nu este disponibilă pentru acest utilizator"</string>
@@ -1060,8 +1092,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Activaţi mesageria vocală, redirecţionarea apelurilor, apelul în aşteptare, ID apelant"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering prin USB"</string>
@@ -1093,7 +1123,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajutor"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Rețele mobile"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plan de date mobile"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Aplicație SMS prestabilită"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplicația SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Schimbați aplicația SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Utilizați <xliff:g id="NEW_APP">%1$s</xliff:g> în loc de <xliff:g id="CURRENT_APP">%2$s</xliff:g> ca aplicație SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Utilizați <xliff:g id="NEW_APP">%s</xliff:g> ca aplicație SMS?"</string>
@@ -1124,6 +1154,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Folosiți GPS-ul pentru a stabili locația"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Scanare"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Scanare"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Căutare rețele Wi-Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Îmbunătățiți localizarea permițând aplicațiilor și serviciilor să caute rețele Wi-Fi, chiar și atunci când conexiunea Wi‑Fi este dezactivată"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Căutare dispozitive Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Îmbunătățiți localizarea permițând serviciilor de sistem să caute dispozitive Bluetooth, chiar și atunci când conexiunea Bluetooth este dezactivată"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Localizare prin Wi-Fi și mobil"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Aplicaţiile estimează mai rapid locaţia cu serviciul de localizare Google. Se colectează/trimit la Google date anonime de localizare."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Locație stabilită prin Wi-Fi"</string>
@@ -1169,11 +1203,15 @@
     <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>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Pentru a continua, folosiți modelul dispozitivului."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Pentru a continua, introduceți codul PIN al dispozitivului."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Pentru a continua, introduceți parola dispozitivului."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Cod PIN greșit"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Parolă greșită"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Model greșit"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Securitatea dispozitivului"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Schimbaţi modelul pentru deblocare"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Schimbaţi codul PIN de deblocare"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmaţi modelul salvat"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Încercaţi din nou:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Desenaţi un model pentru deblocare"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Apăsaţi pe Meniu pentru ajutor."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Ridicaţi degetul când aţi terminat"</string>
@@ -1195,8 +1233,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Setaţi modelul pentru deblocare"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Schimbaţi modelul pentru deblocare"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Modul de desenare a unui model de deblocare"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Prea multe încercări incorecte!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Încercaţi din nou peste <xliff:g id="NUMBER">%d</xliff:g> (de) secunde."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Prea multe încercări incorecte. Încercați din nou peste <xliff:g id="NUMBER">%d</xliff:g> (de) secunde."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Aplicaţia nu este instalată pe telefonul dvs."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gestionaţi aplicații"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestionaţi și eliminaţi aplicațiile instalate"</string>
@@ -1247,8 +1284,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sortaţi după dimensiune"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Serviciile care rulează"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Procese memorie cache"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Aplicația de urgență"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Resetați preferințe aplicații"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Resetați preferințele pentru aplicații?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Aceasta va reseta toate preferințele pentru:\n\n "<li>"aplicații dezactivate;"</li>\n" "<li>"notificări de aplicații dezactivate;"</li>\n" "<li>"aplicații prestabilite pentru acțiuni;"</li>\n" "<li>"restricții privind datele de fundal pentru aplicații;"</li>\n" "<li>"orice restricții de permisiuni."</li>\n\n" Nu veți pierde datele aplicațiilor."</string>
@@ -1453,8 +1489,6 @@
     <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="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="select_logd_size_title" msgid="7433137108348553508">"Dimensiunile tamponului Logger"</string>
@@ -1755,6 +1789,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 ore"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"O zi"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Afișați sistemul"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Ascunde procesele de sistem"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Utilizați Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipul de statistici"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"În fundal"</string>
@@ -1851,7 +1886,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Parola actuală:"</string>
@@ -2226,7 +2260,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Utilizator"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil limitat"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Adăugați utilizator nou?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Puteți să permiteți accesul la acest dispozitiv altor persoane creând utilizatori suplimentari. Fiecare utilizator are propriul spațiu, pe care îl poate personaliza cu propriile aplicații, imagini de fundal etc. De asemenea, utilizatorii pot ajusta setările tabletei, cum ar fi setările pentru Wi-Fi, care afectează pe toți ceilalți utilizatori.\n\nDupă ce creați un utilizator nou, acesta trebuie să-și configureze spațiul.\n\nOrice utilizator poate actualiza aplicațiile pentru toți ceilalți utilizatori."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Puteți să permiteți accesul la acest dispozitiv altor persoane creând utilizatori suplimentari. Fiecare utilizator are propriul spațiu, pe care îl poate personaliza cu aplicații, imagini de fundal etc. De asemenea, utilizatorii pot ajusta setările dispozitivului, cum ar fi setările pentru Wi-Fi, care îi afectează pe toți ceilalți utilizatori.\n\nDupă ce creați un utilizator nou, acesta trebuie să-și configureze spațiul.\n\nOricare dintre utilizatori poate actualiza aplicațiile pentru toți ceilalți utilizatori."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Când adăugați un utilizator nou, acesta trebuie să-și configureze spațiul.\n\nOrice utilizator poate actualiza aplicațiile pentru toți ceilalți utilizatori."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configuraţi utilizatorul acum?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Asigurați-vă că utilizatorul are posibilitatea de a prelua dispozitivul și de a-și configura spațiul"</string>
@@ -2406,10 +2440,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"restricție restricționa restricționat"</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_reset_apps" msgid="6420313678620788457">"resetați preferințe valori prestabilite"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"urgență aplicație prestabilită"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"aplicații descărcați sistem"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"aplicații permisiuni securitate"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"aplicații prestabilite"</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>
@@ -2424,14 +2458,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volum alarmă"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volum sonerie"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volumul notificărilor"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Blocați întreruperile"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"„Numai cu prioritate” permite"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Reguli automate"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"La primirea apelurilor și 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_alarms" msgid="7380265858042606857">"Permiteți numai alarmele"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Nu întrerupeți"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Numai cu prioritate"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Numai alarme"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Fără întreruperi"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ton de apel al telefonului"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Ton de sonerie implicit pentru notificări"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrații și pentru apeluri"</string>
@@ -2465,16 +2497,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Nu sunt instalate aplicații de citire a notificărilor."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Activați <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> va putea să citească toate notificările postate de sistem sau de aplicațiile instalate, care ar putea include informații personale, cum ar fi numele persoanelor de contact și textul mesajelor care vă sunt trimise. De asemenea, va putea să închidă aceste notificări sau să atingă butoanele de acțiuni din cadrul acestora."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Furnizori de condiții"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nicio aplicație nu furnizează condiții"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="few">%d aplicații oferă condiții</item>
-      <item quantity="other">%d de aplicații oferă condiții</item>
-      <item quantity="one">%d aplicație oferă condiții</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nu sunt instalați furnizori de condiții."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Activați <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> va putea să adauge condiții de ieșire la modul Nu deranja."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Se încarcă aplicațiile..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blocați-le pe toate"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nu afișați notificări de la această aplicație"</string>
@@ -2488,17 +2510,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritate"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Confidențial"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Numele regulii"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Adăugați o regulă"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Ștergeți regula"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Ștergeți regula „<xliff:g id="RULE">%1$s</xliff:g>”?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Ștergeți"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Tipul de regulă"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Necunoscut"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configurați regula"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Regulă privind programul"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Regula nu a fost găsită."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Zile"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Niciuna"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"În fiecare zi"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Niciodată"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"Între <xliff:g id="START">%1$s</xliff:g> și <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2508,15 +2536,84 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarme"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Mementouri"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Evenimente"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Apelanți selectați"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Apelanți care revin"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Dacă aceeași persoană apelează a doua oară într-un interval de <xliff:g id="MINUTES">%d</xliff:g> (de) minute, permite apelul"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activați automat"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Niciodată"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"În fiecare seară"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"La <xliff:g id="FORMATTED_TIME">%s</xliff:g> a doua zi"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Când doriți să fiți întrerupt(ă)?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Pentru cât timp?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Nedefinită"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> de minute</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minut</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> ore</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> de ore</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> oră</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Schimbați la „Numai notificări cu prioritate” pe o perioadă nedefinită"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="few">Schimbați la „Numai notificări cu prioritate” pentru <xliff:g id="DURATION">%1$d</xliff:g> minute, până la <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Schimbați la „Numai notificări cu prioritate” pentru <xliff:g id="DURATION">%1$d</xliff:g> de minute, până la <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Schimbați la „Numai notificări cu prioritate” pentru un minut, până la <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="few">Schimbați la „Numai notificări cu prioritate” pentru <xliff:g id="DURATION">%1$d</xliff:g> ore (până la <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Schimbați la „Numai notificări cu prioritate” pentru <xliff:g id="DURATION">%1$d</xliff:g> de ore (până la <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Schimbați la „Numai notificări cu prioritate” pentru o oră, până la <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Schimbați la „Numai alarme” pe o perioadă nedefinită"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="few">Schimbați la „Numai alarme” pentru <xliff:g id="DURATION">%1$d</xliff:g> minute (până la <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Schimbați la „Numai alarme” pentru <xliff:g id="DURATION">%1$d</xliff:g> de minute (până la <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Schimbați la „Numai alarme” pentru un minut, până la <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="few">Schimbați la „Numai alarme” pentru <xliff:g id="DURATION">%1$d</xliff:g> ore, până la <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Schimbați la „Numai alarme” pentru <xliff:g id="DURATION">%1$d</xliff:g> de ore, până la <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Schimbați la „Numai alarme” pentru o oră, până la <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Schimbați la „Nu întrerupe” pe o perioadă nedefinită"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="few">Schimbați la „Nu întrerupe” pentru <xliff:g id="DURATION">%1$d</xliff:g> minute (până la <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Schimbați la „Nu întrerupe” pentru <xliff:g id="DURATION">%1$d</xliff:g> de minute (până la <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Schimbați la „Nu întrerupe” pentru un minut, până la <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="few">Schimbați la „Nu întrerupe” pentru <xliff:g id="DURATION">%1$d</xliff:g> ore, până la <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Schimbați la „Nu întrerupe” pentru <xliff:g id="DURATION">%1$d</xliff:g> de ore, până la <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Schimbați la „Nu întrerupe” pentru o oră, până la <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Schimbați la „Întrerupe întotdeauna”"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"întotdeauna"</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>
@@ -2582,7 +2679,11 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> de permisiuni acordate</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> permisiune acordată</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="few"><xliff:g id="COUNT_2">%d</xliff:g> din <xliff:g id="COUNT_3">%d</xliff:g> permisiuni acordate</item>
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> din <xliff:g id="COUNT_3">%d</xliff:g> de permisiuni acordate</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> din <xliff:g id="COUNT_1">%d</xliff:g> permisiune acordată</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Unele valori prestabilite sunt configurate"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Nu este configurată nicio valoare prestabilită"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Toate aplicațiile"</string>
@@ -2593,8 +2694,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritare"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Confidențiale"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Cu adrese URL de domeniu"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Resetați preferințele pentru toate aplicațiile la valorile prestabilite"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> (de) aplicații instalate, inclusiv aplicațiile de sistem și descărcate"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Setare dezactivată de administrator"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avansate"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicație necunoscută"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Alegeți un profil"</string>
@@ -2610,4 +2710,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> de aplicații își pot deschide adresele URL de domeniu</item>
       <item quantity="one">O aplicație își poate deschide adresele URL de domeniu</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Nu este recunoscută"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Aplicații prestabilite"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Aplicația de navigare"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Niciun browser prestabilit"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Prestabilită)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 299c80d..9f73043 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Push-кнопка"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"низкий"</item>
     <item msgid="4212263919458209842">"очень низкий"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"ВЫКЛ"</item>
-    <item msgid="5656544177755411222">"Ограниченное число прерываний"</item>
-    <item msgid="8735337502532332056">"Без прерываний"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Нормальное"</item>
     <item msgid="866544120205026771">"Умеренное"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 42607ff..53e1dcd 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -270,12 +270,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-карта"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Настройки прокси-сервера"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ДА"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"НЕТ"</string>
-    <string name="forget" msgid="7267115980248732932">"УДАЛИТЬ"</string>
+    <string name="forget" msgid="1400428660472591263">"Удалить"</string>
+    <string name="save" msgid="879993180139353333">"Сохранить"</string>
+    <string name="done" msgid="6942539184162713160">"Готово"</string>
     <string name="settings_label" msgid="1626402585530130914">"Настройки"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Настройки"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Ярлык настроек"</string>
@@ -378,7 +376,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Подключите зарядное устройство и повторите попытку."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Не указан PIN-код или пароль блокировки экрана"</string>
     <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>
@@ -537,7 +534,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Расширенные"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Расш. настройки Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Включите Bluetooth, чтобы подключаться к другим Bluetooth-устройствам."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"Чтобы точнее определять местоположение, приложения Google будут искать находящиеся поблизости Bluetooth-устройства даже при отключенном Bluetooth. Вы можете изменить эту опцию в LINK_BEGINнастройках сканированияLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Чтобы точнее определять местоположение, приложения и сервисы будут искать находящиеся поблизости Bluetooth-устройства даже при выключенном Bluetooth. Вы можете отключить эту функцию в <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>настройках сканирования<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Подключить к..."</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>
@@ -603,7 +600,7 @@
     <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" msgid="8382526568324164356">"Чтобы точнее определять местоположение, приложения Google будут искать находящиеся поблизости точки доступа Wi-Fi даже при отключенном Wi-Fi. Вы можете изменить эту опцию в LINK_BEGINнастройках сканированияLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Чтобы точнее определять местоположение, приложения и сервисы будут искать сети Wi-Fi даже при выключенном Wi-Fi. Вы можете отключить эту функцию в <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>настройках сканирования<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Больше не показывать"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi в спящем режиме"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi в спящем режиме"</string>
@@ -620,8 +617,6 @@
     <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_apps" msgid="6003687912727859577">"Показывать приложения"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Показывать уровень сигнала Wi-Fi"</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>
@@ -679,6 +674,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ПОДКЛЮЧИТЬСЯ"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Сеть не подключена к Интернету. Использовать ее?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Больше не спрашивать для этой сети"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Подключить"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Не удалось подключиться к сети."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Удалить"</string>
@@ -745,21 +742,17 @@
     <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>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Звонки по Wi-Fi"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Приоритет сети"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Звонки по Wi-Fi"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Приоритет у Wi-Fi"</item>
     <item msgid="5267397515594230396">"Приоритет у моб. сети"</item>
-    <item msgid="3132912693346866895">"Только Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Когда функция \"Звонки по Wi-Fi\" включена, для исходящих вызовов может использоваться как Wi-Fi, так и мобильная сеть (в зависимости от ваших предпочтений и уровня сигнала). Прежде чем включить эту функцию, свяжитесь со своим оператором и уточните детали."</string>
     <string name="home_settings" msgid="212375129455718176">"Домашний экран"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Экран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
@@ -933,12 +926,12 @@
     <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="5128673488173839077">"Приложения и их данные"</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_media_misc_usage" msgid="235452944021647124">"Прочее"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Другие файлы"</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>
@@ -971,6 +964,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Выполняется извлечение"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Заканчивается свободное место"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Некоторые системные функции (например, синхронизация) могут работать неправильно. Попробуйте освободить пространство. Для этого удалите или уберите из офлайн-просмотра приложения и мультимедийный контент."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Переименовать"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Подключить"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Извлечь"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Стереть и форматировать"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Стереть и форматировать как внутреннюю память"</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>
@@ -981,6 +979,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Обеспечивает взаимодействие MIDI-приложений при подключении мобильного устройства к компьютеру через USB."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Другие пользователи"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Память устройства"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Съемный накопитель"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"Свободно <xliff:g id="FREE">%1$s</xliff:g> (всего <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Подключено: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Ошибка подключения: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"Устройство безопасно извлечено: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Не удалось безопасно извлечь устройство: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"Отформатировано: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Ошибка форматирования: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Переименование хранилища"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"После форматирования вы сможете использовать карту \"<xliff:g id="NAME_0">^1</xliff:g>\" на других устройствах.\n\nВсе данные на карте \"<xliff:g id="NAME_1">^1</xliff:g>\" будут удалены, поэтому мы рекомендуем создать их резервную копию.\n\n"<b>"Скопируйте фотографии и другие файлы."</b>\n"Переместите их в память устройства или на компьютер, подключив к нему устройство при помощи USB-кабеля.\n\n"<b>"Скопируйте приложения."</b>\n"Все приложения и их данные, хранящиеся на карте \"<xliff:g id="NAME_6">^1</xliff:g>\", будут удалены. Рекомендуем перенести их в память устройства."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Если вы извлечете карту \"<xliff:g id="NAME_0">^1</xliff:g>\", хранящиеся на ней приложения и файлы станут недоступны до тех пор, пока вы снова не вставите карту в устройство."</b>\n\n"Карта \"<xliff:g id="NAME_1">^1</xliff:g>\" не будет работать на других устройствах, поскольку она отформатирована только под ваше."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Настройте карту \"<xliff:g id="NAME">^1</xliff:g>\""</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Портативная память"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Для переноса фотографий и других файлов между устройствами."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Внутренняя память"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Для хранения данных (приложений, фотографий и других файлов) только на этом устройстве. Необходимо отформатировать карту, чтобы ее нельзя было использовать на других устройствах."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Внутренняя память"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Чтобы защитить ваши данные, карту \"<xliff:g id="NAME_0">^1</xliff:g>\" нужно отформатировать.\n\nКарта \"<xliff:g id="NAME_1">^1</xliff:g>\" будет работать только на этом устройстве.\n\n"<b>"Все данные, сохраненные на карте \"<xliff:g id="NAME_2">^1</xliff:g>\", будут удалены."</b>" Чтобы избежать их потери, создайте их резервную копию."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Очистить и отформатировать"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Форматирование карты \"<xliff:g id="NAME">^1</xliff:g>\"…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Не извлекайте карту \"<xliff:g id="NAME">^1</xliff:g>\", пока она форматируется."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Перенесите на новое устройство"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Вы можете перенести фотографии, файлы и данные приложений на новую карту \"<xliff:g id="NAME">^1</xliff:g>\".\n\nНа это уйдет около <xliff:g id="TIME">^2</xliff:g>, после чего освободится <xliff:g id="SIZE">^3</xliff:g> внутренней памяти. Некоторые приложения не будут работать во время переноса."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Перенести сейчас"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Перенести позже"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Перенесите данные"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"На это уйдет около <xliff:g id="TIME">^1</xliff:g>, после чего освободится <xliff:g id="SIZE">^2</xliff:g> внутренней памяти."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Перенести"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Перенос данных…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Во время переноса:\n• Не извлекайте карту \"<xliff:g id="NAME">^1</xliff:g>\".\n• Учтите, что некоторые приложения будут работать неправильно.\n• Не допускайте разрядки аккумулятора."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"Карта \"<xliff:g id="NAME">^1</xliff:g>\" готова к работе"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Теперь на карту \"<xliff:g id="NAME">^1</xliff:g>\" можно сохранять фотографии и другие файлы."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Ваша карта \"<xliff:g id="NAME">^1</xliff:g>\" готова к работе.\n\nЧтобы перенести на нее фотографии, данные приложений и другие файлы, нажмите \"Настройки &gt; Память\"."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Перенесите приложение \"<xliff:g id="APP">^1</xliff:g>\""</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Перенос приложения \"<xliff:g id="APP">^1</xliff:g>\" и его данных на карту \"<xliff:g id="NAME_0">^2</xliff:g>\" займет несколько секунд.\n\nУчтите, что пользоваться приложением и извлекать карту \"<xliff:g id="NAME_1">^2</xliff:g>\" во время переноса нельзя."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Перенос приложения \"<xliff:g id="APP">^1</xliff:g>\"…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Не извлекайте карту \"<xliff:g id="NAME">^1</xliff:g>\" во время переноса.\n\nПока он не завершится, приложение \"<xliff:g id="APP">^2</xliff:g>\" будет недоступно на этом устройстве."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Отменить перенос"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Состояние батареи"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Уровень заряда батареи"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Точки доступа (APN)"</string>
@@ -1025,13 +1062,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Сбросить настройки"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Настройки по умолчанию восстановлены."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Сброс сетевых настроек"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"На устройстве будут восстановлены заводские сетевые настройки, в том числе для:\n\n"<li>"Wi-Fi;"</li>\n<li>"передачи данных;"</li>\n<li>"Bluetooth."</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"На устройстве будут сброшены все сетевые настройки, в том числе:\n\n"<li>"Wi‑Fi"</li>\n<li>"Мобильные данные"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Сбросить настройки"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Восстановить сетевые настройки будет невозможно. Продолжить?"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Сброшенные настройки нельзя будет восстановить. Продолжить?"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Да"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Чтобы подтвердить сброс, начертите графический ключ."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Сбросить настройки?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Настройки сброшены"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Сетевые настройки сброшены"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Сбросить настройки"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Сброс настроек"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Будут удалены все данные из "<b>"внутренней памяти"</b>" устройства, в том числе:\n\n"<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Загруженные приложения"</li></string>
@@ -1047,9 +1083,8 @@
     <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="1062841478823409667">"Удалить всю личную информацию и скачанные приложения? Это действие нельзя отменить."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Стереть все"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Этот пользователь не может выполнять сброс настроек"</string>
@@ -1066,8 +1101,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Голосовая почта, АОН, переадресация, параллельный вызов"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-модем"</string>
@@ -1099,7 +1132,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Справка"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Мобильные сети"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Тарифный план"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Приложение для обмена SMS"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Смена приложения для обмена SMS"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Использовать приложение <xliff:g id="NEW_APP">%1$s</xliff:g> вместо <xliff:g id="CURRENT_APP">%2$s</xliff:g> для обмена SMS-сообщениями?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Использовать приложение \"<xliff:g id="NEW_APP">%s</xliff:g>\" для обмена SMS-сообщениями?"</string>
@@ -1130,6 +1163,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Использовать GPS для определения местоположения"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Поиск"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Поиск"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Поиск сетей Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Чтобы точнее определять местоположение, разрешите системным сервисам искать сети Wi-Fi даже при отключенном Wi-Fi"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Поиск Bluetooth-устройств"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Чтобы точнее определять местоположение, разрешите системным сервисам искать находящиеся поблизости Bluetooth-устройства даже при отключенном Bluetooth"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi и мобильные сети"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Разрешить отправлять анонимные геоданные и позволить приложениям определять ваше местоположение с помощью Wi-Fi и мобильных сетей"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"С помощью Wi-Fi"</string>
@@ -1166,7 +1203,7 @@
     <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">"Введите PIN-код"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Введите новый пароль"</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>
@@ -1175,11 +1212,15 @@
     <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="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Чтобы продолжить, введите графический ключ."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Чтобы продолжить, введите PIN-код устройства"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Чтобы продолжить, введите пароль устройства."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Неверный PIN-код"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Неверный пароль"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Неверный ключ"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Безопасность устройства"</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_wrong" msgid="4694973540770105678">"Повторите попытку"</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>
@@ -1201,8 +1242,7 @@
     <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" msgid="6909161623701848863">"Слишком много неудачных попыток подряд. Повторите через <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>
@@ -1253,8 +1293,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Упорядочить по размеру"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Показать активные службы"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Показать процессы в кеше"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Тревожное оповещение"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Сбросить настройки"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Сбросить настройки?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Будут сброшены следующие настройки:\n\n"<li>"список отключенных приложений;"</li>\n<li>"уведомления для отключенных приложений;"</li>\n<li>"список приложений по умолчанию;"</li>\n<li>"ограничения на передачу данных в фоновом режиме;"</li>\n<li>"ограничения на разрешения."</li>\n\n"Данные приложений удалены не будут."</string>
@@ -1458,8 +1497,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Сохранять все пакеты HCI Bluetooth в файле"</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="select_logd_size_title" msgid="7433137108348553508">"Размер буфера журнала"</string>
@@ -1760,6 +1797,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 ч."</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 д."</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Системные процессы"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Скрыть системные процессы"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Использовать USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Тип статистических данных"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Фоновые процессы"</string>
@@ -1856,7 +1894,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_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>
@@ -2231,7 +2268,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Добавить пользователя"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Профиль с огр. доступом"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Добавить пользователя?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Если вашим устройством пользуется кто-то ещё, создайте на нем дополнительные профили. Владелец профиля может настроить его по своему вкусу, в том числе выбрать обои и установить нужные приложения. Кроме того, пользователи могут изменять общие для всех параметры устройства, например включать или отключать Wi‑Fi.\n\nПосле создания профиля его необходимо настроить.\n\nОбновлять приложения для всех аккаунтов может любой пользователь устройства."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Если вашим устройством пользуется кто-то ещё, создайте на нем дополнительные профили. Владелец профиля может настроить его по своему вкусу, в том числе выбрать обои и установить нужные приложения. Кроме того, пользователи могут изменять общие для всех параметры устройства, например включать или отключать Wi‑Fi.\n\nПосле создания профиля его необходимо настроить.\n\nОбновлять приложения для всех аккаунтов может любой пользователь устройства."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"После создания профиля его необходимо настроить.\n\nОбновлять приложения для всех аккаунтов может любой пользователь устройства."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Настроить аккаунт?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Пользователь должен иметь возможность настроить свое личное пространство на устройстве."</string>
@@ -2411,10 +2448,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"ограничение ограничить ограничено"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"текст исправление автокоррекция звук вибрация авто язык жест подсказка тема неприемлемый слово ввод эмодзи смайлик интернациональный"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"сброс настройки по умолчанию"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"параметры приложения для экстренных случаев (по умолчанию)"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"приложения скачать установить система"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"Защита разрешений для приложений"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"приложения по умолчанию"</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>
@@ -2429,14 +2466,12 @@
     <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="6948120138640252732">"Без прерываний"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Только важные"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Авторежим"</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_alarms" msgid="7380265858042606857">"Только будильник"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Не беспокоить"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Только важные"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Только будильник"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Не беспокоить"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Рингтон"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Мелодия уведомлений по умолчанию"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Вибрация при звонке"</string>
@@ -2471,17 +2506,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Службы просмотра уведомлений не установлены."</string>
     <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">"Нет приложений, задающих условия"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="one">%d приложение задает условия</item>
-      <item quantity="few">%d приложения задают условия</item>
-      <item quantity="many">%d приложений задают условия</item>
-      <item quantity="other">%d приложений задают условия</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="loading_notification_apps" msgid="5031818677010335895">"Загрузка..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блокировать все"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Не показывать уведомления из этого приложения"</string>
@@ -2495,17 +2519,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"Название правила"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Добавить правило"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Удалить правило"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Удалить правило \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Удалить"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Тип правила"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Неизвестен"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Настроить правило"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Правило расписания"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Правило не найдено."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Дни"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"–"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Каждый день"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Никогда"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"с <xliff:g id="START">%1$s</xliff:g> по <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Вызовы"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Сообщения"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Звонки/сообщения от"</string>
@@ -2515,15 +2545,92 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Будильник"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Напоминания"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Мероприятия"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Выбранные абоненты"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Повторные входящие вызовы"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Уведомить о вызове, если абонент звонит повторно в течение <xliff:g id="MINUTES">%d</xliff:g> мин."</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"На следующий день в <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Когда можно оповещать?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"На какой срок?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Бессрочно"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> минута</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> минуты</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> минут</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> минуты</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> час</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> часа</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> часов</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> часа</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Важные уведомления активированы бессрочно."</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">В течение <xliff:g id="DURATION">%1$d</xliff:g> минуты до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> активны только важные уведомления.</item>
+      <item quantity="few">В течение <xliff:g id="DURATION">%1$d</xliff:g> минут до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> активны только важные уведомления.</item>
+      <item quantity="many">В течение <xliff:g id="DURATION">%1$d</xliff:g> минут до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> активны только важные уведомления.</item>
+      <item quantity="other">В течение <xliff:g id="DURATION">%1$d</xliff:g> минут до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> активны только важные уведомления.</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">В течение <xliff:g id="DURATION">%1$d</xliff:g> часа до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> активны только важные уведомления.</item>
+      <item quantity="few">В течение <xliff:g id="DURATION">%1$d</xliff:g> часов до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> активны только важные уведомления.</item>
+      <item quantity="many">В течение <xliff:g id="DURATION">%1$d</xliff:g> часов до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> активны только важные уведомления.</item>
+      <item quantity="other">В течение <xliff:g id="DURATION">%1$d</xliff:g> часов до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> активны только важные уведомления.</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Будильник и напоминания активированы бессрочно."</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">В течение <xliff:g id="DURATION">%1$d</xliff:g> минуты до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> активны только напоминания и будильник.</item>
+      <item quantity="few">В течение <xliff:g id="DURATION">%1$d</xliff:g> минут до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> активны только напоминания и будильник.</item>
+      <item quantity="many">В течение <xliff:g id="DURATION">%1$d</xliff:g> минут до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> активны только напоминания и будильник.</item>
+      <item quantity="other">В течение <xliff:g id="DURATION">%1$d</xliff:g> минут до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> активны только напоминания и будильник.</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="one">В течение <xliff:g id="DURATION">%1$d</xliff:g> часа до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> активны только напоминания и будильник.</item>
+      <item quantity="few">В течение <xliff:g id="DURATION">%1$d</xliff:g> часов до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> активны только напоминания и будильник.</item>
+      <item quantity="many">В течение <xliff:g id="DURATION">%1$d</xliff:g> часов до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> активны только напоминания и будильник.</item>
+      <item quantity="other">В течение <xliff:g id="DURATION">%1$d</xliff:g> часов до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> активны только напоминания и будильник.</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Режим \"Не беспокоить\" активирован бессрочно."</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Режим \"Не беспокоить\" установлен на <xliff:g id="DURATION">%1$d</xliff:g> минуту до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>.</item>
+      <item quantity="few">Режим \"Не беспокоить\" установлен на <xliff:g id="DURATION">%1$d</xliff:g> минуты до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>.</item>
+      <item quantity="many">Режим \"Не беспокоить\" установлен на <xliff:g id="DURATION">%1$d</xliff:g> минут до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>.</item>
+      <item quantity="other">Режим \"Не беспокоить\" установлен на <xliff:g id="DURATION">%1$d</xliff:g> минуты до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>.</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Режим \"Не беспокоить\" установлен на <xliff:g id="DURATION">%1$d</xliff:g> час до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>.</item>
+      <item quantity="few">Режим \"Не беспокоить\" установлен на <xliff:g id="DURATION">%1$d</xliff:g> часа до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>.</item>
+      <item quantity="many">Режим \"Не беспокоить\" установлен на <xliff:g id="DURATION">%1$d</xliff:g> часов до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>.</item>
+      <item quantity="other">Режим \"Не беспокоить\" установлен на <xliff:g id="DURATION">%1$d</xliff:g> часа до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>.</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Режим \"Не беспокоить\" отключен."</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"всегда"</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>
@@ -2567,7 +2674,7 @@
     <string name="launch_by_default" msgid="2184141780491382435">"Запуск по умолчанию"</string>
     <string name="storage_summary_format" msgid="5419902362347539755">"Занято <xliff:g id="SIZE">%1$s</xliff:g> (<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>)"</string>
     <string name="app_launch_domain_links_title" msgid="458956710410857777">"Доменные ссылки"</string>
-    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Открыть URL домена"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Открывать URL домена"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Разрешить приложению напрямую открывать доменные URL"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Поддерживаемые URL"</string>
     <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Другие значения по умолчанию"</string>
@@ -2590,7 +2697,12 @@
       <item quantity="many">Предоставлено <xliff:g id="COUNT_1">%d</xliff:g> разрешений</item>
       <item quantity="other">Предоставлено <xliff:g id="COUNT_1">%d</xliff:g> разрешения</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one">Предоставлено <xliff:g id="COUNT_2">%d</xliff:g> разрешение из <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="few">Предоставлены <xliff:g id="COUNT_2">%d</xliff:g> разрешения из <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="many">Предоставлено <xliff:g id="COUNT_2">%d</xliff:g> разрешений из <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="other">Предоставлены <xliff:g id="COUNT_2">%d</xliff:g> разрешения из <xliff:g id="COUNT_3">%d</xliff:g></item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Установлены некоторые настройки по умолчанию"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Настройки по умолчанию не установлены"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Все приложения"</string>
@@ -2600,23 +2712,29 @@
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Заблокированные"</string>
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Важные"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Конфиденциальные"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"С URL-адресами домена"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Восстановить настройки по умолчанию для всех приложений"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"Всего приложений: <xliff:g id="COUNT">%d</xliff:g> (включая системные и установленные пользователем)"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"С URL домена"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Отключено администратором"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Дополнительные настройки"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Неизвестное приложение"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Выберите профиль"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Разрешения для приложений"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Приложения с расширенным доступом: <xliff:g id="COUNT_0">%d</xliff:g> из <xliff:g id="COUNT_1">%d</xliff:g>"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Приложения с разрешением: <xliff:g id="COUNT_0">%d</xliff:g> из <xliff:g id="COUNT_1">%d</xliff:g>"</string>
-    <string name="domain_urls_title" msgid="8735310976048599572">"URL-адреса домена"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"URL домена"</string>
     <string name="domain_urls_summary_none" msgid="3517494281628717719">"Не открывать URL домена"</string>
     <string name="domain_urls_summary_one" msgid="3804994599497120956">"Только <xliff:g id="DOMAIN">%s</xliff:g>"</string>
-    <string name="domain_urls_summary_some" msgid="4859484048050301933">"<xliff:g id="DOMAIN">%s</xliff:g> и URL-адреса домена"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"<xliff:g id="DOMAIN">%s</xliff:g> и другие URL домена"</string>
     <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> приложение может открыть URL своего домена</item>
       <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> приложения могут открыть URL своего домена</item>
       <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> приложений могут открыть URL своего домена</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> приложения может открыть URL своего домена</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Отпечаток не опознан"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Приложения по умолчанию"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Браузер"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Браузер не выбран"</string>
+    <string name="default_app" msgid="6864503001385843060">"(по умолчанию)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-si-rLK/arrays.xml b/res/values-si-rLK/arrays.xml
index b05d059..7c826e6 100644
--- a/res/values-si-rLK/arrays.xml
+++ b/res/values-si-rLK/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"ඔබන බොත්තම"</item>
@@ -283,9 +286,9 @@
     <item msgid="3073734345226842233">"මයික්‍රෝෆෝනය නිශ්ශබ්ද/නිශ්ශබ්ද නැති කරන්න"</item>
     <item msgid="1148142988678569310">"මාධ්‍ය ව්‍යාපෘතිය"</item>
     <item msgid="9130014005474445273">"VPN සක්‍රිය කරන්න"</item>
-    <item msgid="1165192162975045562">"write wallpaper"</item>
-    <item msgid="7129487923652967258">"assist structure"</item>
-    <item msgid="1069023208100114540">"assist screenshot"</item>
+    <item msgid="1165192162975045562">"වෝල්පේපරය ලියන්න"</item>
+    <item msgid="7129487923652967258">"ව්‍යුහයට සහාය"</item>
+    <item msgid="1069023208100114540">"තිර රුවට සහාය"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"ස්ථානය"</item>
@@ -335,9 +338,9 @@
     <item msgid="1312534577834048535">"මයික්‍රෝෆෝනය නිශ්ශබ්ද/නිශ්ශබ්ද නැති කරන්න"</item>
     <item msgid="5906017727368097853">"මාධ්‍ය ව්‍යාපෘතිය"</item>
     <item msgid="2486614710846178542">"VPN සක්‍රිය කරන්න"</item>
-    <item msgid="5586547561693629602">"Write wallpaper"</item>
-    <item msgid="32794179825485062">"Assist structure"</item>
-    <item msgid="7872852746938272552">"Assist screenshot"</item>
+    <item msgid="5586547561693629602">"වෝල්පේපරය ලියන්න"</item>
+    <item msgid="32794179825485062">"ව්‍යුහයට සහාය"</item>
+    <item msgid="7872852746938272552">"තිර රුවට සහාය"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"කොට"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"පහළ"</item>
     <item msgid="4212263919458209842">"අවදානම්"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"අක්‍රියයි"</item>
-    <item msgid="5656544177755411222">"සීමා කළ අතුරු බිදුම්"</item>
-    <item msgid="8735337502532332056">"ශූන්‍ය අතුරු බිදුම්"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"සාමාන්‍ය"</item>
     <item msgid="866544120205026771">"මධ්‍යම"</item>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 27b95e9..0ed55f4 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD කාඩ් පත"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"නියුතු සැකසීම්"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ඔව්"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"නැත"</string>
-    <string name="forget" msgid="7267115980248732932">"අමතක කරන්න"</string>
+    <string name="forget" msgid="1400428660472591263">"අමතක කරන්න"</string>
+    <string name="save" msgid="879993180139353333">"සුරකින්න"</string>
+    <string name="done" msgid="6942539184162713160">"අවසන්"</string>
     <string name="settings_label" msgid="1626402585530130914">"සැකසීම්"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"සැකසීම්"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"සැකසීම කෙටිමඟ"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"ඔබගේ චාලකය පේනු ගත කර නැවත උත්සාහ කරන්න."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"අගුළු තිර PIN හෝ මුරපදයක් නොමැත"</string>
     <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>
@@ -521,7 +518,7 @@
     <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="ble_scan_notify_text" msgid="9019985398053764737">"පිහිටීම් නිරවද්‍යතාව වැඩිදියුණු කිරීමට, බ්ලූටූත් ක්‍රියා විරහිත විට පවා, Google සේවා බ්ලූටූත් උපාංග සඳහා පරීක්ෂා කරනු ඇත. ඔබට මෙය LINK_BEGINපරීක්ෂා කිරීමේ සැකසීම්LINK_END තුළ වෙනස් කළ හැකිය."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"ස්ථාන නිරවද්‍යතාව වැඩිදියුණු කිරීමට, බ්ලූටූත් ක්‍රියා විරහිත විට පවා, යෙදුම් සහ සේවා බ්ලූටූත් උපාංග සඳහා පරිලෝකනය කරනු ඇත. ඔබට මෙය <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>පරිලෝකනය කිරීමේ සැකසීම්<xliff:g id="LINK_END_1">LINK_END</xliff:g> තුළ වෙනස් කළ හැකිය."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"වෙත සම්බන්ධ වෙන්න…"</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>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"පිහිටීම් නිරවද්‍යතාව වැඩිදියුණු කිරීමට, Wi‑Fi ක්‍රියා විරහිත විට පවා, Google සේවා Wi‑Fi ජාල සඳහා පරීක්ෂා කරනු ඇත. ඔබට මෙය LINK_BEGINපරීක්ෂා කිරීමේ සැකසීම්LINK_END තුළ වෙනස් කළ හැකිය."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"ස්ථාන නිරවද්‍යතාව වැඩිදියුණු කිරීමට, Wi‑Fi ක්‍රියා විරහිත විට පවා, යෙදුම් සහ සේවා Wi‑Fi ජාල සඳහා පරිලෝකනය කරනු ඇත. ඔබට මෙය <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>පරිලෝකනය කිරීමේ සැකසීම්<xliff:g id="LINK_END_1">LINK_END</xliff:g> තුළ වෙනස් කළ හැකිය."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"නැවත නොපෙන්වන්න"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"නිද්‍රාව අතරතුර Wi-Fi සක්‍රියව තබන්න"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"නිද්‍රාව අතරතුර Wi-Fi සක්‍රියයි"</string>
@@ -604,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"ඍජු Wi-Fi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"පරිලෝකනය කරන්න"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"උසස්"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"යෙදුම පෙන්වන්න"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"WiFi බලය පෙන්වන්න"</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>
@@ -663,6 +658,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"සම්බන්ධ කරන්න"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"මෙම ජාලයට අන්තර්ජාල ප්‍රවේශය නැත, කෙසේ වුවත්, මෙම ජාලය භාවිත කරන්නද?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"මෙම ජාලය සඳහා නැවත නොඅසන්න"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"සම්බන්ධ කරන්න"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ජාලය වෙත සම්බන්ධ වීම අසාර්ථක විය"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"අමතක කරන්න"</string>
@@ -734,12 +731,10 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi වඩා කැමතියි"</item>
     <item msgid="5267397515594230396">"සෙලියුලර් වඩා කැමතියි"</item>
-    <item msgid="3132912693346866895">"Wi-Fi පමණයි"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wi-Fi ඇමතීම ක්‍රියාත්මකයි, ඔබේ දුරකථනයට ඔබේ මනාපය සහ සංඥා ප්‍රබලතාව අනුව, Wi-Fi ජාල හරහා හෝ ඔබේ වාහකයේ ජාලය හරහා ඇමතුම් ගමන් කරවිය හැකිය. මෙම විශේෂාංගය ක්‍රියාත්මක කිරීමට පෙර, ගාස්තු සහ අනෙකුත් විස්තර පිළිබඳව ඔබේ වාහකය සමගින් පරීක්ෂා කර බලන්න."</string>
     <string name="home_settings" msgid="212375129455718176">"මුල් පිටුව"</string>
@@ -913,12 +908,12 @@
     <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="5128673488173839077">"යෙදුම් සහ යෙදුම් දත්ත"</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_media_misc_usage" msgid="235452944021647124">"විවිධ"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"වෙනත් ගොනු"</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>
@@ -951,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"ගලවමින් පවතී"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"ආචයන ඉඩ අවසන් වෙමින් සිටියි"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"සමමුහුර්ත කිරීම වැනි පද්ධති ක්‍රියාවන් නිවැරදිව වැඩ නොකර හැක. යෙදුම් හෝ මාධ්‍ය අන්තර්ගත වැනි අයිතම මැකීමෙන් හෝ ඇමිණීම ඉවත් කිරීමෙන් ඉඩ නිදහස් කිරීමට උත්සාහ කරන්න."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"යළි නම් කරන්න"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"නංවන්න"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"ගලවන්න"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"මැකීම සහ ෆෝමැට්"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"අභ්‍යන්තර ආචයනය ලෙස මැකීම සහ ෆෝමැට්"</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>
@@ -961,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"MIDI සබල කළ යෙදුම්වලට,USB  ඔස්සේ ඔබගේ පරිගණකයේ ඇති MIDI මෘදුකාංග සමග ක්‍රියා කිරීමට ඉඩ ලබා දෙන්න."</string>
     <string name="storage_other_users" msgid="808708845102611856">"වෙනත් පරිශීලකයින්"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"උපාංග ආචයනය"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"ඉවත් කළ හැකි ආචයනය"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> නිදහස් (මුළු <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> සවි කරන ලදි"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g> සවි කිරීමට නොහැකි විය"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> ආරක්ෂිතව ගලවන ලදි"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g> ආරක්ෂිතව ගැලවීමට නොහැකි විය"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> ෆෝමැට් කරන ලදි"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> ෆෝමැට් කිරීමට නොහැකි විය"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"ආචයනය යළි නම් කරන්න"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"ෆෝමැට් කිරීමෙන් පසුව, ඔබට මෙම <xliff:g id="NAME_0">^1</xliff:g> වෙනත් උපාංග වල භාවිතා කළ හැකිය. \n\n<xliff:g id="NAME_1">^1</xliff:g> හි සියලු දත්ත මකා දැමෙනු ඇත. එය මුලින්ම උපස්ථ කිරීම සලකා බලන්න. \n\n"<b>"ඡායාරූප සහ වෙනත් මාධ්‍ය උපස්ථ කරන්න"</b>" \nඔබගේ මාධ්‍ය ගොනු මෙම උපාංගයේ විකල්ප ආචයනයක් වෙත හෝ USB කේබලයක් භාවිතා කර පරිගණකයකට ගෙන යන්න. \n\n"<b>"යෙදුම් උපස්ථ කරන්න"</b>" \n<xliff:g id="NAME_6">^1</xliff:g> මත ගබඩා කර ඇති සියලු යෙදුම් අස්ථාපනය වන අතර ඒවායේ දත්ත මකා දැමෙනු ඇත. මෙම යෙදුම් තබා ගැනීමට, මෙම උපාංගයේ විකල්ප ආචයනයකට ඒවා ගෙනයන්න."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"ඔබ <xliff:g id="NAME_0">^1</xliff:g> ගලවන විට, එහි ගබඩා කළ යෙදුම් වැඩ නොකරන අතර, එහි ගබඩා කර ඇති මාධ්‍ය ගොනු එය යළි නැවත සවි කරන තුර ලබාගත නොහැක."</b>" \n\n<xliff:g id="NAME_1">^1</xliff:g> එය ෆෝමැට් කර ඇත්තේ මෙම උපාංගයේ පමණක් වැඩ කරන ආකාරයටයි. එය වෙනත් ඒවා වල වැඩ නොකරනු ඇත."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"ඔබගේ <xliff:g id="NAME">^1</xliff:g> සකසන්න"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"අතේ ගෙන යා හැකි ආචයනයක් ලෙස භාවිතා කරන්න"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"උපාංග අතර ඡායාරූප හා අනෙකුත් මාධ්‍ය ගෙන යාම සඳහා."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"අභ්‍යන්තර ආචයනය ලෙස භාවිතා කරන්න"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"යෙදුම් හා ඡායාරූප ඇතුළුව, මෙම උපාංගය මත පමණක් ඕනෑම දෙයක් ගබඩා කිරීම සඳහා. වෙනත් උපාංග සමඟ වැඩ කිරීම වළක්වන ෆෝමැට් කිරීමක් අවශ්‍ය වේ."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"අභ්‍යන්තර ආචයනය ලෙස ෆෝමැට් කරන්න"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"<xliff:g id="NAME_0">^1</xliff:g> ආරක්ෂා කිරීම සඳහා එය ෆෝමැට් කිරීම අවශ්‍ය වේ. \n\nෆෝමැට් කිරීමෙන් පසු, <xliff:g id="NAME_1">^1</xliff:g> මෙම උපාංගයේ පමණක් වැඩ කරනු ඇත. \n\n"<b>"ෆෝමැට් කිරීම මඟින් <xliff:g id="NAME_2">^1</xliff:g> තුළ ගබඩා කර ඇති සියලු දත්ත මකා දමනු ඇත."</b>" දත්ත නැතිවීම වළක්වා ගැනීමට, උපස්ථ කිරීම සලකා බලන්න."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"මැකීම සහ ෆෝමැට්"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> ෆෝමැට් කරමින්…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"<xliff:g id="NAME">^1</xliff:g> ෆෝමැට් කරන අතරතුර එය ඉවත් නොකරන්න."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"නව ආචයනය වෙත දත්ත ගෙන යන්න"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"මෙම නව <xliff:g id="NAME">^1</xliff:g> වෙත ඔබගේ ඡායාරූප, ගොනු, සහ යෙදුම් දත්ත ගෙන යාමට හැකිය. \n\nමෙම පියවර වෙත <xliff:g id="TIME">^2</xliff:g> පමණ ගන්නා අතර එයින් අභ්‍යන්තර ආචයනයේ <xliff:g id="SIZE">^3</xliff:g> ක් නිදහස් කරනු ඇත. එය අතරතුර සමහර යෙදුම් වැඩ නොකරනු ඇත."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"දැන් ගෙන යන්න"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"පසුව ගෙන යන්න"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"දැන් දත්ත ගෙන යන්න"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"මෙම පියවර වෙත <xliff:g id="TIME">^1</xliff:g> පමණ ගනී. එයින් අභ්‍යන්තර ආචයනයේ <xliff:g id="SIZE">^2</xliff:g> ක් නිදහස් කරනු ඇත."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"ගෙන යන්න"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"දත්ත ගෙන යමින්…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"ගෙන යාම අතරතුර: \n• <xliff:g id="NAME">^1</xliff:g> ඉවත් කරන්න එපා. \n• සමහර යෙදුම් හරියට වැඩ නොකරනු ඇත. \n• උපාංගය ආරෝපිතව තබාගන්න."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> සූදානම්"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"ඔබගේ <xliff:g id="NAME">^1</xliff:g> ඡායාරූප හා අනෙකුත් මාධ්‍ය සමඟ භාවිතා කිරීමට සූදානම්."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"ඔබගේ නව <xliff:g id="NAME">^1</xliff:g> වැඩ කරයි. \n\n මෙම උපාංගයට ඡායාරූප, ගොනු, සහ යෙදුම් දත්ත ගෙන යාමට, සැකසීම් &gt; ආචයනය වෙත යන්න."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> ගෙන යාම"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<xliff:g id="APP">^1</xliff:g> යෙදුම සහ එහි දත්ත <xliff:g id="NAME_0">^2</xliff:g> වෙත ගෙනයාමට ගතවන්න පොඩි වේලාවක් පමණි. ගෙන යාම සම්පූර්ණ වන තුරු යෙදුම ඔබට භාවිතා කළ නොහැකි වේ.\n\nගෙන යාම අතරතුර <xliff:g id="NAME_1">^2</xliff:g> ඉවත් කරන්න එපා."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> ගෙන යමින්…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"ගෙන යාම අතරතුර <xliff:g id="NAME">^1</xliff:g> ඉවත් කරන්න එපා. \n\nගෙන යාම සම්පූර්ණ වන තුරු මෙම උපාංගයේ <xliff:g id="APP">^2</xliff:g> යෙදුම ලබාගත නොහැකි වනු ඇත."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ගෙන යාම අවලංගු කරන්න"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"බැටරි තත්වය"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"බැටරි මට්ටම"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1005,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"සුපුරුදු වෙත යළි සකසන්න"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"සුපුරුදු APN සැකසීම නැවත සැකසීම සම්පූර්ණ කරන ලදි."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"ජාල සැකසීම් යළි පිහිටුවන ලදි"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"මෙය පහත ඒවා ඇතුළුව, කර්මාන්තශාලා පෙරනිමි වෙත ජාලකරණයට සම්බන්ධ සියලු සැකසීම් යළි පිහිටවනු ඇත:\n\n"<li>"Wifi"</li>\n<li>"ජංගම දත්ත"</li>\n<li>"බ්ලූටූත්"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"මෙය සියලු ජාල සැකසීම් යළි පිහිටුවයි, පහත ඒවා ඇතුලත්ව:\n\n"<li>"Wi‑Fi"</li>\n<li>"සෙලියුලර් දත්ත"</li>\n<li>"බ්ලූටූත්"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"සැකසීම් යළි පිහිටුවන ලදි"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"සියලු ජාල සැකසීම් යළි පිහිටුවන්නද? ඔබට මෙම ක්‍රියාව ආපසු හැරවිය නොහැකිය!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"සියලු ජාල සැකසීම් යළි පිහිටුවන්නද? ඔබට මෙම ක්‍රියාව ආපසු හැරවිය නොහැකිය!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"සැකසීම් යළි පිහිටුවන්න"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"ජාල සැකසීම් යළි පිහිටුවීමක් තහවුරු කිරීමට ඔබ ඔබේ අගුලු හැරීමේ රටාව ඇඳීමට අවශ්‍යයි."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"යළි පිහිටුවන්නද?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"ජාල සැකසීම් යළි පිහිටුවන ලදි"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"ජාල සැකසීම් යළි පිහිටුවන ලදි"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"උපාංගය යළි පිහිටුවන්න"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"කර්මාන්තශාලා දත්ත යළි පිහිටුම"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ඔබගේ ටැබ්ලටයේ "<b>"අභ්‍යන්තර ආචනය"</b>", සියලු දත්ත මකයි:\n\n"<li>"ඔබගේ Google ගිණුම"</li>\n<li>"පද්ධති සහ යෙදුම් දත්ත සහ සැකසීම්"</li>\n<li>"බාගත යෙදුම්"</li>" අන්තර්ගතය."</string>
@@ -1027,9 +1065,8 @@
     <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="1062841478823409667">"ඔබගේ සියලු පෞද්ගලික තොරතුරු සහ බාගත කළ යෙදුම් මකන්නද? ඔබට මෙම ක්‍රියාව ආපසු හැරවිය නොහැක!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"සියලු දේම මකන්න"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"මෙම පරිශීලකයා වෙතට කර්මාන්තශාලා යළි පිහිටුවීම නොමැත"</string>
@@ -1046,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"කටහඬ තැපැල්, ඇමතුම් ඉදිරියට ගෙන යෑම, ඇමතුම් රැඳීම්, ඇමතුම්කරුගේ ID සකසන්න"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB ටෙදරින්"</string>
@@ -1079,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"උදවු"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"සෙලියුලර් ජාල"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"ජංගම සැලසුම"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"සුපුරුදු SMS යෙදුම"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"කෙටි පණිවුඩ යෙදුම"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS යෙදුම වෙනස් කරන්නද?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"ඔබගේ SMS යෙදුම ලෙස <xliff:g id="CURRENT_APP">%2$s</xliff:g> වෙනුවට <xliff:g id="NEW_APP">%1$s</xliff:g> භාවිතා කරන්නද?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"ඔබගේ SMS යෙදුම ලෙස <xliff:g id="NEW_APP">%s</xliff:g> භාවිතා කරන්නද?"</string>
@@ -1112,6 +1147,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ඔබේ ස්ථානය නිර්ණය කිරීමට GPS භාවිත කරන්න"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"පරිලෝකනය කිරීම"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"පරිලෝකනය කිරීම"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi පරිලෝකනය"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Wi‑Fi ක්‍රියා විරහිත විට පවා, යෙදුම් සහ සේවා වෙත Wi‑Fi ජාල සඳහා පරිලෝකනය කිරීමට අවසර දීමෙන්, ස්ථාන නිරවද්‍යතාව වැඩිදියුණු කරගන්න."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"බ්ලූටූත් පරිලෝකනය"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"බ්ලූටූත් ක්‍රියා විරහිත විට පවා, පද්ධති සේවා වෙත බ්ලූටූත් උපාංග සඳහා පරිලෝකනය කිරීමට අවසර දීමෙන්, ස්ථාන නිරවද්‍යතාව වැඩිදියුණු කරගන්න."</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi සහ සෙලියුලර් ජාල ස්ථාන"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"ඔබගේ ස්ථානය ඉක්මනින් තීරණය කිරීමට යෙදුම් හට Google හි ස්ථාන සේවා භාවිතා කිරීමට ඉඩ දෙන්න. නිර්නාමික ස්ථාන දත්ත එකතු කර Google වෙත යැවෙනු ඇත."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi මඟින් ස්ථානය හඳුනාගන්නා ලදි"</string>
@@ -1157,11 +1196,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"මුරපදය සකස් කර ඇත."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN සකස් කර ඇත."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"රටාව සකස් කරන ලදි."</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"ඉදිරියට යාමට ඔබගේ උපාංග රටාව භාවිතා කරන්න."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"ඉදිරියට යාමට ඔබගේ උපාංග PIN එක ඇතුළු කරන්න."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"ඉදිරියට යාමට ඔබගේ උපාංග මුරපදය ඇතුළු කරන්න."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN එක වැරදියි"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"වැරදි මුරපදය"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"වැරදි රටාවකි"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"උපාංග ආරක්ෂාව"</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_wrong" msgid="4694973540770105678">"නැවත උත්සාහ කරන්න:"</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>
@@ -1183,8 +1226,7 @@
     <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" msgid="6909161623701848863">"වැරදි උත්සාහයන් ගණන වැඩියි. තත්පර <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>
@@ -1235,7 +1277,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"ප්‍රමාණය අනුව පෙළගස්වන්න"</string>
     <string name="show_running_services" msgid="5736278767975544570">"ධාවනය වන සේවා පෙන්වන්න"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"හැඹිලිගත ක්‍රියාවලි පෙන්වන්න"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"පෙරනිමි හදිසි අවස්ථා යෙදුම"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"හදිසි යෙදුම"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"යෙදුම් මනාප නැවත සකසන්න"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"යෙදුම් මනාප නැවත සකසන්නද?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"මේ මගින් පහත සඳහන් සියලු අභිරුචි යළි පිහිටුවයි:\n\n "<li>"අබල යෙදුම්"</li>\n" "<li>"අබල යෙදුම් දැනුම්දීම්"</li>\n" "<li>"ක්‍රියාවන් සඳහා සුපුරුදු යෙදුම්"</li>\n" "<li>"යෙදුම් සඳහා පසුබිම් දත්ත සීමා කිරීම්"</li>\n" "<li>"ඕනෑම අවසර සීමා"</li>\n\n" ඔබට යෙදුම් දත්ත කිසිවක් නැති නොවේ."</string>
@@ -1439,8 +1481,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ගොනුවක් තුළ ඇති බ්ලූටූත් HCI පැකට්ටු සියල්ලම ග්‍රහණය කරගන්න"</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="select_logd_size_title" msgid="7433137108348553508">"ලෝගයේ අන්තරාවක ප්‍රමාණය"</string>
@@ -1741,6 +1781,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"පැය 12"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"දවස් 1"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"පද්ධතිය පෙන්වන්න"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"පද්ධතිය සඟවන්න"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss භාවිතා කරන්න"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"සංඛ්‍යාන වර්ගය"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"පසුබිම"</string>
@@ -1837,7 +1878,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_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>
@@ -2212,7 +2252,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"පරිශීලක"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"සීමිත පැතිකඩ"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"අලුත් පරිශීලකයෙක් එකතු කරන්නද?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"අමතර පරිශීලකයින් නිර්මාණය කිරීම මඟින් වෙනත් පුද්ගලයන් සමඟ මෙම උපාංගය ඔබට බෙදා ගත හැක. සෑම පරිශිලකයෙක්ටම ඔවුන්ගේ යෙදුම්, බිතුපත, සහ වෙනත් ඒවා අභිරුචි කළ හැකි තමන්ට අයිති ඉඩක් ඇත. පරිශීලකයින්ට Wi‑Fi වැනි සෑම දෙනාටම බලපාන උපාංග සැකසීම්ද සීරුමාරු කළ හැක.\n\nඔබ නව පරිශීලකයෙකු එක් කළ විට ඔවුන්ගේ ඉඩ එම පුද්ගලයා සකසා ගත යුතු වේ.\n\nඕනෑම පරිශීලකයෙකුට වෙනත් සියලු පරිශීලකයන් සඳහා යෙදුම් යාවත්කාලීන කළ හැක."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"අමතර පරිශීලකයින් නිර්මාණය කිරීම මඟින් වෙනත් පුද්ගලයන් සමඟ මෙම උපාංගය ඔබට බෙදා ගත හැක. සෑම පරිශිලකයෙක්ටම ඔවුන්ගේ යෙදුම්, බිතුපත, සහ වෙනත් ඒවා අභිරුචි කළ හැකි තමන්ට අයිති ඉඩක් ඇත. පරිශීලකයින්ට Wi‑Fi වැනි සෑම දෙනාටම බලපාන උපාංග සැකසීම්ද සීරුමාරු කළ හැක.\n\nඔබ නව පරිශීලකයෙකු එක් කළ විට ඔවුන්ගේ ඉඩ එම පුද්ගලයා සකසා ගත යුතු වේ.\n\nඕනෑම පරිශීලකයෙකුට වෙනත් සියලු පරිශීලකයන් සඳහා යෙදුම් යාවත්කාලීන කළ හැක."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"ඔබ අලුත් පරිශීලකයෙක් එකතු කරන විට, එම පුද්ගලයා ඔහුගේ වැඩ කරන ඉඩ සකසා ගත යුතුය.\n\nසියළුම අනෙක් පරිශීලකයින් සඳහා ඕනෑම පරිශීලකයෙකුට යාවත්කාලීන කළ හැක."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"දැන් පරිශීලකයා සකසන්නද?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"උපාංගය ලබාගෙන තමන්ගේ ඉඩ සකසා ගැනීමට අදාළ පුද්ගලයා සිටින බව තහවුරු කරගන්න"</string>
@@ -2395,6 +2435,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"හදිසි අවස්ථා ice යෙදුම පෙරනිමි"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"යෙදුම් බාගැනීම යෙදුම් පද්ධති"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"යෙදුම් අවසර ආරක්ෂාව"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"යෙදුම් පෙරනිමි"</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>
@@ -2409,14 +2450,12 @@
     <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="6948120138640252732">"බාධා අවහිර කරන්න"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ප්‍රමුඛතා පමණි ඉඩ දෙයි"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ස්වයංක්‍රීය රීති"</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_alarms" msgid="7380265858042606857">"ඇඟවීම් පමණක් ඉඩ දෙන්න"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"අතුරු බිඳීම නැත"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"ප්‍රමුඛතාව පමණයි"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"එලාම පමණයි"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"බාධා කිරීම් නැත"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g> : <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"දුරකථන රිගින්ටෝනය"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"සුපුරුදු දැනුම්දීම් රිගින්ටෝනය"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ඇමතුම් සඳහා කම්පනයද කරන්න"</string>
@@ -2449,15 +2488,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"දැනුම් දීම් ශ්‍රාවකයන් ස්ථාපනය කර නොමැත."</string>
     <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">"යෙදුම් ප්‍රතිපාදනය කරන කොන්දේසි නැත"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="one">යෙදුම් %d ක් සපයන කොන්දේසි</item>
-      <item quantity="other">යෙදුම් %d ක් සපයන කොන්දේසි</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="loading_notification_apps" msgid="5031818677010335895">"යෙදුම් පූරණය වේ..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"සියල්ල අවහිර කරන්න"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"මෙම යෙදුමෙන් කවදාවත් දැනුම්දීම් පෙන්වන්න එපා"</string>
@@ -2471,17 +2501,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"රීති නම"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"රීතිය එක් කරන්න"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"රීතිය මකන්න"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<xliff:g id="RULE">%1$s</xliff:g>\" රීතිය මකන්නද?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"මකන්න"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"රීති වර්ගය"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"නොදනී"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"රීතිය වින්‍යාස කිරීම"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"කාල සටහන් රීතිය"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"රීතිය සොයාගැනීමට නොහැක."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"දින"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"කිසිවක් නැත"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"සෑමදාම"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"කවදාවත් නෑ"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> සිට <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"ඇමතුම්"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"පණිවිඩ"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"වෙතින් ඇමතුම්/පණිවිඩ"</string>
@@ -2491,15 +2527,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"ඇඟවීම්"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"සිහිකැඳවීම්"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"සිදුවීම්"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"තෝරාගත් අමතන්නන්"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"නැවත අමතන්නන්"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"එකම පුද්ගලයා විනාඩි <xliff:g id="MINUTES">%d</xliff:g> කාල සීමාවක් තුළ දෙවන වතාවටත් අමතයි නම්, එයට අවසර දෙන්න"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"මීලඟ දිනයේ <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"ඔබව බාධා කිරීමට කැමති කවදාද?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"කොපමණ කාලයකට ද?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"දින නියමයක් නොමැතිව"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one">මිනිත්තු <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="other">මිනිත්තු <xliff:g id="COUNT_1">%d</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one">පැය <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="other">පැය <xliff:g id="COUNT_1">%d</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"දින නියමයක් නොමැතිව ප්‍රමුඛ දැනුම්දීම් පමණක් වෙත මාරු වෙන්න"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> තෙක් මිනිත්තු <xliff:g id="DURATION">%1$d</xliff:g> ක් සඳහා ප්‍රමුඛ දැනුම්දීම් පමණක් වෙත මාරු වෙන්න</item>
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> තෙක් මිනිත්තු <xliff:g id="DURATION">%1$d</xliff:g> ක් සඳහා ප්‍රමුඛ දැනුම්දීම් පමණක් වෙත මාරු වෙන්න</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">පැය <xliff:g id="DURATION">%1$d</xliff:g> ක් සඳහා ප්‍රමුඛ දැනුම්දීම් පමණක් වෙත මාරු වෙන්න (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> තෙක්)</item>
+      <item quantity="other">පැය <xliff:g id="DURATION">%1$d</xliff:g> ක් සඳහා ප්‍රමුඛ දැනුම්දීම් පමණක් වෙත මාරු වෙන්න (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> තෙක්)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"දින නියමයක් නොමැතිව සීනු පමණක් වෙත මාරු වෙන්න"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">මිනිත්තු <xliff:g id="DURATION">%1$d</xliff:g> ක් සඳහා සීනු පමණක් වෙත මාරු වෙන්න (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> තෙක්)</item>
+      <item quantity="other">මිනිත්තු <xliff:g id="DURATION">%1$d</xliff:g> ක් සඳහා සීනු පමණක් වෙත මාරු වෙන්න (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> තෙක්)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> තෙක් පැය <xliff:g id="DURATION">%1$d</xliff:g> ක් සඳහා සීනු පමණක් වෙත මාරු වෙන්න</item>
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> තෙක් පැය <xliff:g id="DURATION">%1$d</xliff:g> ක් සඳහා සීනු පමණක් වෙත මාරු වෙන්න</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"දින නියමයක් නොමැතිව බාධා නොකරන්න වෙත මාරු වෙන්න"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">මිනිත්තු <xliff:g id="DURATION">%1$d</xliff:g> ක් සඳහා බාධා නොකරන්න වෙත මාරු වෙන්න (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> තෙක්)</item>
+      <item quantity="other">මිනිත්තු <xliff:g id="DURATION">%1$d</xliff:g> ක් සඳහා බාධා නොකරන්න වෙත මාරු වෙන්න (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> තෙක්)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> තෙක් පැය <xliff:g id="DURATION">%1$d</xliff:g> ක් සඳහා බාධා නොකරන්න වෙත මාරු වෙන්න</item>
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> තෙක් පැය <xliff:g id="DURATION">%1$d</xliff:g> ක් සඳහා බාධා නොකරන්න වෙත මාරු වෙන්න</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"සෑම විටම බාධා කිරීම වෙත මාරු වෙන්න"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"සදහටම"</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>
@@ -2564,7 +2661,10 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> අවසර ලබාදෙන ලදි</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> අවසර ලබාදෙන ලදි</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one">අවසර <xliff:g id="COUNT_3">%d</xliff:g> න් <xliff:g id="COUNT_2">%d</xliff:g> ක් ලබා දෙන ලදී</item>
+      <item quantity="other">අවසර <xliff:g id="COUNT_3">%d</xliff:g> න් <xliff:g id="COUNT_2">%d</xliff:g> ක් ලබා දෙන ලදී</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"ඇතැම් පෙරනිමියන් සකස් කර ඇත"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"පෙරනිමියන් සකසා නොමැත"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"සියලු යෙදුම්"</string>
@@ -2575,8 +2675,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ප්‍රමුඛතාව"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"සංවේදී"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"වසම් URL සමග"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"සියලු යෙදුම් අතර මනාප සුපුරුදු වෙතට යළි පිහිටුවන්න"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"පද්ධති සහ බාගත් යෙදුම් ඇතුළත්ව, යෙදුම් <xliff:g id="COUNT">%d</xliff:g> ක් ස්ථාපනය කර ඇත"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"පරිපාලක මඟින් අබල කරන ලදි"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"උසස්"</string>
     <string name="unknown_app" msgid="5275921288718717656">"නොදන්නා යෙදුම"</string>
     <string name="choose_profile" msgid="8229363046053568878">"පැතිකඩ තෝරන්න"</string>
@@ -2585,10 +2684,17 @@
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"යෙදුම් <xliff:g id="COUNT_1">%d</xliff:g> න් <xliff:g id="COUNT_0">%d</xliff:g> කට ඉඩ දෙන ලදී"</string>
     <string name="domain_urls_title" msgid="8735310976048599572">"වසම් URL"</string>
     <string name="domain_urls_summary_none" msgid="3517494281628717719">"කිසිදු වසම් URL එකක් විවෘත නොකරන්න"</string>
-    <string name="domain_urls_summary_one" msgid="3804994599497120956">"\'විවෘත <xliff:g id="DOMAIN">%s</xliff:g> \'"</string>
-    <string name="domain_urls_summary_some" msgid="4859484048050301933">"\'විවෘත <xliff:g id="DOMAIN">%s</xliff:g> \'හා සම්බන්ධිත URL"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"විවෘත \'<xliff:g id="DOMAIN">%s</xliff:g>\'"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"විවෘත \'<xliff:g id="DOMAIN">%s</xliff:g>\' හා සම්බන්ධිත URL"</string>
     <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
       <item quantity="one">යෙදුම් <xliff:g id="COUNT">%d</xliff:g> කට ඒවායේ වසම් URL විවෘත කළ හැකිය</item>
       <item quantity="other">යෙදුම් <xliff:g id="COUNT">%d</xliff:g> කට ඒවායේ වසම් URL විවෘත කළ හැකිය</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"අඳුනාගත නොහැක"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"පෙරනිමි යෙදුම්"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"බ්‍රවුසර යෙදුම"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"පෙරනිමි වෙබ් බ්‍රවුසරයක් නැත"</string>
+    <string name="default_app" msgid="6864503001385843060">"(සුපුරුදු)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index a90f989..117d7ab 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Stlačenie tlačidla"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"Médiá"</item>
     <item msgid="7924928667052300589">"Zariadenie"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"približná poloha"</item>
+    <item msgid="5789673140227507995">"presná poloha"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibrovanie"</item>
+    <item msgid="3434165993711230924">"čítanie kontaktov"</item>
+    <item msgid="616161687718081936">"úprava kontaktov"</item>
+    <item msgid="7638002295329050091">"čítanie denníka hovorov"</item>
+    <item msgid="6546959730920410907">"úprava denníka hovorov"</item>
+    <item msgid="446877710771379667">"čítanie kalendára"</item>
+    <item msgid="7674458294386319722">"úprava kalendára"</item>
+    <item msgid="8281201165558093009">"prehľadanie sietí Wi-Fi"</item>
+    <item msgid="8694611243479480497">"upozornenie"</item>
+    <item msgid="7776439107987345446">"prehľadanie mobilných sietí"</item>
+    <item msgid="514615766544675057">"volanie na telefón"</item>
+    <item msgid="8181415497109310680">"čítanie správ SMS"</item>
+    <item msgid="6816551144382117307">"písanie správ SMS"</item>
+    <item msgid="4600463921908905030">"príjem správ SMS"</item>
+    <item msgid="5958926493289432745">"príjem núdzových správ SMS"</item>
+    <item msgid="4945269495221089540">"príjem správ MMS"</item>
+    <item msgid="5570472453573929087">"príjem správ WAP push"</item>
+    <item msgid="7125408150230860501">"odosielanie správ SMS"</item>
+    <item msgid="7080337936612188061">"čítanie správ ICC SMS"</item>
+    <item msgid="587124103118495063">"písanie správ ICC SMS"</item>
+    <item msgid="2320577158869025503">"úprava nastavení"</item>
+    <item msgid="1545733463471924009">"vykreslenie navrch"</item>
+    <item msgid="3609046903962454582">"prístup k upozorneniam"</item>
+    <item msgid="4671646036128214513">"fotoaparát:"</item>
+    <item msgid="1097324338692486211">"záznam zvuku"</item>
+    <item msgid="5031552983987798163">"prehrávanie zvuku"</item>
+    <item msgid="8374996688066472414">"načítať schránku"</item>
+    <item msgid="3045529469061083747">"upraviť schránku"</item>
+    <item msgid="5124443975763747838">"mediálne tlačidlá"</item>
+    <item msgid="4547883971364273343">"zvukové zameranie"</item>
+    <item msgid="2603878814882344450">"hlavná hlasitosť"</item>
+    <item msgid="7136963238377062018">"hlasitosť hlasu"</item>
+    <item msgid="4270236897655923007">"hlasitosť zvonenia"</item>
+    <item msgid="6325739889222559394">"hlasitosť médií"</item>
+    <item msgid="5762123934816216821">"hlasitosť budíkov"</item>
+    <item msgid="785049718065337473">"hlasitosť upozornení"</item>
+    <item msgid="6700305533746877052">"hlasitosť bluetooth"</item>
+    <item msgid="2029227495214047094">"zakázať režim spánku"</item>
+    <item msgid="26109888160231211">"sledovať polohu"</item>
+    <item msgid="5753382310468855812">"sledovanie polohy s vysokým výkonnom"</item>
+    <item msgid="3356591542543137332">"získanie štatistiky používania"</item>
+    <item msgid="3073734345226842233">"stlmenie alebo zrušenie stlmenia mikrofónu"</item>
+    <item msgid="1148142988678569310">"projekcia médií"</item>
+    <item msgid="9130014005474445273">"aktivovať VPN"</item>
+    <item msgid="1165192162975045562">"zápis tapety"</item>
+    <item msgid="7129487923652967258">"asistujúca štruktúra"</item>
+    <item msgid="1069023208100114540">"asistujúca snímka obrazovky"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Poloha"</item>
+    <item msgid="8677040780775113033">"Poloha"</item>
+    <item msgid="1660743989948992916">"Poloha"</item>
+    <item msgid="8791172739860195290">"Vibrovanie"</item>
+    <item msgid="383413555642128046">"Čítanie kontaktov"</item>
+    <item msgid="3654594895269697313">"Úprava kontaktov"</item>
+    <item msgid="7928393476362362538">"Čítanie denníka hovorov"</item>
+    <item msgid="6248591205254641116">"Úprava denníka hovorov"</item>
+    <item msgid="6093344633066170692">"Čítanie kalendára"</item>
+    <item msgid="1334886368750347692">"Úprava kalendára"</item>
+    <item msgid="1638204101698708656">"Poloha"</item>
+    <item msgid="2154671955760380322">"Upozornenie na príspevok"</item>
+    <item msgid="4282477730595931828">"Poloha"</item>
+    <item msgid="4891423912898525905">"Volanie na telefón"</item>
+    <item msgid="2623604824935968113">"Čítanie SMS/MMS"</item>
+    <item msgid="4420177125221176306">"Písanie SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Príjem SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Príjem SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Príjem SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Príjem SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Odosielanie SMS/MMS"</item>
+    <item msgid="3527273606643794973">"Čítanie SMS/MMS"</item>
+    <item msgid="4370895547001583812">"Písanie SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Úprava nastavení"</item>
+    <item msgid="736541391767350377">"Vykreslenie navrch"</item>
+    <item msgid="5530815681721654194">"Prístup k upozorneniam"</item>
+    <item msgid="781213371706962767">"Fotoaparát"</item>
+    <item msgid="1720492593061838172">"Zaznamenať zvuk"</item>
+    <item msgid="3493046322001257041">"Prehrať zvuk"</item>
+    <item msgid="136815868796597058">"Načítať schránku"</item>
+    <item msgid="5238692940326972503">"Upraviť schránku"</item>
+    <item msgid="5753789168376302997">"Tlačidlá médií"</item>
+    <item msgid="3265262911688671938">"Zameranie zvuku"</item>
+    <item msgid="2098976479485046797">"Hlavná hlasitosť"</item>
+    <item msgid="5660213838861789350">"Hlasitosť hlasu"</item>
+    <item msgid="7983336752371254444">"Hlasitosť zvonenia"</item>
+    <item msgid="7878027809189330917">"Hlasitosť médií"</item>
+    <item msgid="7260546305036218513">"Hlasitosť budíkov"</item>
+    <item msgid="9103719301075748925">"Hlasitosť upozornení"</item>
+    <item msgid="7025966722295861512">"Hlasitosť zariadenia Bluetooth"</item>
+    <item msgid="4665183401128289653">"Zakázať režim spánku"</item>
+    <item msgid="8584357129746649222">"Poloha"</item>
+    <item msgid="7669257279311110599">"Poloha"</item>
+    <item msgid="3459320345690097795">"Získanie štatistiky využívania"</item>
+    <item msgid="1312534577834048535">"Stlmenie alebo zrušenie stlmenia mikrofónu"</item>
+    <item msgid="5906017727368097853">"Projekcia médií"</item>
+    <item msgid="2486614710846178542">"Aktivovať VPN"</item>
+    <item msgid="5586547561693629602">"Zápis tapety"</item>
+    <item msgid="32794179825485062">"Asistujúca štruktúra"</item>
+    <item msgid="7872852746938272552">"Asistujúca snímka obrazovky"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Krátka"</item>
     <item msgid="2560532955514699713">"Stredná"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"nízke"</item>
     <item msgid="4212263919458209842">"kritické"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Vypnuté"</item>
-    <item msgid="5656544177755411222">"Obmedzený počet vyrušení"</item>
-    <item msgid="8735337502532332056">"Žiadne vyrušenia"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normálny"</item>
     <item msgid="866544120205026771">"Stredný"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 833b99f..81017e5 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -270,12 +270,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Karta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Nastavenia servera proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Zrušiť"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ZRUŠIŤ"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"POKRAČOVAŤ"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ÁNO"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NIE"</string>
-    <string name="forget" msgid="7267115980248732932">"ODSTRÁNIŤ"</string>
+    <string name="forget" msgid="1400428660472591263">"Zabudnúť"</string>
+    <string name="save" msgid="879993180139353333">"Uložiť"</string>
+    <string name="done" msgid="6942539184162713160">"Hotovo"</string>
     <string name="settings_label" msgid="1626402585530130914">"Nastavenia"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Nastavenia"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Odkaz na nastavenia"</string>
@@ -378,7 +376,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Zapojte nabíjačku a skúste to znova."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Chýba heslo alebo kód PIN na odomknutie obrazovky"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Pred spustením šifrovania musíte nastaviť kód PIN alebo heslo zámky obrazovky."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Zašifrovanie zariadenia musíte potvrdiť nakreslením bezpečnostného vzoru."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Šifrovať?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Operácia šifrovania je nevratná a ak ju prerušíte, prídete o údaje. Šifrovanie môže trvať viac ako hodinu. Tablet sa počas tejto doby niekoľkokrát reštartuje."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Operácia šifrovania je nevratná a ak ju prerušíte, prídete o údaje. Šifrovanie môže trvať viac ako hodinu. Telefón sa počas tejto doby niekoľkokrát reštartuje."</string>
@@ -423,8 +420,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Vzor"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Heslo"</string>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Po nastavení zámky obrazovky si môžete nastaviť aj svoj odtlačok prsta v časti Nastavenia &gt; Zabezpečenie."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Vypnúť zámku obrazovky"</string>
     <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>
@@ -538,8 +534,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Rozšírené"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Rozšírené nastavenia Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Keď je zapnutá funkcia Bluetooth, zariadenie môže komunikovať s ostatnými zariadeniami Bluetooth v okolí."</string>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Aplikácie a služby budú vyhľadávať zariadenia Bluetooth aj vtedy, keď je rozhranie Bluetooth vypnuté, aby tak zlepšovali presnosť pri určovaní polohy. Túto možnosť môžete zmeniť v <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nastaveniach vyhľadávania zariadení<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Pripojiť k…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojené od zvukovej jednotky média."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojené od zvukovej jednotky handsfree."</string>
@@ -605,8 +600,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Aplikácie a služby budú vyhľadávať siete Wi-Fi aj vtedy, keď je sieť Wi-Fi vypnutá, aby tak zlepšovali presnosť pri určovaní polohy. Túto možnosť môžete zmeniť v <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nastaveniach vyhľadávania zariadení<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Túto správu znova nezobrazovať"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Ponechať Wi-Fi zapnuté v režime spánku"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi aktívne v režime spánku"</string>
@@ -623,8 +617,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <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_apps" msgid="6003687912727859577">"Zobraziť aplikácie"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Zobraziť silu Wi-Fi"</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>
@@ -682,6 +674,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Chcete sa prihlásiť, aby ste sa mohli pripojiť?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> vyžaduje, aby ste sa pred pripoj. k sieti prihlásili online"</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"PRIPOJIŤ"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Táto sieť nemá prístup k internetu. Chcete ju napriek tomu použiť?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Nabudúce sa na túto sieť nepýtať"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Pripojiť"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nepodarilo sa pripojiť k sieti"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Odstrániť"</string>
@@ -753,12 +747,10 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Uprednostniť Wi-Fi"</item>
     <item msgid="5267397515594230396">"Uprednostniť mobilné pripojenie"</item>
-    <item msgid="3132912693346866895">"Len Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Ak je zapnuté volanie Wi-Fi, váš telefón môže smerovať volania cez siete Wi-Fi alebo cez sieť vášho operátora. Závisí to od vašich nastavení a od toho, ktorý signál je silnejší. Pred zapnutím tejto funkcie kontaktujte svojho operátora a informujte sa o poplatkoch a ďalších podrobnostiach."</string>
     <string name="home_settings" msgid="212375129455718176">"Domovská stránka"</string>
@@ -934,12 +926,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"K dispozícii (len na čítanie)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Celková pamäť"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Prebieha výpočet..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplikácie (údaje aplikácií a obsah médií)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Aplikácie a údaje o aplikáciách"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Médiá"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Stiahnutia"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Obrázky, videá"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Zvuk (hudba, vyzváňacie tóny, podcasty atď.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Rôzne"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Ostatné súbory"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Údaje uložené vo vyrovnávacej pamäti"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Odpojte zdieľaný ukl. priestor"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Odpojiť kartu SD"</string>
@@ -972,6 +964,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Prebieha odpájanie"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Nedostatok ukladacieho priestoru"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Niektoré systémové funkcie, ako je synchronizácia, nemusia fungovať správne. Skúste získať ukladací priestor odstránením alebo uvoľnením položiek, ako sú aplikácie alebo obsah médií."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Premenovať"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Pripojiť"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Odpojiť"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Vymazať a formátovať"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Vymazať a formátovať ako interné úložisko"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Pripojenie USB k počítaču"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Pripojenie USB k počítaču"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Pripojiť ako"</string>
@@ -982,6 +979,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Umožňuje aplikáciám s podporou rozhrania MIDI spolupracovať so softvérom MIDI na vašom počítači prostredníctvom kábla USB."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Ďalší používatelia"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Pamäťové zariadenie"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Vymeniteľné úložisko"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"Zdarma <xliff:g id="FREE">%1$s</xliff:g> (celkove <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Úložisko (<xliff:g id="NAME">%1$s</xliff:g>) je pripojené"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Úložisko (<xliff:g id="NAME">%1$s</xliff:g>) sa nepodarilo pripojiť"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"Úložisko (<xliff:g id="NAME">%1$s</xliff:g>) bolo bezpečne odpojené"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Úložisko (<xliff:g id="NAME">%1$s</xliff:g>) sa nepodarilo bezpečne odpojiť"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"Úložisko <xliff:g id="NAME">%1$s</xliff:g> je naformátované"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Úložisko <xliff:g id="NAME">%1$s</xliff:g> sa nepodarilo naformátovať"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Premenujte úložisko"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Po naformátovaní budete môcť úložisko <xliff:g id="NAME_0">^1</xliff:g> používať s inými zariadeniami. \n\nVšetky údaje v úložisku <xliff:g id="NAME_1">^1</xliff:g> budú vymazané. Odporúčame ich najskôr zálohovať. \n\n"<b>"Zálohovanie fotiek a iných médií"</b>" \nMediálne súbory presuňte do iného úložiska v zariadení alebo ich pomocou kábla USB preneste do počítača. \n\n"<b>"Zálohovanie aplikácií"</b>" \nVšetky aplikácie v úložisku <xliff:g id="NAME_6">^1</xliff:g> sa odinštalujú a ich údaje sa vymažú. Ak si chcete tieto aplikácie ponechať, presuňte ich do iného úložiska v zariadení."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Keď toto úložisko <xliff:g id="NAME_0">^1</xliff:g> odpojíte, prestanú fungovať aplikácie, ktoré sú v ňom uložené. Mediálne súbory nebudú dostupné, kým ho opäť nepripojíte."</b>" \n\nToto úložisko <xliff:g id="NAME_1">^1</xliff:g> je naformátované tak, aby fungovalo iba v tomto zariadení. V iných zariadeniach fungovať nebude."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Nastavte úložisko <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Použiť ako prenosné úložisko"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Na prenášanie fotiek a ďalších médií medzi zariadeniami."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Použiť ako interné úložisko"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Na ukladanie ľubovoľných údajov vrátane aplikácií a fotiek iba v tomto zariadení. Vyžaduje sa formátovanie, ktoré spôsobí, že nebude fungovať v iných zariadeniach."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Naformátovať ako inter. úložisko"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Preto je nutné úložisko <xliff:g id="NAME_0">^1</xliff:g> zabezpečiť pomocou formátovania. \n\nPo naformátovaní bude úložisko <xliff:g id="NAME_1">^1</xliff:g> fungovať iba v tomto zariadení. \n\n"<b>"Formátovaním vymažete všetky údaje v úložisku <xliff:g id="NAME_2">^1</xliff:g>."</b>" Ak chcete zabrániť strate údajov, odporúčame ich zálohovať."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Vymazať a formátovať"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formátuje sa úložisko <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Počas formátovania úložisko <xliff:g id="NAME">^1</xliff:g> neodoberajte."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Presuňte údaje do nov. úložiska"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Do tohto nového úložiska <xliff:g id="NAME">^1</xliff:g> môžete presunúť fotky, súbory a údaje aplikácií. \n\nPresun bude trvať zhruba <xliff:g id="TIME">^2</xliff:g> a v internom úložisku sa uvoľní <xliff:g id="SIZE">^3</xliff:g>. Počas presunu nebudú niektoré aplikácie fungovať."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Presunúť"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Presunúť neskôr"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Presuňte údaje"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Presun bude trvať zhruba <xliff:g id="TIME">^1</xliff:g>. V internom úložisku sa uvoľní <xliff:g id="SIZE">^2</xliff:g>."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Presunúť"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Presúvajú sa údaje…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Počas presunu: \n• neodoberajte úložisko <xliff:g id="NAME">^1</xliff:g>; \n• niektoré aplikácie nebudú fungovať správne; \n• udržiavajte zariadenie nabité."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"Úložisko <xliff:g id="NAME">^1</xliff:g> je pripravené"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Teraz môžete do úložiska <xliff:g id="NAME">^1</xliff:g> ukladať fotky a ďalšie médiá."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Vaše nové úložisko <xliff:g id="NAME">^1</xliff:g> už funguje. \n\nAk chcete do tohto zariadenia presunúť fotky, súbory a údaje aplikácií, prejdite do časti Nastavenia &gt; Úložisko."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Presuňte aplikáciu <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Presun aplikácie <xliff:g id="APP">^1</xliff:g> a jej údajov do úložiska <xliff:g id="NAME_0">^2</xliff:g> bude trvať iba chvíľu. Aplikáciu budete môcť použiť až po jej presune. \n\nÚložisko <xliff:g id="NAME_1">^2</xliff:g> počas presunu neodoberajte."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Presúva sa aplikácia <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Úložisko <xliff:g id="NAME">^1</xliff:g> počas presunu neodoberajte. \n\nAplikácia <xliff:g id="APP">^2</xliff:g> bude v tomto zariadení k dispozícii až po dokončení presunu."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Zrušiť presun"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Stav batérie"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Stav batérie"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Názvy prístupových bodov (APN)"</string>
@@ -1026,13 +1062,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Obnoviť predvolené"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Obnovenie predvolených nastavení názvu prístupového bodu (APN) bolo dokončené."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Obnovenie nastavení siete"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Týmto obnovíte všetky predvolené továrenské nastavenia súvisiace s možnosťami siete, ako aj s \n\n"<li>"pripojením Wi-Fi"</li>",\n"<li>"mobilným pripojením"</li>" a \n"<li>"pripojením cez Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Týmto obnovíte všetky sieťové nastavenia vrátane:\n\n"<li>"siete Wi‑Fi,"</li>\n<li>"mobilného pripojenia,"</li>\n<li>"rozhrania Bluetooth."</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Obnoviť nastavenia"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Chcete obnoviť všetky nastavenia siete? Túto akciu nie je možné vrátiť späť."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Chcete obnoviť všetky sieťové nastavenia? Toto akciu nie je možné vrátiť späť."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Obnoviť nastavenia"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Obnovenie nastavení siete musíte potvrdiť nakreslením bezpečnostného vzoru."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Obnoviť?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Obnoviť nastavenia siete"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Sieťové nastavenia boli obnovené"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Obnoviť zariadenie"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Obnovenie továrenských nastavení"</string>
     <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>
@@ -1048,9 +1083,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Vymazať všetky údaje na karte SD (napr. hudbu alebo fotografie)"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Obnoviť tablet"</string>
     <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_desc" msgid="1062841478823409667">"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_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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Obnovenie továrenských nastavení nie je dostupné pre tohto používateľa"</string>
@@ -1067,8 +1101,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Nastavenie hlasovej schránky, presmerovania hovorov, čakajúcich hovorov a identifikácie volajúceho"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering cez USB"</string>
@@ -1100,7 +1132,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomocník"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobilné siete"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilný plán"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Predvolená aplikácia SMS"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplikácia pre SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Zmeniť aplikáciu na SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Použiť aplikáciu <xliff:g id="NEW_APP">%1$s</xliff:g> namiesto <xliff:g id="CURRENT_APP">%2$s</xliff:g> ako aplikáciu na SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Použiť aplikáciu <xliff:g id="NEW_APP">%s</xliff:g> ako aplikáciu pre SMS?"</string>
@@ -1131,6 +1163,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Určovať polohu pomocou GPS"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Vyhľadávanie"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Vyhľadávanie"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Vyhľadávanie sietí Wi-Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Vylepšite určovanie polohy tým, že aplikáciám a službám umožníte vyhľadávať siete Wi-Fi aj vtedy, keď je sieť Wi-Fi vypnutá."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Vyhľadávanie zariadení Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Vylepšite určovanie polohy tým, že systémovým službám umožníte vyhľadávať zariadenia Bluetooth aj vtedy, keď je rozhranie Bluetooth vypnuté."</string>
     <string name="location_network_based" msgid="6010456018401296590">"Urč. polohy pomocou Wi-Fi a mobil. siete"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Povoliť apl. používať službu urč. polohy Google a rýchl. odhad. vašu polohu. Anonym. údaje o polohe sa budú odosielať spol. Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Poloha je určená podľa siete Wi-Fi"</string>
@@ -1176,11 +1212,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Heslo bolo nastavené"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Bol nastavený kód PIN"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Vzor bol nastavený"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Ak chcete pokračovať, použite bezpečnostný vzor zariadenia."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Ak chcete pokračovať, zadajte kód PIN zariadenia."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Ak chcete pokračovať, zadajte heslo zariadenia."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Nesprávny kód PIN"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Nesprávne heslo"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Nesprávny vzor"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Zabezpečenie zariadenia"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Zmena bezpečnostného vzoru"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Zmena bezpečnostného kódu PIN"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potvrďte uložený vzor"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Skúste to znova"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Nakreslite bezpečnostný vzor"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pomocníka zobrazíte stlačením klávesy Menu."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Na záver zdvihnite prst z obrazovky"</string>
@@ -1202,8 +1242,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Nastaviť bezpečnostný vzor"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Zmena bezpečnostného vzoru"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Bezpečnostný vzor obrazovky nakreslite takto"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Príliš veľa chybných pokusov."</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Počet sekúnd zostávajúcich do ďalšieho pokusu: <xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Príliš veľa nesprávnych pokusov. Skúste to znova o <xliff:g id="NUMBER">%d</xliff:g> s."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Aplikácia nie je v telefóne nainštalovaná."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Spravovať aplikácie"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Správa a odstraňovanie nainštalovaných aplikácií"</string>
@@ -1254,7 +1293,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Zoradiť podľa veľkosti"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Ukázať spustené služby"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Procesy vo vyrov. pamäti"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"Predvolená aplikácia pre núdzový stav"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Aplikácia pre tiesňové volania"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Obnoviť predvoľby aplik."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Obnoviť predvoľby aplik.?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Táto akcia obnoví predvoľby pre:\n\n "<li>"zakázané aplikácie,"</li>\n" "<li>"upozornenia zakázaných aplikácií,"</li>\n" "<li>"predvolené aplikácie pre akcie,"</li>\n" "<li>"obmedzenia údajov v pozadí pre aplikácie,"</li>\n" "<li>"akékoľvek obmedzenia povolení."</li>\n\n" Nestratíte žiadne údaje aplikácií."</string>
@@ -1458,8 +1497,6 @@
     <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="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="select_logd_size_title" msgid="7433137108348553508">"Veľkosti vyrovnávacej pamäte denníka"</string>
@@ -1760,6 +1797,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 hodín"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 deň"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Zobraziť systém"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Skrytie systému"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Použiť Uss (jedinečnú veľkosť súpravy)"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Typ štatistík"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Pozadie"</string>
@@ -1856,7 +1894,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Aktuálne heslo:"</string>
@@ -2231,7 +2268,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Používateľ"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Obmedzený profil"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Pridať nového používateľa?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Vytvorením ďalších používateľov môžete toto zariadenie zdieľať s inými ľuďmi. Každý používateľ má svoje prostredie, ktoré si môže prispôsobiť vlastnými aplikáciami, tapetou atď. Používatelia tiež môžu upraviť nastavenia zariadenia (napr. Wi-Fi), ktoré ovplyvnia všetkých ostatných používateľov.\n\nKeď pridáte nového používateľa, musí si nastaviť vlastný priestor.\n\nAkýkoľvek používateľ môže aktualizovať aplikácie všetkých ostatných používateľov."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Toto zariadenie môžete zdieľať s inými ľuďmi tak, že vytvoríte ďalších používateľov. Každý používateľ má svoje prostredie, ktoré si môže prispôsobiť aplikáciami, tapetou atď. Môže tiež upraviť nastavenia zariadenia (napr. sieť Wi-Fi), ktoré ovplyvnia všetkých ostatných používateľov.\n\nKeď pridáte nového používateľa, musí si nastaviť vlastný priestor.\n\nKaždý používateľ môže aktualizovať aplikácie všetkých ostatných používateľov."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Keď pridáte nového používateľa, musí si nastaviť vlastný priestor.\n\nAkýkoľvek používateľ môže aktualizovať aplikácie všetkých ostatných používateľov."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Chcete teraz nastaviť používateľa?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Uistite sa, že je daná osoba k dispozícii a môže si na zariadení nastaviť svoj priestor."</string>
@@ -2414,6 +2451,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"predvolená aplikácia pre núdzový stav (ice)"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"aplik. sťahovanie aplikácie systémové"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"zabezpečenie povolení aplikácií"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"predvolené aplikácie"</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>
@@ -2428,14 +2466,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Hlasitosť budíkov"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Hlasitosť zvonenia"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Hlasitosť upozornení"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Blokovať prerušenia"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Povoliť iba prior. prerušenia"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatické pravidlá"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Pri prichádzajúcom hovore alebo 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_alarms" msgid="7380265858042606857">"Povoliť iba budíky"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Neprerušovať"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Iba prioritné"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Iba budíky"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Žiadne prerušenia"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tón zvonenia telefónu"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Predvolený tón upozornení"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrovať aj pri hovoroch"</string>
@@ -2470,17 +2506,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Nie sú nainštalované žiadne aplikácie na počúvanie upozornení."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Povoliť službu <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> bude môcť čítať všetky upozornenia, ktoré uverejní systém alebo ktorákoľvek z nainštalovaných aplikácií. Upozornenia môžu obsahovať osobné informácie, ako sú napríklad mená kontaktov alebo texty vám poslaných správ. Aplikácia bude tiež môcť tieto upozornenia zatvoriť alebo sa dotknúť tlačidiel akcií v upozorneniach."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Poskytovatelia podmienok"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Žiadne aplikácie neposkytujú podmienky"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="few">%d aplikácie poskytujú podmienky</item>
-      <item quantity="many">%d aplikácie poskytuje podmienky</item>
-      <item quantity="other">%d aplikácií poskytuje podmienky</item>
-      <item quantity="one">%d aplikácia poskytuje podmienky</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nie sú nainštalovaní žiadni poskytovatelia podmienok."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Povoliť službu <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> bude môcť pridávať podmienky ukončenia do režimu Nerušiť."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Načítavajú sa aplikácie..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokovať všetko"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nikdy nezobrazovať upozornenia z tejto aplikácie"</string>
@@ -2494,17 +2519,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priorita"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Citlivé"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Názov pravidla"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Pridať pravidlo"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Odstrániť pravidlo"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Chcete odstrániť pravidlo <xliff:g id="RULE">%1$s</xliff:g>?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Odstrániť"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Typ pravidla"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Neznáme"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Pravidlo konfigurácie"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Pravidlo plánovania"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Pravidlo sa nenašlo"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dni"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Žiadne"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Každý deň"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nikdy"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"Od <xliff:g id="START">%1$s</xliff:g> do <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="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>
@@ -2514,15 +2545,92 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Budíky"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Pripomenutia"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Udalosti"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Vybraní volajúci"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Volajúci, ktorí volajú opakovane"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Ak tá istá osoba zavolá druhýkrát do <xliff:g id="MINUTES">%d</xliff:g> min, povolíte hovor"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automaticky zapnúť"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nikdy"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Každú noc"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> nasledujúci deň"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Kedy chcete byť prerušený/-á?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Na aký čas?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Natrvalo"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> minúty</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> minúty</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minút</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minúta</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> hodiny</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> hodiny</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> hodín</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hodina</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Zmena na možnosť Iba prioritné upozornenia platná natrvalo"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="few">Zmena na možnosť Iba prioritné upozornenia platná <xliff:g id="DURATION">%1$d</xliff:g> minúty do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Zmena na možnosť Iba prioritné upozornenia platná <xliff:g id="DURATION">%1$d</xliff:g> minúty do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Zmena na možnosť Iba prioritné upozornenia platná <xliff:g id="DURATION">%1$d</xliff:g> minút do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Zmena na možnosť Iba prioritné upozornenia platná minútu do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="few">Zmena na možnosť Iba prioritné upozornenia platná <xliff:g id="DURATION">%1$d</xliff:g> hodiny (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="many">Zmena na možnosť Iba prioritné upozornenia platná <xliff:g id="DURATION">%1$d</xliff:g> hodiny (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Zmena na možnosť Iba prioritné upozornenia platná <xliff:g id="DURATION">%1$d</xliff:g> hodín (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Zmena na možnosť Iba prioritné upozornenia platná hodinu do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Zmena na možnosť Iba budíky platná natrvalo"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="few">Zmena na možnosť Iba budíky platná <xliff:g id="DURATION">%1$d</xliff:g> minúty (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="many">Zmena na možnosť Iba budíky platná <xliff:g id="DURATION">%1$d</xliff:g> minúty (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Zmena na možnosť Iba budíky platná <xliff:g id="DURATION">%1$d</xliff:g> minút (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Zmena na možnosť Iba budíky platná minútu do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="few">Zmena na možnosť Iba budíky platná <xliff:g id="DURATION">%1$d</xliff:g> hodiny do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Zmena na možnosť Iba budíky platná <xliff:g id="DURATION">%1$d</xliff:g> hodiny do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Zmena na možnosť Iba budíky platná <xliff:g id="DURATION">%1$d</xliff:g> hodín do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Zmena na možnosť Iba budíky platná hodinu do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Zmena na možnosť Neprerušovať platná natrvalo"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="few">Zmena na možnosť Neprerušovať platná <xliff:g id="DURATION">%1$d</xliff:g> minúty (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="many">Zmena na možnosť Neprerušovať platná <xliff:g id="DURATION">%1$d</xliff:g> minúty (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Zmena na možnosť Neprerušovať platná <xliff:g id="DURATION">%1$d</xliff:g> minút (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Zmena na možnosť Neprerušovať platná minútu do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="few">Zmena na možnosť Neprerušovať platná <xliff:g id="DURATION">%1$d</xliff:g> hodiny do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Zmena na možnosť Neprerušovať platná <xliff:g id="DURATION">%1$d</xliff:g> hodiny do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Zmena na možnosť Neprerušovať platná <xliff:g id="DURATION">%1$d</xliff:g> hodín do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Zmena na možnosť Neprerušovať platná hodinu do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Zmena na možnosť Vždy prerušiť"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"navždy"</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ť spätnú vazbu k tomuto zariadení"</string>
@@ -2566,7 +2674,7 @@
     <string name="launch_by_default" msgid="2184141780491382435">"Spúšťať ako predvolenú"</string>
     <string name="storage_summary_format" msgid="5419902362347539755">"V type úložiska <xliff:g id="STORAGE_TYPE">%2$s</xliff:g> je využité miesto s kapacitou <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="app_launch_domain_links_title" msgid="458956710410857777">"Odkazy na doménu"</string>
-    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Otvoriť doménové webové adresy"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Otvoriť webové adresy domény"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Povoliť aplikácii priamo otvárať webové adresy domény"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Podporované webové adresy domény"</string>
     <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Ďalšie predvolené"</string>
@@ -2589,7 +2697,12 @@
       <item quantity="other">Bolo udelených <xliff:g id="COUNT_1">%d</xliff:g> povolení</item>
       <item quantity="one">Bolo udelené <xliff:g id="COUNT_0">%d</xliff:g> povolenie</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="few"><xliff:g id="COUNT_2">%d</xliff:g> udelené povolenia z <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="many"><xliff:g id="COUNT_2">%d</xliff:g> udeleného povolenia z <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> udelených povolení z <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> udelené povolenie z <xliff:g id="COUNT_1">%d</xliff:g></item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Je predvolená pre niektoré akcie"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Nie je predvolená pre žiadne akcie"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Všetky aplikácie"</string>
@@ -2600,8 +2713,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritné"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Citlivé"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"S webovými adresami domény"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Resetujete predvolené hodnoty vo všetkých aplikáciách"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"Boli nainštalované aplikácie vrátane systémových a stiahnutých aplikácií (počet: <xliff:g id="COUNT">%d</xliff:g>)"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Zakázané správcom"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Rozšírené"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Neznáma aplikácia"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Výber profilu"</string>
@@ -2618,4 +2730,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikácií môže otvoriť webové adresy svojej domény</item>
       <item quantity="one">Jedna aplikácia môže otvoriť webové adresy svojej domény</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Nebol rozpoznaný"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Predvolené aplikácie"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Prehliadač"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Žiadny predvolený prehliadač"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Predvolené)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 56b920e..1038c6a 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Pritisnite gumb"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"Predstavnosti"</item>
     <item msgid="7924928667052300589">"Naprava"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"groba lokacija"</item>
+    <item msgid="5789673140227507995">"natančna lokacija"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibriranje"</item>
+    <item msgid="3434165993711230924">"branje stikov"</item>
+    <item msgid="616161687718081936">"spreminjanje stikov"</item>
+    <item msgid="7638002295329050091">"branje dnevnika klicev"</item>
+    <item msgid="6546959730920410907">"spreminjanje dnevnika klicev"</item>
+    <item msgid="446877710771379667">"branje koledarja"</item>
+    <item msgid="7674458294386319722">"spreminjanje koledarja"</item>
+    <item msgid="8281201165558093009">"iskanje omrežij Wi-Fi"</item>
+    <item msgid="8694611243479480497">"obvestilo"</item>
+    <item msgid="7776439107987345446">"iskanje celic mobilnega omrežja"</item>
+    <item msgid="514615766544675057">"klicanje telefonske številke"</item>
+    <item msgid="8181415497109310680">"branje sporočil SMS"</item>
+    <item msgid="6816551144382117307">"pisanje sporočil SMS"</item>
+    <item msgid="4600463921908905030">"prejemanje sporočil SMS"</item>
+    <item msgid="5958926493289432745">"prejemanje sporočil SMS v sili"</item>
+    <item msgid="4945269495221089540">"prejemanje sporočil MMS"</item>
+    <item msgid="5570472453573929087">"prejemanje potisnih sporočil WAP"</item>
+    <item msgid="7125408150230860501">"pošiljanje sporočil SMS"</item>
+    <item msgid="7080337936612188061">"branje sporočil SMS na kartici SIM"</item>
+    <item msgid="587124103118495063">"pisanje sporočil SMS na kartici SIM"</item>
+    <item msgid="2320577158869025503">"spreminjanje nastavitev"</item>
+    <item msgid="1545733463471924009">"vlečenje na vrh"</item>
+    <item msgid="3609046903962454582">"dostop do obvestil"</item>
+    <item msgid="4671646036128214513">"fotoaparat"</item>
+    <item msgid="1097324338692486211">"snemanje zvoka"</item>
+    <item msgid="5031552983987798163">"predvajanje zvoka"</item>
+    <item msgid="8374996688066472414">"preberi odložišče"</item>
+    <item msgid="3045529469061083747">"spremeni odložišče"</item>
+    <item msgid="5124443975763747838">"gumbi za predstavnosti"</item>
+    <item msgid="4547883971364273343">"fokus zvoka"</item>
+    <item msgid="2603878814882344450">"glavna glasnost"</item>
+    <item msgid="7136963238377062018">"glasnost glasu"</item>
+    <item msgid="4270236897655923007">"glasnost zvonjenja"</item>
+    <item msgid="6325739889222559394">"glasnost predstavnosti"</item>
+    <item msgid="5762123934816216821">"glasnost alarma"</item>
+    <item msgid="785049718065337473">"glasnost obvestila"</item>
+    <item msgid="6700305533746877052">"glasnost za Bluetooth"</item>
+    <item msgid="2029227495214047094">"ohrani odklenjen zaslon"</item>
+    <item msgid="26109888160231211">"spremljanje lokacije"</item>
+    <item msgid="5753382310468855812">"nadzor natančno določene lokacije"</item>
+    <item msgid="3356591542543137332">"pridobivanje statističnih podatkov o uporabi"</item>
+    <item msgid="3073734345226842233">"izklop/vklop mikrofona"</item>
+    <item msgid="1148142988678569310">"predstavnost projektov"</item>
+    <item msgid="9130014005474445273">"aktiviranje omrežja VPN"</item>
+    <item msgid="1165192162975045562">"ozadje pisanja"</item>
+    <item msgid="7129487923652967258">"struktura pomoči"</item>
+    <item msgid="1069023208100114540">"posnetek zaslona pomoči"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Lokacija"</item>
+    <item msgid="8677040780775113033">"Lokacija"</item>
+    <item msgid="1660743989948992916">"Lokacija"</item>
+    <item msgid="8791172739860195290">"Vibriranje"</item>
+    <item msgid="383413555642128046">"Branje stikov"</item>
+    <item msgid="3654594895269697313">"Spreminjanje stikov"</item>
+    <item msgid="7928393476362362538">"Branje dnevnika klicev"</item>
+    <item msgid="6248591205254641116">"Spreminjanje dnevnika klicev"</item>
+    <item msgid="6093344633066170692">"Branje koledarja"</item>
+    <item msgid="1334886368750347692">"Spreminjanje koledarja"</item>
+    <item msgid="1638204101698708656">"Lokacija"</item>
+    <item msgid="2154671955760380322">"Objava obvestila"</item>
+    <item msgid="4282477730595931828">"Lokacija"</item>
+    <item msgid="4891423912898525905">"Klicanje telefonske številke"</item>
+    <item msgid="2623604824935968113">"Branje sporočil SMS/MMS"</item>
+    <item msgid="4420177125221176306">"Pisanje sporočil SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Prejemanje sporočil SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Prejemanje sporočil SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Prejemanje sporočil SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Prejemanje sporočil SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Pošiljanje sporočil SMS/MMS"</item>
+    <item msgid="3527273606643794973">"Branje sporočil SMS/MMS"</item>
+    <item msgid="4370895547001583812">"Pisanje sporočil SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Spreminjanje nastavitev"</item>
+    <item msgid="736541391767350377">"Vlečenje na vrh"</item>
+    <item msgid="5530815681721654194">"Dostop do obvestil"</item>
+    <item msgid="781213371706962767">"Fotoaparat"</item>
+    <item msgid="1720492593061838172">"Snemanje zvoka"</item>
+    <item msgid="3493046322001257041">"Predvajanje zvoka"</item>
+    <item msgid="136815868796597058">"Preberi odložišče"</item>
+    <item msgid="5238692940326972503">"Spremeni odložišče"</item>
+    <item msgid="5753789168376302997">"Gumbi za predstavnosti"</item>
+    <item msgid="3265262911688671938">"Osredotočenost zvoka"</item>
+    <item msgid="2098976479485046797">"Glavna glasnost"</item>
+    <item msgid="5660213838861789350">"Glasnost glasu"</item>
+    <item msgid="7983336752371254444">"Glasnost zvonjenja"</item>
+    <item msgid="7878027809189330917">"Glasnost predstavnosti"</item>
+    <item msgid="7260546305036218513">"Glasnost alarma"</item>
+    <item msgid="9103719301075748925">"Glasnost obvestila"</item>
+    <item msgid="7025966722295861512">"Glasnost Bluetootha"</item>
+    <item msgid="4665183401128289653">"Ohrani odklenjen zaslon"</item>
+    <item msgid="8584357129746649222">"Lokacija"</item>
+    <item msgid="7669257279311110599">"Lokacija"</item>
+    <item msgid="3459320345690097795">"Pridobivanje statističnih podatkov o uporabi"</item>
+    <item msgid="1312534577834048535">"Izklop/vklop mikrofona"</item>
+    <item msgid="5906017727368097853">"Predstavnost projektov"</item>
+    <item msgid="2486614710846178542">"Aktiviranje omrežja VPN"</item>
+    <item msgid="5586547561693629602">"Ozadje pisanja"</item>
+    <item msgid="32794179825485062">"Struktura pomoči"</item>
+    <item msgid="7872852746938272552">"Posnetek zaslona pomoči"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kratko"</item>
     <item msgid="2560532955514699713">"Srednja"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"nizko"</item>
     <item msgid="4212263919458209842">"kritično"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Izklopljeno"</item>
-    <item msgid="5656544177755411222">"Omejene prekinitve"</item>
-    <item msgid="8735337502532332056">"Nič prekinitev"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Običajno"</item>
     <item msgid="866544120205026771">"Zmerno"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 1726434..f43c75d 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -270,12 +270,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Kartica SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Nastavitve strežnika proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Prekliči"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"PREKLIČI"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"NADALJUJ"</string>
     <string name="okay" msgid="1997666393121016642">"V redu"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"DA"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NE"</string>
-    <string name="forget" msgid="7267115980248732932">"OPUSTI"</string>
+    <string name="forget" msgid="1400428660472591263">"Pozabi"</string>
+    <string name="save" msgid="879993180139353333">"Shrani"</string>
+    <string name="done" msgid="6942539184162713160">"Končano"</string>
     <string name="settings_label" msgid="1626402585530130914">"Nastavitve"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Nastavitve"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Bližnjica do nastavitev"</string>
@@ -378,7 +376,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Priključite polnilnik in poskusite znova."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ni kode PIN ali gesla za zaklepanje zaslona"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Preden lahko začnete s šifriranjem, morate nastaviti kodo PIN ali geslo za zaklepanje zaslona."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Če želite potrditi šifriranje naprave, morate narisati vzorec za odklepanje."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Želite šifrirati?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Šifriranja ne morete razveljaviti ali prekiniti, ker lahko izgubite podatke. Šifriranje traja eno uro ali več in v tem času se bo tablični računalnik večkrat znova zagnal."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Šifriranja ne morete razveljaviti ali prekiniti, ker lahko izgubite podatke. Šifriranje traja eno uro ali več in v tem času se bo telefon večkrat znova zagnal."</string>
@@ -423,8 +420,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Vzorec"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Koda PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Geslo"</string>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Ko nastavite zaklepanje zaslona, lahko tudi nastavite prstni odtis v »Nastavitve &gt; Varnost«."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Izklopi zaklepanje zaslona"</string>
     <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>
@@ -538,8 +534,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Dodatno"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Dodatne nast. za Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Ko je Bluetooth vklopljen, lahko vaša naprava komunicira z drugimi napravami Bluetooth v bližini."</string>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Zaradi večje natančnosti ugotavljanja lokacije bodo aplikacije in storitve iskale naprave Bluetooth, tudi če je Bluetooth izklopljen. To lahko spremenite v <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nastavitvah iskanja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Vzpostavi povezavo z ..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Povezava med napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> in zvokom nosilca podatkov bo prekinjena."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Povezava med napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> in prostoročnim zvokom bo prekinjena."</string>
@@ -605,8 +600,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Zaradi večje natančnosti ugotavljanja lokacije bodo aplikacije in storitve iskale omrežja Wi‑Fi, tudi če je Wi‑Fi izklopljen. To lahko spremenite v <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nastavitvah iskanja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Tega ne kaži več"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Ohrani povezavo Wi-Fi med spanjem"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi vklop. v stanju priprav."</string>
@@ -623,8 +617,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Išči"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Dodatno"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Pokaži aplikacije"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Pokaži moč Wi-Fi-ja"</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>
@@ -682,6 +674,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Ali se želite prijaviti, da se lahko povežete?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> zahteva spletno prijavo pred povezavo v omrežje."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"POVEŽI"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"To omrežje nima dostopa do interneta. Ga želite kljub temu uporabljati?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Ne sprašuj več za to omrežje"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Vzpostavi povezavo"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Vzpostavljanje povezave z omrežjem ni uspelo"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Pozabi"</string>
@@ -748,21 +742,17 @@
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Prenosna dostopna točka 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">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Klicanje prek Wi-Fi-ja"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Nastavitev klicanja"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Način klicanja prek Wi-Fi-ja"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Prednostno – Wi-Fi"</item>
     <item msgid="5267397515594230396">"Prednostno – mobilno omrežje"</item>
-    <item msgid="3132912693346866895">"Samo Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Ko je vklopljeno klicanje prek omrežja Wi-Fi, lahko telefon preusmeri klice prek omrežij Wi-Fi ali omrežja operaterja na podlagi vaše nastavitve in moči signala. Pred vklopom te funkcije pri operaterju preverite cene in druge podrobnosti."</string>
     <string name="home_settings" msgid="212375129455718176">"Začetna stran"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Zaslon"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvok"</string>
@@ -936,12 +926,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Na voljo (samo za branje)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Skupno prostora"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Izračunavanje ..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplikacije (podatki o aplik. in medijska vsebina)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Aplikacije in podatki o aplikacijah"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Predstavnost"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Prenosi"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Slike, videoposnetki"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Zvok (glasba, melodije zvonjenja, podcasti ipd.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Razno"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Druge datoteke"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Predpomnjeni podatki"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Izpni skupno shrambo"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Izpni kartico SD"</string>
@@ -974,6 +964,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Izpenjanje poteka"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Prostor za shranjevanje bo pošel"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Nekatere sistemske funkcije, na primer sinhronizacija, morda ne delujejo pravilno. Poskusite sprostiti nekaj prostora tako, da zbrišete ali odpnete elemente, kot so aplikacije ali medijska vsebina."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Preimenovanje"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Vpenjanje"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Izvrženje"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Izbris in formatiranje"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Izbris in form. kot not. shr."</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Povezava USB z računalnikom"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Povezava USB z računalnikom"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Vzpostavi povezavo kot"</string>
@@ -984,6 +979,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Omogoča, da aplikacije, ki podpirajo MIDI, delujejo prek povezave USB s programsko opremo za MIDI v računalniku."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Drugi uporabniki"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Shramba naprave"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Izmenljiva shramba"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"Razpoložljivo: <xliff:g id="FREE">%1$s</xliff:g> (Skupaj: <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Vpeto: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Tega ni bilo mogoče vpeti: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"To je varno izvrženo: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Tega ni bilo mogoče varno izvreči: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"To je formatirano: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Tega ni bilo mogoče formatirati: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Preimenovanje shrambe"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Po formatiranju lahko uporabljate to shrambo (<xliff:g id="NAME_0">^1</xliff:g>) v drugih napravah. \n\nVsi podatki v tej shrambi (<xliff:g id="NAME_1">^1</xliff:g>) bodo izbrisani. Priporočamo, da podatke prej varnostno kopirate. \n\n"<b>"Varnostno kopiranje fotografij in druge predstavnosti"</b>" \nPremaknite predstavnostne datoteke v drugo shrambo v tej napravi ali jih s kablom USB prenesite v računalnik. \n\n"<b>"Varnostno kopiranje aplikacij"</b>" \nVse aplikacije, shranjene v tej shrambi (<xliff:g id="NAME_6">^1</xliff:g>), bodo odstranjene in podatki aplikacij izbrisani. Če želite ohraniti te aplikacije, jih premaknite v drugo shrambo v tej napravi."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Ko izvržete to shrambo (<xliff:g id="NAME_0">^1</xliff:g>), bodo aplikacije, shranjene v njej, prenehale delovati, predstavnostne datoteke, shranjene v njej, pa ne bodo na voljo, dokler je ne vstavite znova."</b>" \n\nTa shramba (<xliff:g id="NAME_1">^1</xliff:g>) je formatirana tako, da deluje samo v tej napravi. V drugih ne bo delovala."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Nastavitev imena za: <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Uporaba kot prenosna shramba"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Za premikanje fotografij in druge predstavnosti med napravami."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Uporaba kot notranja shramba"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Za shranjevanje česar koli samo v tej napravi, vključno z aplikacijami in fotografijami. Zahteva formatiranje, ki onemogoča delovanje z drugimi napravami."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Format. kot notranja shramba"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Če želite, da bo shramba <xliff:g id="NAME_0">^1</xliff:g> varna, jo morate formatirati. \n\nPo formatiranju bo ta shramba (<xliff:g id="NAME_1">^1</xliff:g>) delovala samo v tej napravi. \n\n"<b>"S formatiranjem se izbrišejo vsi podatki, ki so trenutno shranjeni v shrambi (<xliff:g id="NAME_2">^1</xliff:g>)."</b>" Če se želite izogniti izgubi podatkov, priporočamo, da jih varnostno kopirate."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Izbris in formatiranje"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatiranje shrambe <xliff:g id="NAME">^1</xliff:g> …"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Med formatiranjem ne odstranite shrambe <xliff:g id="NAME">^1</xliff:g>."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Premik podatkov v novo shrambo"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Fotografije, datoteke in podatke aplikacij lahko premaknete v novo shrambo (<xliff:g id="NAME">^1</xliff:g>). \n\nPremik traja približno <xliff:g id="TIME">^2</xliff:g> in bo sprostil <xliff:g id="SIZE">^3</xliff:g> prostora v notranji shrambi. Nekatere aplikacije med premikanjem ne bodo delovale."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Premik zdaj"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Premik pozneje"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Premik podatkov zdaj"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Premik traja približno <xliff:g id="TIME">^1</xliff:g>. Sprostil bo <xliff:g id="SIZE">^2</xliff:g> prostora v notranji shrambi."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Premik"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Premikanje podatkov …"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Med premikanjem: \n• Ne odstranite shrambe (<xliff:g id="NAME">^1</xliff:g>). \n• Nekatere aplikacije ne bodo delovale pravilno. \n• Naprava naj bo napolnjena."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"Shramba <xliff:g id="NAME">^1</xliff:g> je nared"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Shramba <xliff:g id="NAME">^1</xliff:g> je pripravljena za uporabo s fotografijami in drugo predstavnostjo."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Nova shramba <xliff:g id="NAME">^1</xliff:g> deluje. \n\nČe želite premikati fotografije, datoteke in podatke aplikacij vanjo, odprite »Nastavitve« &gt; »Shramba«."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Premik aplikacije <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Premik aplikacije <xliff:g id="APP">^1</xliff:g> in njenih podatkov v shrambo <xliff:g id="NAME_0">^2</xliff:g> bo trajal samo nekaj trenutkov. Dokler premik ne bo dokončan, aplikacije ne bo mogoče uporabljati. \n\nShrambe <xliff:g id="NAME_1">^2</xliff:g> med premikanjem ne odstranite."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Premikanje aplikacije <xliff:g id="APP">^1</xliff:g> …"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Shrambe <xliff:g id="NAME">^1</xliff:g> med premikanjem ne odstranite. \n\nAplikacija <xliff:g id="APP">^2</xliff:g> v tej napravi ne bo na voljo, dokler premik ne bo dokončan."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Preklic premika"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Stanje baterije"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Raven napolnjenosti baterije"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN-ji"</string>
@@ -1028,13 +1062,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Ponastavi na privzeto"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Ponastavitev privzetih nastavitev APN-jev končana"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Ponastavitev omrežnih nastavitev"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"S tem bodo na tovarniške nastavitve ponastavljene vse nastavitve, povezane z omrežnimi povezavami, vključno s temi:\n\n"<li>"Wi-Fi"</li>\n<li>"Prenos podatkov v mobilnih omrežjih"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"S tem bodo ponastavljene vse omrežne nastavitve, vključno s temi:\n\n"<li>"Wi‑Fi"</li>\n<li>"Prenos podatkov v mobilnih omrežjih"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Ponastavi nastavitve"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Ali želite ponastaviti vse omrežne nastavitve? Tega dejanja ni mogoče razveljaviti."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Ali želite ponastaviti vse omrežne nastavitve? Tega dejanja ni mogoče razveljaviti."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Ponastavi nastavitve"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Če želite potrditi ponastavitev omrežnih nastavitev, morate narisati vzorec za odklepanje."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Želite ponastaviti?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Omrežne nastavitve so ponastavljene"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Omrežne nastavitve so ponastavljene"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Ponastavi napravo"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Ponastavitev na tovarniške nastavitve"</string>
     <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>
@@ -1050,9 +1083,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Izbriši vse podatke na kartici SD, na primer glasbo ali fotografije."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Ponastavi tablični računalnik"</string>
     <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_desc" msgid="1062841478823409667">"Ž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_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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Ponastavitev na tovarniške nastavitve ni na voljo za tega uporabnika"</string>
@@ -1069,8 +1101,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Nastavite telefonski predal, preusmeritev klicev, čakajoči klic, ID klicatelja"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Internet prek USB-ja"</string>
@@ -1102,7 +1132,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoč"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobilna omrežja"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Naročniški paket za mobilno napravo"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Privzeta aplikacija za SMS-e"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplikacija za SMS-je"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Ali želite zamenjati aplikacijo za SMS-e?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Ali želite za SMS-e namesto aplikacije <xliff:g id="CURRENT_APP">%2$s</xliff:g> uporabljati aplikacijo <xliff:g id="NEW_APP">%1$s</xliff:g>?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Ali želite za SMS-e uporabljati aplikacijo <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
@@ -1133,6 +1163,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Uporaba GPS-ja za določanje lokacije"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Iskanje"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Iskanje"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Iskanje omrežij Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Izboljšajte natančnost lokacijskih podatkov, tako da aplikacijam in storitvam omogočite iskanje omrežij Wi-Fi, tudi ko je povezava Wi-Fi izklopljena."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Iskanje naprav Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Izboljšajte natančnost lokacijskih podatkov, tako da sistemskim storitvam omogočite iskanje naprav Bluetooth, tudi ko je Bluetooth izklopljen."</string>
     <string name="location_network_based" msgid="6010456018401296590">"Lokac. z Wi-Fi-jem in mob. om."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Aplikacijam omogočite hitrejše določanje lokacije z Googlovo storitvijo za določanje lokacije. Anonimni podatki o lokaciji bodo zbrani in poslani Googlu."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Določanje lokacije z Wi‑Fi-jem"</string>
@@ -1178,11 +1212,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Geslo je nastavljeno"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Koda PIN je nastavljena"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Vzorec je nastavljen"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Če želite nadaljevati, uporabite vzorec za napravo."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Če želite nadaljevati, vnesite kodo PIN za napravo."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Če želite nadaljevati, vnesite geslo za napravo."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Napačna koda PIN"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Napačno geslo"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Napačen vzorec"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Varnost naprave"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Spremeni vzorec za odklepanje"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Spremeni kodo PIN za odklepanje"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potrdite shranjeni vzorec"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Poskusite znova:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Nariši vzorec za odklepanje"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Če želite pomoč, pritisnite meni."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Ko končate, dvignite prst"</string>
@@ -1204,8 +1242,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Nastavi vzorec za odklepanje"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Spremeni vzorec za odklepanje"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Kako narisati vzorec za odklepanje"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Preveč napačnih poskusov!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Čez <xliff:g id="NUMBER">%d</xliff:g> sekund poskusite znova."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Preveč napačnih poskusov. Poskusite znova čez <xliff:g id="NUMBER">%d</xliff:g> s."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Aplikacija ni nameščena v telefonu."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Upravljaj aplikacije"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Upravljanje in odstranjevanje nameščenih aplikacij"</string>
@@ -1256,8 +1293,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Razvrsti po velikosti"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Pokaži storitve, ki se izvajajo"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Pokaži predpom. procese"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Aplikacija v sili"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Ponast. nast. aplikacije"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Ponastavitev nastavitev?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"S tem se bodo ponastavile vse nastavitve za:\n\n "<li>"onemogočene aplikacije,"</li>\n" "<li>"obvestila za onemogočene aplikacije,"</li>\n" "<li>"privzete aplikacije za dejanja,"</li>\n" "<li>"omejitev prenosa podatkov v ozadju za aplikacije,"</li>\n" "<li>"omejitve dovoljenj."</li>\n\n" Podatkov iz aplikacij ne boste izgubili."</string>
@@ -1461,8 +1497,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Zajemi vse pakete Bluetooth HCI v datoteko"</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="select_logd_size_title" msgid="7433137108348553508">"Velikosti medpomnilnikov zapisovalnika dnevnika"</string>
@@ -1763,6 +1797,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 ur"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dan"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Prikaz sistemskih"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Skrivanje sistemskih procesov"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uporaba USS-ja"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Vrsta statističnih podatkov"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"V ozadju"</string>
@@ -1859,7 +1894,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Trenutno geslo:"</string>
@@ -2234,7 +2268,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Uporabnik"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Omejen profil"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Dodajanje novega uporabnika?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"To napravo lahko daste v skupno rabo z drugimi, tako da ustvarite dodatne uporabnike. Vsak ima svoj prostor, ki ga lahko prilagodi z aplikacijami, ozadji in drugim. Uporabniki lahko tudi prilagodijo nastavitve naprave, ki vplivajo na vse, na primer nastavitve omrežja Wi-Fi.\n\nKo dodate novega uporabnika, mora ta nastaviti svoj prostor.\n\nVsak uporabnik lahko posodobi aplikacije za vse druge uporabnike."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"To napravo lahko daste v skupno rabo z drugimi, tako da ustvarite dodatne uporabnike. Vsak ima svoj prostor, ki ga lahko prilagodi z aplikacijami, ozadji in drugim. Uporabniki lahko tudi prilagodijo nastavitve naprave, ki vplivajo na vse, na primer nastavitve omrežja Wi-Fi.\n\nKo dodate novega uporabnika, mora ta nastaviti svoj prostor.\n\nVsak uporabnik lahko posodobi aplikacije za vse druge uporabnike."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Ko dodate novega uporabnika, mora ta nastaviti svoj prostor.\n\nVsak uporabnik lahko posodobi aplikacije za vse druge uporabnike."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Želite uporabnika nastaviti zdaj?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Prepričajte se, da ima oseba čas za nastavitev svojega prostora v napravi"</string>
@@ -2414,10 +2448,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"omejitev omeji omejeno"</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_reset_apps" msgid="6420313678620788457">"ponastavitev nastavitve privzeto"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"privzeta aplikacija za uporabo v sili"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"aplikacije prenos sistem"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"varnost dovoljenj za aplikacije"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"aplikacije privzeto"</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>
@@ -2432,14 +2466,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Glasnost alarma"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Glasnost zvonjenja"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Glasnost obvestila"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Blokiranje prekinitev"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Dovoljeno samo prednostno"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Samodejna pravila"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Ob prejemu klicev in 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_alarms" msgid="7380265858042606857">"Dovoli samo alarme"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ne prekinjaj"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Samo prednostno"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Samo alarmi"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Brez prekinitev"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Melodija zvonjenja telefona"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Privzeti ton zvonjenja za obvestila"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibriranje tudi za klice"</string>
@@ -2474,17 +2506,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Ni nameščenih poslušalcev obvestil."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Želite omogočiti <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Poslušalec <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> bo lahko bral vsa obvestila, ki jih objavi sistem ali katera koli nameščena aplikacija, kar lahko vključuje osebne podatke, kot so imena stikov in besedilo sporočil, poslanih vam. Lahko bo tudi opustil ta obvestila ali se dotikal interaktivnih gumbov v njih."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Ponudniki pogojev"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nobena aplikacija ne ponuja pogojev"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="one">%d aplikacija ponuja pogoje</item>
-      <item quantity="two">%d aplikaciji ponujata pogoje</item>
-      <item quantity="few">%d aplikacije ponujajo pogoje</item>
-      <item quantity="other">%d aplikacij ponuja pogoje</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Ni nameščenih ponudnikov pogojev."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Želite omogočiti <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"Ponudnik pogojev <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> bo lahko dodal pogoje za izhod iz načina »Ne moti«."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Nalaganje aplikacij ..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokiraj vse"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nikoli ne pokaži obvestil za to aplikacijo"</string>
@@ -2498,17 +2519,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prednost"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Občutljivo"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Ime pravila"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Dodaj pravilo"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Izbris pravila"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Želite izbrisati pravilo »<xliff:g id="RULE">%1$s</xliff:g>«?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Izbris"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Vrsta pravila"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Neznano"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Konfiguriranje pravila"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Pravilo razporeda"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Pravila ni mogoče najti."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dnevi"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Brez"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Vsak dan"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nikoli"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"Od <xliff:g id="START">%1$s</xliff:g> do <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="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>
@@ -2518,15 +2545,92 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmi"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Opomniki"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Dogodki"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Izbrani klicatelji"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Klicatelji, ki večkrat kličejo"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Dovoljeno, če ista oseba kliče že drugič v <xliff:g id="MINUTES">%d</xliff:g> min."</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Samodejni vklop"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nikoli"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Vsako noč"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> naslednji dan"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Kdaj želite, da se vas zmoti?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Za koliko časa?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Za nedoločen čas"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> minuta</item>
+      <item quantity="two"><xliff:g id="COUNT_1">%d</xliff:g> minuti</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minut</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ura</item>
+      <item quantity="two"><xliff:g id="COUNT_1">%d</xliff:g> uri</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> ure</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ur</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Sprememba na samo prednostna obvestila za nedoločen čas"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Sprememba na samo prednostna obvestila za <xliff:g id="DURATION">%1$d</xliff:g> minuto do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="two">Sprememba na samo prednostna obvestila za <xliff:g id="DURATION">%1$d</xliff:g> minuti do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Sprememba na samo prednostna obvestila za <xliff:g id="DURATION">%1$d</xliff:g> minute do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Sprememba na samo prednostna obvestila za <xliff:g id="DURATION">%1$d</xliff:g> minut do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Sprememba na samo prednostna obvestila za <xliff:g id="DURATION">%1$d</xliff:g> uro (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="two">Sprememba na samo prednostna obvestila za <xliff:g id="DURATION">%1$d</xliff:g> uri (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">Sprememba na samo prednostna obvestila za <xliff:g id="DURATION">%1$d</xliff:g> ure (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Sprememba na samo prednostna obvestila za <xliff:g id="DURATION">%1$d</xliff:g> ur (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Sprememba na samo alarme za nedoločen čas"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">Sprememba na samo alarme za <xliff:g id="DURATION">%1$d</xliff:g> minuto (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="two">Sprememba na samo alarme za <xliff:g id="DURATION">%1$d</xliff:g> minuti (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">Sprememba na samo alarme za <xliff:g id="DURATION">%1$d</xliff:g> minute (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Sprememba na samo alarme za <xliff:g id="DURATION">%1$d</xliff:g> minut (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="one">Sprememba na samo alarme za <xliff:g id="DURATION">%1$d</xliff:g> uro do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="two">Sprememba na samo alarme za <xliff:g id="DURATION">%1$d</xliff:g> uri do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Sprememba na samo alarme za <xliff:g id="DURATION">%1$d</xliff:g> ure do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Sprememba na samo alarme za <xliff:g id="DURATION">%1$d</xliff:g> ur do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Sprememba na nastavitev ne prekinjaj za nedoločen čas"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Sprememba na nastavitev ne prekinjaj za <xliff:g id="DURATION">%1$d</xliff:g> minuto (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="two">Sprememba na nastavitev ne prekinjaj za <xliff:g id="DURATION">%1$d</xliff:g> minuti (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">Sprememba na nastavitev ne prekinjaj za <xliff:g id="DURATION">%1$d</xliff:g> minute (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Sprememba na nastavitev ne prekinjaj za <xliff:g id="DURATION">%1$d</xliff:g> minut (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Sprememba na nastavitev ne prekinjaj za <xliff:g id="DURATION">%1$d</xliff:g> uro do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="two">Sprememba na nastavitev ne prekinjaj za <xliff:g id="DURATION">%1$d</xliff:g> uri do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Sprememba na nastavitev ne prekinjaj za <xliff:g id="DURATION">%1$d</xliff:g> ure do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Sprememba na nastavitev ne prekinjaj za <xliff:g id="DURATION">%1$d</xliff:g> ur do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Sprememba na vedno prekini"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"za vedno"</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>
@@ -2593,7 +2697,12 @@
       <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> odobrena dovoljenja</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> odobrenih dovoljenj</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one">Število odobrenih dovoljenj: <xliff:g id="COUNT_2">%d</xliff:g> od <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="two">Število odobrenih dovoljenj: <xliff:g id="COUNT_2">%d</xliff:g> od <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="few">Število odobrenih dovoljenj: <xliff:g id="COUNT_2">%d</xliff:g> od <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="other">Število odobrenih dovoljenj: <xliff:g id="COUNT_2">%d</xliff:g> od <xliff:g id="COUNT_3">%d</xliff:g></item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Nastavljene so nekatere privzete nastavitve"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Ni privzetih nastavitev"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Vse aplikacije"</string>
@@ -2604,8 +2713,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prednostno"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Občutljivo"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Z URL-ji domene"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Ponastavi nastavitve v vseh aplikacijah na privzete"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"Število nameščenih aplikacij, vključno s sistemskimi in prenesenimi aplikacijami: <xliff:g id="COUNT">%d</xliff:g>"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Onemogočil skrbnik"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Dodatno"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Neznana aplikacija"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Izbira profila"</string>
@@ -2617,9 +2725,16 @@
     <string name="domain_urls_summary_one" msgid="3804994599497120956">"Odpre domeno »<xliff:g id="DOMAIN">%s</xliff:g>«"</string>
     <string name="domain_urls_summary_some" msgid="4859484048050301933">"Odpre domeno »<xliff:g id="DOMAIN">%s</xliff:g>« in povezane URL-je"</string>
     <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> aplikacija lahko odpre svoje URL-je domene</item>
-      <item quantity="two"><xliff:g id="COUNT">%d</xliff:g> aplikaciji lahko odpreta svoje URL-je domene</item>
-      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aplikacije lahko odprejo svoje URL-je domene</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikacij lahko odpre svoje URL-je domene</item>
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> aplikacija lahko odpre URL-je svoje domene</item>
+      <item quantity="two"><xliff:g id="COUNT">%d</xliff:g> aplikaciji lahko odpreta URL-je svoje domene</item>
+      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aplikacije lahko odprejo URL-je svoje domene</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikacij lahko odpre URL-je svoje domene</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Ni prepoznano"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Privzete aplikacije"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Brskalnik"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Ni privzetega brskalnika"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Privzeto)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index a217cfc..c433133 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"АКА"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Притискање дугмета"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"мала"</item>
     <item msgid="4212263919458209842">"критична"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Искључено"</item>
-    <item msgid="5656544177755411222">"Ограничен број прекида"</item>
-    <item msgid="8735337502532332056">"Без прекида"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Нормална"</item>
     <item msgid="866544120205026771">"Умерена"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index c7017a9..6ed96c5 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -269,12 +269,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD картица"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Подешавања за прокси"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ДА"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"НЕ"</string>
-    <string name="forget" msgid="7267115980248732932">"ЗАБОРАВИ"</string>
+    <string name="forget" msgid="1400428660472591263">"Заборави"</string>
+    <string name="save" msgid="879993180139353333">"Сачувај"</string>
+    <string name="done" msgid="6942539184162713160">"Готово"</string>
     <string name="settings_label" msgid="1626402585530130914">"Подешавања"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Подешавања"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Пречица подешавања"</string>
@@ -376,7 +374,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Укључите пуњач и покушајте поново."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Нема PIN-а или лозинке за закључавање екрана"</string>
     <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>
@@ -529,7 +526,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Напредна подешавања"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Напредни Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Када је Bluetooth укључен, уређај може да комуницира са другим Bluetooth уређајима у близини."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"Да би побољшале тачност локације, Google услуге ће тражити Bluetooth уређаје, чак и када је Bluetooth искључен. Ово можете да промените у LINK_BEGINподешавањима скенирањаLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Да би побољшале тачност локације, апликације и услуге ће скенирати Bluetooth уређаје, чак и када је Bluetooth искључен. Ово можете да промените у <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>подешавањима скенирања<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Повезивање са…"</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>
@@ -595,7 +592,7 @@
     <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" msgid="8382526568324164356">"Да би побољшале тачност локације, Google услуге ће тражити Wi‑Fi мреже, чак и када је Wi‑Fi искључен. Ово можете да промените у LINK_BEGINподешавањима скенирањаLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Да би унапредиле тачност лоцирања, апликације и услуге ће скенирати Wi‑Fi мреже, чак и када је Wi‑Fi искључен. То можете да промените у <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>подешавањима скенирања<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Не приказуј поново"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Не искључуј Wi-Fi током спавања"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi је укључен током спавања"</string>
@@ -612,8 +609,6 @@
     <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_apps" msgid="6003687912727859577">"Прикажи апликације"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Прикажи јачину за Wi-Fi"</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>
@@ -671,6 +666,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ПОВЕЖИ СЕ"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Ова мрежа нема приступ интернету. Желите ли ипак да је користите?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Не питај поново за ову мрежу"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Повежи"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Повезивање са мрежом није успело"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Заборави"</string>
@@ -737,21 +734,17 @@
     <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> преносни Wi‑Fi хотспот"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Позивање преко Wi-Fi-ја"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Подешавање позивања"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Режим позивања преко Wi-Fi-ја"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Предност има Wi-Fi"</item>
     <item msgid="5267397515594230396">"Предност има мобилна мрежа"</item>
-    <item msgid="3132912693346866895">"Само Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Када је Позивање преко Wi-Fi-ја укључено, телефон може да преусмерава позиве преко Wi-Fi мрежа или мреже мобилног оператера у зависности од тога које сте подешавање изабрали и који сигнал је јачи. Пре него што укључите ову функцију, информишите се код мобилног оператера о накнадама и другим детаљима."</string>
     <string name="home_settings" msgid="212375129455718176">"Почетна"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Приказ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
@@ -924,12 +917,12 @@
     <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="5128673488173839077">"Апликације и подаци апликација"</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_media_misc_usage" msgid="235452944021647124">"Разно"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Друге датотеке"</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>
@@ -962,6 +955,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Ослобађање у току"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Складишни простор је на измаку."</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Неке системске функције, као што је синхронизација, можда неће правилно функционисати. Покушајте да ослободите простор брисањем или откачињањем ставки, као што су апликације или медијски садржај."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Преименуј"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Прикључи"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Избаци"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Обриши и форматирај"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Обриши и форматирај интерну меморију"</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>
@@ -972,6 +970,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Омогућава апликацијама са омогућеним MIDI-јем да функционишу преко USB-а са MIDI софтвером на рачунару."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Остали корисници"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Меморија уређаја"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Преносива меморија"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"Слободно: <xliff:g id="FREE">%1$s</xliff:g> (укупно <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Уређај <xliff:g id="NAME">%1$s</xliff:g> је прикључен"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Прикључивање уређаја <xliff:g id="NAME">%1$s</xliff:g> није успело"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"Уређај <xliff:g id="NAME">%1$s</xliff:g> је безбедно избачен"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Безбедно избацивање уређаја <xliff:g id="NAME">%1$s</xliff:g> није успело"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"Уређај <xliff:g id="NAME">%1$s</xliff:g> је форматиран"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Форматирање није успело: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Преименујте меморију"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"После форматирања уређај <xliff:g id="NAME_0">^1</xliff:g> можете да користите са другим уређајима. \n\nСви подаци на овом уређају <xliff:g id="NAME_1">^1</xliff:g> биће обрисани. Размислите о томе да прво направите резервну копију података. \n\n"<b>"Направите резервну копију слика и других медија"</b>" \nПреместите медијске датотеке у алтернативну меморију на овом уређају или их пренесите на рачунар помоћу USB кабла. \n\n"<b>"Направите резервну копију апликација"</b>" \nСве апликације сачуване на овом уређају <xliff:g id="NAME_6">^1</xliff:g> биће деинсталиране и њихови подаци биће избрисани. Да бисте задржали ове апликације, преместите их у алтернативну меморију на овом уређају."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Када избаците овај уређај <xliff:g id="NAME_0">^1</xliff:g>, апликације које су на њему сачуване ће престати да функционишу и медијске датотеке које су на њему сачуване неће бити доступне док га поново не уметнете."</b>" \n\nУређај <xliff:g id="NAME_1">^1</xliff:g> се форматира да би функционисао само на овом уређају. Неће функционисати на другим уређајима."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Подесите уређај <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Користи као преносиву меморију"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"За пренос слика и других медија са једног уређаја на други."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Користи као интерну меморију"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"За чување података само на овом уређају, укључујући апликације и слике. Потребно је форматирање које спречава да меморијски уређај функционише са другим уређајима."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Форматир. као интерну меморију"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"За ово је потребно да се уређај <xliff:g id="NAME_0">^1</xliff:g> форматира да би био безбедан. \n\nПосле форматирања <xliff:g id="NAME_1">^1</xliff:g> ће функционисати само на овом уређају. \n\n"<b>"Форматирањем се бришу сви подаци који су тренутно сачувани на уређају <xliff:g id="NAME_2">^1</xliff:g>."</b>" Да не бисте изгубили податке, размислите о томе да направите резервну копију података."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Обриши и форматирај"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> се форматира…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Не уклањајте уређај <xliff:g id="NAME">^1</xliff:g> док се форматира."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Пренесите подат. у нову меморију"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Слике, датотеке и податке апликација можете да пренесете на овај нови уређај <xliff:g id="NAME">^1</xliff:g>. \n\nПренос траје <xliff:g id="TIME">^2</xliff:g> чиме се ослобађа <xliff:g id="SIZE">^3</xliff:g> интерне меморије. Неке апликације неће функционисати током преноса."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Пренеси одмах"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Пренеси касније"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Пренесите податке одмах"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Пренос траје око <xliff:g id="TIME">^1</xliff:g>. Ослободиће се <xliff:g id="SIZE">^2</xliff:g> интерне меморије."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Пренеси"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Подаци се преносе…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Током преноса: \n• Не уклањајте уређај <xliff:g id="NAME">^1</xliff:g>. \n• Неке апликације неће правилно функционисати. \n• Уређај треба да буде напуњен."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"Уређај <xliff:g id="NAME">^1</xliff:g> је спреман"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Уређај <xliff:g id="NAME">^1</xliff:g> је спреман да се користи за слике и друге медије."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Нови уређај <xliff:g id="NAME">^1</xliff:g> функционише. \n\nДа бисте пренели слике, датотеке и податке апликација на овај уређај, идите у Подешавања &gt; Меморија."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Пренесите апликацију <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Пренос апликације <xliff:g id="APP">^1</xliff:g> и њених података на уређај <xliff:g id="NAME_0">^2</xliff:g> трајаће неколико тренутака. Апликацију нећете моћи да користите док се пренос не заврши \n\nНе уклањајте меморијски уређај <xliff:g id="NAME_1">^2</xliff:g> током преноса."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> се преноси…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Не уклањајте уређај <xliff:g id="NAME">^1</xliff:g> током преноса. \n\nАпликација <xliff:g id="APP">^2</xliff:g> на овом уређају неће бити доступна док се пренос не заврши."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Откажи пренос"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Статус батерије"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Ниво батерије"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Називи приступних тачака"</string>
@@ -1016,13 +1053,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Поново постави подразумевано"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Поновно постављање подразумеваних подешавања назива приступне тачке је завршено"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Ресетуј подешавања мреже"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Овим ћете ресетовати сва подешавања у вези са умрежавањем на подразумеване фабричке вредности, укључујући:\n\n"<li>"Wi-Fi"</li>\n<li>"Мобилну везу за пренос података"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Овим ћете ресетовати сва подешавања мреже, укључујући:\n\n"<li>"Wi‑Fi"</li>\n<li>"Пренос података преко мобилне мреже"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Ресетуј подешавања"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Желите ли да ресетујете сва подешавања мреже? Ова радња не може да се опозове!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Желите ли да ресетујете сва подешавања мреже? Ова радња не може да се опозове!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Ресетуј подешавања"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Треба да нацртате шаблон за откључавање да бисте потврдили ресетовање подешавања мреже."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Желите ли да ресетујете?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Ресетуј подешавања мреже"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Подешавања мреже су ресетована"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Ресетуј уређај"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Ресетовање на фабричка подешавања"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Овим бришете све податке из "<b>"интерне меморије"</b>" таблета, укључујући:\n\n"<li>"Google налог"</li>\n<li>"Податке и подешавања система и апликација"</li>\n<li>"Преузете апликације"</li></string>
@@ -1038,9 +1074,8 @@
     <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="1062841478823409667">"Желите ли да обришете све личне податке и преузете апликације? Не можете да опозовете ову радњу!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Избриши све"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Ресетовање на фабричка подешавања није доступно за овог корисника"</string>
@@ -1057,8 +1092,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Подешавање гласовне поште, преусмеравања позива, стављања позива на чекање, ИД-а позиваоца"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB Интернет повезивање"</string>
@@ -1090,7 +1123,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Помоћ"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Мобилне мреже"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Тарифни пакет за мобилни уређај"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Подразумевана апликација за SMS"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Апликација за SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Желите ли да промените апликацију за SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Желите ли да користите <xliff:g id="NEW_APP">%1$s</xliff:g> уместо <xliff:g id="CURRENT_APP">%2$s</xliff:g> као апликацију за SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Желите ли да користите <xliff:g id="NEW_APP">%s</xliff:g> као апликацију за SMS?"</string>
@@ -1121,6 +1154,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Користите GPS за одређивање локације"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Скенирање"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Скенирање"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi скенирање"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Унапредите лоцирање тако што ћете дозволити апликацијама и услугама да скенирају Wi‑Fi мреже, чак и када је Wi‑Fi искључен"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth скенирање"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Унапредите лоцирање тако што ћете дозволити системским услугама да скенирају Bluetooth уређаје, чак и када је Bluetooth искључен"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Лок. на осн. Wi-Fi и моб. мреже"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Нека апл. користе Google-ову услугу лоцирања за брже одређивање локације. Анонимни подаци о локацији прикупљаће се и слати Google-у."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Локација се одређује помоћу Wi-Fi-ја"</string>
@@ -1166,11 +1203,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Лозинка је постављена"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN је постављен"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Шаблон је постављен"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Употребите шаблон за уређај да бисте наставили."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Унесите PIN уређаја да бисте наставили."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Унесите лозинку уређаја да бисте наставили."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Погрешан PIN"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Погрешна лозинка"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Погрешан шаблон"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Безбедност уређаја"</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_wrong" msgid="4694973540770105678">"Покушајте поново:"</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>
@@ -1192,8 +1233,7 @@
     <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" msgid="6909161623701848863">"Превише нетачних покушаја. Покушајте поново за <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>
@@ -1244,8 +1284,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Сортирај према величини"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Прикажи покренуте услуге"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Прикажи кеширане процесе"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Апликација за хитне случајеве"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Ресетуј подешавања аплик."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Жел. да ресет. под. апл.?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Овим ћете вратити на почетне вредности сва подешавања за:\n\n "<li>"Онемогућене апликације"</li>\n" "<li>"Обавештења о онемогућеним апликацијама"</li>\n" "<li>"Подразумеване апликације за радње"</li>\n" "<li>"Ограничења за позадинске податке за апликације"</li>\n" "<li>"Било каква ограничења за дозволе"</li>\n\n" Нећете изгубити никакве податке апликација."</string>
@@ -1449,8 +1488,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Сними све Bluetooth HCI пакете у датотеци"</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="select_logd_size_title" msgid="7433137108348553508">"Величине бафера података у програму за евидентирање"</string>
@@ -1751,6 +1788,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 сати"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 дан"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Прикажи систем"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Сакриј системске"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Користи јединствену величину скупа"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Тип статистичких података"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"У позадини"</string>
@@ -1847,7 +1885,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_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>
@@ -2222,7 +2259,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Корисник"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Ограничени профил"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Додајете новог корисника?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Можете да делите овај уређај са другим људима ако направите још корисника. Сваки корисник има сопствени простор, који може да прилагођава помоћу сопствених апликација, позадине и тако даље. Корисници могу да прилагођавају и подешавања уређаја која утичу на свакога, попут Wi‑Fi-ја.\n\nКада додате новог корисника, та особа треба да подеси сопствени простор.\n\nСваки корисник може да ажурира апликације за све остале кориснике."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Овај уређај са можете да делите другим људима ако направите још корисника. Сваки корисник има сопствени простор, који може да прилагођава помоћу апликација, позадине и тако даље. Корисници могу да прилагођавају и подешавања уређаја која утичу на свакога, попут Wi‑Fi-ја.\n\nКада додате новог корисника, та особа треба да подеси сопствени простор.\n\nСваки корисник може да ажурира апликације за све остале кориснике."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Када додате новог корисника, та особа треба да подеси сопствени простор.\n\nСваки корисник може да ажурира апликације за све остале кориснике."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Подешавате корисника одмах?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Проверите да ли је особа доступна да узме уређај и подеси свој простор"</string>
@@ -2402,10 +2439,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"ограничење ограничити ограничено"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"текст исправка исправити звук вибрирати аутоматски језик покрет предлагати предлог тема увредљиво реч куцати емоџи међународно"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"ресетуј на подразумевана подешавања"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"хитно у хитним случајевима апликација подразумевана"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"преузимање апликација, апликације, систем"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"апликације дозволе безбедност"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"подразумевано подешавање апликација"</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>
@@ -2420,14 +2457,12 @@
     <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="6948120138640252732">"Блокирај прекиде"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Дозвољени су само приоритети"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Аутоматска правила"</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_alarms" msgid="7380265858042606857">"Дозволи само аларме"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Не прекидај"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Само приоритетни прекиди"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Само аларми"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Без прекида"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Звук звона телефона"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Подразумевана мелодија звона обавештења"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Вибрација и за позиве"</string>
@@ -2461,16 +2496,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Нема инсталираних монитора обавештења."</string>
     <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">"Ниједна апликација не пружа услове"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="one">%d апликација пружа услове</item>
-      <item quantity="few">%d апликације пружају услове</item>
-      <item quantity="other">%d апликација пружа услове</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="loading_notification_apps" msgid="5031818677010335895">"Учитавање апликација..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блокирај све"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Никада не приказуј обавештења из ове апликације"</string>
@@ -2484,17 +2509,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"Назив правила"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Додај правило"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Избриши правило"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Желите ли да избришете правило „<xliff:g id="RULE">%1$s</xliff:g>“?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Избриши"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Тип правила"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Непознато"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Правило конфигурисања"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Правило распореда"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Правило није пронађено."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Дани"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Ниједан"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Сваког дана"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Никада"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"Од <xliff:g id="START">%1$s</xliff:g> до <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Позиви"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Поруке"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Позиви/поруке од"</string>
@@ -2504,15 +2535,84 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Аларми"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Подсетници"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Догађаји"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Изабрани позиваоци"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Поновни позиваоци"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Ако иста особа позове по други пут у периоду од <xliff:g id="MINUTES">%d</xliff:g> мин, дозволи позив"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"У <xliff:g id="FORMATTED_TIME">%s</xliff:g> следећег дана"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Када желите да вас прекинемо?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Колико дуго?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"На неодређено време"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> минут</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> минута</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> минута</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> сат</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> сата</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> сати</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Пребацује у режим само приоритетних обавештења на неодређено време"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Пребацује у режим само приоритетних обавештења у трајању од <xliff:g id="DURATION">%1$d</xliff:g> минута до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Пребацује у режим само приоритетних обавештења у трајању од <xliff:g id="DURATION">%1$d</xliff:g> минута до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Пребацује у режим само приоритетних обавештења у трајању од <xliff:g id="DURATION">%1$d</xliff:g> минута до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Пребацује у режим само приоритетних обавештења у трајању од <xliff:g id="DURATION">%1$d</xliff:g> сата (до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">Пребацује у режим само приоритетних обавештења у трајању од <xliff:g id="DURATION">%1$d</xliff:g> сата (до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Пребацује у режим само приоритетних обавештења у трајању од <xliff:g id="DURATION">%1$d</xliff:g> сати (до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Пребацује у режим само са алармима на неодређено време"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">Пребацује у режим само са алармима у трајању од <xliff:g id="DURATION">%1$d</xliff:g> минута (до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">Пребацује у режим само са алармима у трајању од <xliff:g id="DURATION">%1$d</xliff:g> минута (до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Пребацује у режим само са алармима у трајању од <xliff:g id="DURATION">%1$d</xliff:g> минута (до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="one">Пребацује у режим само са алармима у трајању од <xliff:g id="DURATION">%1$d</xliff:g> сата до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Пребацује у режим само са алармима у трајању од <xliff:g id="DURATION">%1$d</xliff:g> сата до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Пребацује у режим само са алармима у трајању од <xliff:g id="DURATION">%1$d</xliff:g> сати до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Пребацује у режим без узнемиравања на неодређено време"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Пребацује у режим без узнемиравања у трајању од <xliff:g id="DURATION">%1$d</xliff:g> минута (до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">Пребацује у режим без узнемиравања у трајању од <xliff:g id="DURATION">%1$d</xliff:g> минута (до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Пребацује у режим без узнемиравања у трајању од <xliff:g id="DURATION">%1$d</xliff:g> минута (до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Пребацује у режим без узнемиравања у трајању од <xliff:g id="DURATION">%1$d</xliff:g> сата до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Пребацује у режим без узнемиравања у трајању од <xliff:g id="DURATION">%1$d</xliff:g> сата до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Пребацује у режим без узнемиравања у трајању од <xliff:g id="DURATION">%1$d</xliff:g> сати до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Пребацује у режим увек прекидај"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"заувек"</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>
@@ -2578,7 +2678,11 @@
       <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> дозволе су одобрене</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> дозвола је одобрено</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one">Дата је <xliff:g id="COUNT_2">%d</xliff:g> од <xliff:g id="COUNT_3">%d</xliff:g> дозвола</item>
+      <item quantity="few">Дате су <xliff:g id="COUNT_2">%d</xliff:g> од <xliff:g id="COUNT_3">%d</xliff:g> дозвола</item>
+      <item quantity="other">Дато је <xliff:g id="COUNT_2">%d</xliff:g> од <xliff:g id="COUNT_3">%d</xliff:g> дозвола</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Подешене су неке подразумеване вредности"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Нису подешене подразумеване вредности"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Све апликације"</string>
@@ -2589,8 +2693,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Приоритетна"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Осетљива"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Са URL-овима домена"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Ресетујте подешавања за све апликације на подразумеване вредности"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"Број инсталираних апликација је <xliff:g id="COUNT">%d</xliff:g>, укључујући системске и преузете апликације"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Онемогућио је администратор"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Напредна"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Непозната апликација"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Изаберите профил"</string>
@@ -2606,4 +2709,11 @@
       <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> апликације могу да отварају URL-ове домена</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> апликација може да отвара URL-ове домена</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Није препознат"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Подразумеване апликације"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Апликација прегледача"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Нема подразумеваног прегледача"</string>
+    <string name="default_app" msgid="6864503001385843060">"(подразумевано)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 6e43cce..c4d1920 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Tryckknapp"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"låg"</item>
     <item msgid="4212263919458209842">"kritiskt låg"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Av"</item>
-    <item msgid="5656544177755411222">"Begränsade avbrott"</item>
-    <item msgid="8735337502532332056">"Inga avbrott"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Måttlig"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index b0da005..1b7584c 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kort"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy-inställningar"</string>
     <string name="cancel" msgid="6859253417269739139">"Avbryt"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"AVBRYT"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"FORTSÄTT"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"JA"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NEJ"</string>
-    <string name="forget" msgid="7267115980248732932">"GLÖM"</string>
+    <string name="forget" msgid="1400428660472591263">"Glöm"</string>
+    <string name="save" msgid="879993180139353333">"Spara"</string>
+    <string name="done" msgid="6942539184162713160">"Klar"</string>
     <string name="settings_label" msgid="1626402585530130914">"Inställningar"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Inställningar"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Genväg för inställningar"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Anslut laddaren och försök igen."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"PIN-kod eller lösenord saknas för skärmlåset"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Du måste ange en PIN-kod eller ett lösenord för skärmlåset innan du påbörjar krypteringen."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Du måste rita ditt grafiska lösenord för att bekräfta krypteringen av enheten."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Vill du kryptera?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Krypteringen kan inte ångras och om du avbryter den kan data försvinna. Det kan ta en timme eller mer och under tiden startas surfplattan om flera gånger."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Krypteringen kan inte ångras och om du avbryter den kan data försvinna. Det kan ta en timme eller mer och under tiden startas mobilen om flera gånger."</string>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avancerat"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Avancerad Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"När Bluetooth har aktiverats kan enheten kommunicera med andra Bluetooth-enheter i närheten."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"I syfte att förbättra platsangivelser kan Googles tjänster söka efter Bluetooth-enheter, även om Bluetooth har inaktiverats. Du kan ändra detta i LINK_BEGINsökinställningarnaLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"I syfte att förbättra platsangivelserna kan appar och tjänster söka efter Bluetooth-enheter, även om Bluetooth har inaktiverats. Du kan ändra detta i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>sökinställningarna<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Anslut till…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas ifrån medialjud."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas ifrån handsfree."</string>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"I syfte att förbättra platsangivelser kan Googles tjänster söka efter Wi-Fi-nätverk, även om Wi-Fi har inaktiverats. Du kan ändra detta i LINK_BEGINsökinställningarnaLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"I syfte att förbättra platsangivelserna kan appar och tjänster söka efter Wi-Fi-nätverk, även om Wi-Fi har inaktiverats. Du kan ändra detta i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>LINK_BEGIN_0sökinställningarna<xliff:g id="LINK_END_1">LINK_END</xliff:g>LINK_END_1."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Visa inte igen"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Behåll Wi-Fi i viloläge"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi på i viloläge"</string>
@@ -604,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skanna"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avancerad"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Visa appar"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Visa Wi-Fi-styrka"</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>
@@ -663,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Vill du logga in och ansluta?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> kräver onlineinloggning före ansl. till nätverk."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ANSLUT"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Nätverket har ingen internetåtkomst. Vill du ändå använda nätverket?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Fråga inte igen för det här nätverket"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Anslut"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Det gick inte att ansluta till nätverket."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Glöm"</string>
@@ -729,21 +726,17 @@
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Mobil Wi‑Fi-surfzon med <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="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi-samtal"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Samtalsinställningar"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi-samtalsläge"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi i första hand"</item>
     <item msgid="5267397515594230396">"Mobil i första hand"</item>
-    <item msgid="3132912693346866895">"Endast Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"När Wi-Fi-samtal har aktiverats kan mobilen dirigera samtal via Wi-Fi-nätverk eller operatörens nätverk, beroende på dina inställningar och vilken signal som är starkast. Innan du aktiverar funktionen frågar du operatören om eventuella avgifter och annan information."</string>
     <string name="home_settings" msgid="212375129455718176">"Startskärm"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skärm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ljud"</string>
@@ -915,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Tillgängligt (skrivskyddat)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Totalt utrymme"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Beräknas..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Appar (appdata och medieinnehåll)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Appar och appdata"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Nedladdningar"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Bilder, videor"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Ljud (musik, ringsignaler, poddsändningar m.m.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Misc."</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Andra filer"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Cachelagrade data"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Montera bort enhet"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Montera bort SD-kort"</string>
@@ -953,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Monterar bort"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Lagringsutrymmet börjar ta slut"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Vissa systemfunktioner, t.ex. synkronisering, fungerar kanske inte som de ska. Försök att frigöra utrymme genom att ta bort eller lossa objekt, till exempel appar eller medieinnehåll."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Byt namn"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Montera"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Mata ut"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Radera och formatera"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Rensa/format. som internminne"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB-anslutning till dator"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-anslutning till dator"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Anslut som"</string>
@@ -963,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Gör så att appar som stöder MIDI kan användas med MIDI-program på datorn via USB."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Andra användare"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Lagring på enhet"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Externa lagringsenheter"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> ledigt (totalt <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> har monterats"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Det gick inte att montera <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> har matats ut på ett säkert sätt"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Det gick inte att mata ut <xliff:g id="NAME">%1$s</xliff:g> på ett säkert sätt"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> har formaterats"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Det gick inte att formatera <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Byt namn på lagringsutrymmet"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Efter formateringen kan du använda ditt <xliff:g id="NAME_0">^1</xliff:g> på andra enheter. \n\nAll data på detta <xliff:g id="NAME_1">^1</xliff:g> raderas, så tänk på att säkerhetskopiera först. \n\n"<b>"Säkerhetskopiera foton och annan media"</b>" \nFlytta mediefilerna till ett annat lagringsutrymme på enheten, eller överför dem till en dator via USB-kabel. \n\n"<b>"Säkerhetskopiera appar"</b>" \nAlla appar som har lagrats på ditt <xliff:g id="NAME_6">^1</xliff:g> avinstalleras och deras data raderas. Om du vill behålla apparna flyttar du dem till ett annat lagringsutrymme på enheten."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"När du matar ut ditt <xliff:g id="NAME_0">^1</xliff:g> slutar appar som har lagrats på det att fungera, och mediefiler som har lagrats blir inte tillgängliga förrän det har kopplats in igen."</b>" \n\nDitt <xliff:g id="NAME_1">^1</xliff:g> är formaterat för att endast fungera på den här enheten. Det fungerar inte på andra enheter."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Konfigurera ditt <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Använd som bärbar lagringsenhet"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Flytta foton och annan media mellan enheter."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Använd som internminne"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Lagra vad du vill, endast på den här enheten (inklusive appar och foton). Formatering som hindrar att det fungerar på andra enheter krävs."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatera som internminne"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Detta kräver att ditt <xliff:g id="NAME_0">^1</xliff:g> formateras så att det blir säkert. \n\nEfter formateringen fungerar ditt <xliff:g id="NAME_1">^1</xliff:g> endast på den här enheten. \n\n"<b>"Formateringen raderar all data som har lagrats på ditt <xliff:g id="NAME_2">^1</xliff:g>."</b>" Säkerhetskopiera data om du vill undvika att förlora den."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Radera och formatera"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formaterar <xliff:g id="NAME">^1</xliff:g> …"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Ta inte bort ditt <xliff:g id="NAME">^1</xliff:g> medan det formateras."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Flytta data till ny lagring"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Du kan flytta foton, filer och appdata till ditt nya <xliff:g id="NAME">^1</xliff:g>. \n\nDet tar omkring <xliff:g id="TIME">^2</xliff:g> och <xliff:g id="SIZE">^3</xliff:g> av internminnet frigörs. Vissa appar fungerar inte under tiden."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Flytta nu"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Flytta senare"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Flytta data nu"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Flytten tar omkring <xliff:g id="TIME">^1</xliff:g>. <xliff:g id="SIZE">^2</xliff:g> av internminnet frigörs."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Flytta"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Flyttar data ..."</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Under flytten: \n• Ta inte bort ditt <xliff:g id="NAME">^1</xliff:g>. \n• Vissa appar fungerar inte som de ska. \n• Håll enheten laddad."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"Ditt <xliff:g id="NAME">^1</xliff:g> är klart"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Ditt <xliff:g id="NAME">^1</xliff:g> är klart att använda med foton och annan media."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Ditt nya <xliff:g id="NAME">^1</xliff:g> fungerar. \n\nOm du vill flytta foton, filer och appdata till enheten öppnar du Inställningar &gt; Lagring."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Flytta <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Det tar bara några minuter att flytta <xliff:g id="APP">^1</xliff:g> och dess data till <xliff:g id="NAME_0">^2</xliff:g>. Du kan inte använda appen förrän flytten är klar. \n\nTa inte bort ditt <xliff:g id="NAME_1">^2</xliff:g> under flytten."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Flyttar <xliff:g id="APP">^1</xliff:g> …"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Ta inte bort ditt <xliff:g id="NAME">^1</xliff:g> under flytten. \n\nAppen <xliff:g id="APP">^2</xliff:g> på den här enheten blir inte tillgänglig förrän flytten är klar."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Avbryt flytten"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Batteristatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Batterinivå"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN:er"</string>
@@ -1007,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Återställ standardinst."</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Återställning av standardinställningar för APN har slutförts."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Nätverksinställningarna har återställts"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Alla inställningar kopplade till nätverket kommer att återställas till standardinställningarna, inklusive inställningarna för: \n\n"<li>"Wi-Fi"</li>\n<li>"mobildata"</li>\n<li>"Bluetooth"</li>"."</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Alla nätverksinställningar kommer att återställas, inklusive:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobildata"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Återställ inställningar"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Vill du återställa alla nätverksinställningar? Det går inte att ångra den här åtgärden."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Vill du återställa alla nätverksinställningar? Det går inte att ångra den här åtgärden."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Återställ inställningar"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Du måste rita ditt grafiska lösenord om du vill återställa nätverksinställningarna."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Vill du återställa?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Nätverksinställningarna har återställts"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Nätverksinställningarna har inte återställts"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Återställ enhet"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Återställ standardinst."</string>
     <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>
@@ -1029,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Radera alla data på SD-kortet, som musik och foton."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Återställ surfplattan"</string>
     <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 nedladdade appar? Åtgärden kan inte ångras."</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Vill du radera alla personliga uppgifter och alla nedladdade appar? Det går inte att ångra den här åtgärden."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Radera allt"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Den här användaren kan inte återställa till standardinställningarna"</string>
@@ -1048,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Ställ in röstbrevlåda, vidarebefordra samtal, samtal väntar, nummerpres."</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Internetdelning via USB"</string>
@@ -1081,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjälp"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobilnät"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilplan"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Standardapp för sms"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Sms-app"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vill du byta sms-app?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Vill du använda <xliff:g id="NEW_APP">%1$s</xliff:g> som sms-app i stället för <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Vill du använda <xliff:g id="NEW_APP">%s</xliff:g> som sms-app?"</string>
@@ -1112,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Avgör plats med hjälp av GPS"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Genomsöker"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Genomsöker"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi-sökning"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Förbättra platsangivelserna genom att låta appar och tjänster söka efter Wi-Fi-nätverk, även om Wi-Fi har inaktiverats."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth-sökning"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Förbättra platsangivelserna genom att låta systemtjänster söka efter Bluetooth-enheter, även om Bluetooth har inaktiverats."</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi- och mobilnätsplats"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Ge appar möjlighet att snabbare se var du är med Googles platstjänst. Anonym platsinformation samlas in och skickas till Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Platsen fastställs via Wi-Fi"</string>
@@ -1157,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Lösenordet angavs"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-koden angavs"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Lösenordet har angetts"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Fortsätt genom att ange enhetens grafiska lösenord."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Fortsätt genom att ange enhetens pinkod."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Fortsätt genom att ange enhetens lösenord."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Fel pinkod"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Fel lösenord"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Fel grafiskt lösenord"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Säkerhet för enhet"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Byt grafiskt lösenord"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Ändra PIN-kod för upplåsning"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Bekräfta sparat grafiskt lösenord"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Försök igen:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Rita ett grafiskt lösenord"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Tryck på Menu om du vill ha hjälp."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Lyft fingret när du är klar"</string>
@@ -1183,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Ange grafiskt lösenord"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Byt grafiskt lösenord"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Så här ritar du ett grafiskt lösenord"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"För många felaktiga försök!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Försök igen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"För många felaktiga försök. Försök igen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Appen är inte installerad på mobilen."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Hantera appar"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Hantera och ta bort installerade appar"</string>
@@ -1235,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sortera efter storlek"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Visa tjänster som körs"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Visa cachade processer"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"App för nödsituationer"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Återställ inställningarna"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Vill du återställa?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Det återställer alla inställningar för:\n\n "<li>"Inaktiverade appar"</li>\n" "<li>"Inaktiverade appmeddelanden"</li>\n" "<li>"Standardappar för åtgärder"</li>\n" "<li>"Begränsningar i bakgrundsdata för appar"</li>\n" "<li>"Begränsningar för alla behörigheter"</li>\n\n" Ingen appdata kommer att försvinna."</string>
@@ -1440,8 +1479,6 @@
     <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="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="select_logd_size_title" msgid="7433137108348553508">"Buffertstorlekar för logg"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 timmar"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dag"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Visa system"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Dölj systemet"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Använd USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistiktyp"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Bakgrundsprocesser"</string>
@@ -1838,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nuvarande lösenord:"</string>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Användare"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Begränsad profil"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Lägga till ny användare?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Du kan dela enheten med andra om du skapar flera användare. Varje användare får sitt eget utrymme som de kan anpassa som de vill med appar, bakgrund och så vidare. Användarna kan även ändra enhetsinställningar som påverkar alla, t.ex. Wi‑Fi.\n\nNär du lägger till en ny användare måste den personen konfigurera sitt utrymme.\n\nAlla användare kan uppdatera appar för samtliga användares räkning."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Du kan dela enheten med andra om du skapar flera användare. Alla användare får sitt eget utrymme som de kan anpassa som de vill med appar, bakgrund och så vidare. Användarna kan även ändra enhetsinställningar som påverkar alla, till exempel Wi‑Fi.\n\nNär du lägger till en ny användare måste han eller hon konfigurera sitt utrymme.\n\nAlla användare kan uppdatera appar för samtliga användares räkning."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"När du lägger till en ny användare måste den personen konfigurera sitt utrymme.\n\nAlla användare kan uppdatera appar för samtliga användares räkning."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Konfigurera användare nu?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Kontrollera att personen har möjlighet att ta enheten och konfigurera sitt utrymme"</string>
@@ -2393,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"begränsning begränsa begränsad"</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_reset_apps" msgid="6420313678620788457">"återställa inställningar standardinställningar"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"nödsituation i nödfall standardapp"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"appar ladda ned appar system"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"appar behörigheter säkerhet"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"appar standard"</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>
@@ -2411,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmvolym"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Ringvolym"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Aviseringsvolym"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Blockera avbrott"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Tillåt endast prioriterade"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatiska regler"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Vid inkommande samtal och aviseringar"</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 samtal och aviseringar"</string>
-    <string name="zen_mode_option_alarms" msgid="7380265858042606857">"Tillåt endast alarm"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Avbryt inte"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Bara prioriterade"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Endast alarm"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Inga avbrott"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefonens ringsignal"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Standardsignal för avisering"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrera också vid samtal"</string>
@@ -2451,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Inga meddelandelyssnare har installerats."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Vill du aktivera <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> kommer att kunna läsa alla meddelanden från systemet eller en installerad app. Meddelandena kan innehålla personliga uppgifter som kontaktnamn och texten i meddelanden som skickas till dig. Lyssnaren kan även avvisa sådana meddelanden eller trycka på åtgärdsknappar i dem."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Appar som innehåller villkor"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Inga appar innehåller villkor"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d appar innehåller villkor</item>
-      <item quantity="one">%d app innehåller villkor</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Inga appar som innehåller villkor har installerats."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Vill du aktivera <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> kan lägga till avslutningsvillkor till läget Stör ej."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Läser in appar ..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blockera alla"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Visa aldrig aviseringar från den här appen"</string>
@@ -2473,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritet"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Känsligt"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Regelnamn"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Lägg till regel"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Ta bort regel"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Vill du ta bort regeln <xliff:g id="RULE">%1$s</xliff:g>?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Radera"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Regeltyp"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Okänd"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Konfigurera regel"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Schemalägg regel"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Regeln hittades inte."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dagar"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Inga"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Varje dag"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Aldrig"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> till <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2493,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarm"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Påminnelser"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Händelser"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Valda personer som ringer"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Återuppringning"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Om samma person ringer upp en andra gång inom <xliff:g id="MINUTES">%d</xliff:g> minuter ska detta tillåtas"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Aktivera automatiskt"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Aldrig"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Varje kväll"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> nästa dag"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"När vill du bli avbruten?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Hur länge?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Tills vidare"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minuter</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minut</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> timmar</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> timme</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Ändra till endast prioriterade aviseringar tills vidare"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Ändra till endast prioriterade aviseringar i <xliff:g id="DURATION">%1$d</xliff:g> minuter till och med <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Ändra till endast prioriterade aviseringar i en minut till och med <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Ändra till endast prioriterade aviseringar i <xliff:g id="DURATION">%1$d</xliff:g> timmar (till och med <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Ändra till endast prioriterade aviseringar i en timme till och med <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Ändra till endast alarm tills vidare"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Ändra till endast alarm i <xliff:g id="DURATION">%1$d</xliff:g> minuter (till och med <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Ändra till endast alarm i en minut till och med <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Ändra till endast alarm i <xliff:g id="DURATION">%1$d</xliff:g> timmar till och med <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Ändra till endast alarm i en timme till och med <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Ändra till avbryt inte tills vidare"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Ändra till inga avbrott i <xliff:g id="DURATION">%1$d</xliff:g> minuter (till och med <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Ändra till inga avbrott i en minut till och med <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Ändra till inga avbrott i <xliff:g id="DURATION">%1$d</xliff:g> timmar till och med <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Ändra till inga avbrott i en timme till och med <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Ändra till avbryt alltid"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"för alltid"</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 enheten"</string>
@@ -2566,7 +2659,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> behörigheter har getts</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> behörighet har getts</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> av <xliff:g id="COUNT_3">%d</xliff:g> behörigheter har beviljats</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> av <xliff:g id="COUNT_1">%d</xliff:g> behörighet har beviljats</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Några standardinställningar har angetts"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Inga standardinställningar har angetts"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Alla appar"</string>
@@ -2577,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritet"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Känsligt"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Med domänadresser"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Återställ inställningarna i alla apps till standardinställningarna"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> appar har installerats, inklusive systemappar och nedladdade appar"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Har inaktiverats av administratören"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avancerat"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Okänd app"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Välj profil"</string>
@@ -2593,4 +2688,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> appar kan öppna domänadresser</item>
       <item quantity="one">En app kan öppna domänadresser</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Identifierades inte"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Standardappar"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Webbläsarapp"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Ingen standardwebbläsare"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Standard)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index eb82329..ca1d4d6 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Kichupo cha kusukuma"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"chini"</item>
     <item msgid="4212263919458209842">"muhimu"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Kimezimwa"</item>
-    <item msgid="5656544177755411222">"Ukatizwaji mdogo"</item>
-    <item msgid="8735337502532332056">"Haikatizwi kabisa"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Kawaida"</item>
     <item msgid="866544120205026771">"Wastani"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index fc59636..a2a77f0 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -270,12 +270,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Kadi ya SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Mipangilio ya seva mbadala"</string>
     <string name="cancel" msgid="6859253417269739139">"Ghairi"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"GHAIRI"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"ENDELEA"</string>
     <string name="okay" msgid="1997666393121016642">"Sawa"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"NDIYO"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"HAPANA"</string>
-    <string name="forget" msgid="7267115980248732932">"SAHAU"</string>
+    <string name="forget" msgid="1400428660472591263">"Sahau"</string>
+    <string name="save" msgid="879993180139353333">"Hifadhi"</string>
+    <string name="done" msgid="6942539184162713160">"Nimemaliza"</string>
     <string name="settings_label" msgid="1626402585530130914">"Mipangilio"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Mipangilio"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Mipangilio ya njia ya mkato"</string>
@@ -376,7 +374,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Tafadhali weka chaja yako kisha ujaribu tena."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Hakuna PIN ya kufunga skrini au nenosiri"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Unahitaji kuweka PIN au nenosiri la kufunga skrini kabla kuanza usimbaji fiche."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Unahitaji kuweka mchoro wako wa kufungua ili uthibitishe usimbaji kwa njia fiche wa kifaa chako."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Simba?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Uendeshaji usimbaji fiche hauwezi kutenduliwa na ukiukatiza, utapoteza data. Usimbaji fiche huchukua saa moja au zaidi, wakati huo kompyuta kibao itajiwasha mara kadhaa."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Uendeshaji usimbaji fiche hauwezi kutenduliwa na ukiukatiza, utapoteza data. Usimbaji fiche huchukua saa moja au zaidi, wakati huo simu itajiwasha mara kadhaa."</string>
@@ -525,7 +522,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Mipangilio ya kina"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth mahiri"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetooth ikiwa imewashwa, kifaa chako kinaweza kuwasiliana na vifaa vingine vyenye Bluetooth vilivyo karibu."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"Ili kuboresha usahihi wa kutambua mahali, huduma za Google zitatafuta vifaa vya Bluetooth, hata wakati Bluetooth imezimwa. Unaweza kubadilisha hali hii katika LINK_BEGINmipangilio ya kutafutaLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Ili kuboresha usahihi wa kutambua mahali, programu na huduma zitaangalia vifaa vya Bluetooth, hata wakati Bluetooth imezimwa. Unaweza kubadilisha hali hii katika <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>mipangilio ya kuchanganua<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Unganisha kwa..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> itatenganishwa kutoka kwa sauti ya media."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> itatenganishwa kutoka kwa sauti ya kifaa kisichotumia mikono."</string>
@@ -591,7 +588,7 @@
     <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" msgid="8382526568324164356">"Ili kuboresha usahihi wa kutambua mahali, huduma za Google zitatafuta vifaa vya Wi-Fi, hata wakati Wi-Fi imezimwa. Unaweza kubadilisha hali hii katika LINK_BEGINmipangilio ya kutafutaLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Ili kuboresha usahihi wa kutambua mahali, programu na huduma zitaangalia mitandao ya Wi-Fi, hata wakati Wi-Fi imezimwa. Unaweza kubadilisha hali hii katika <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>mipangilio ya kutafuta<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Usionyeshe tena"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Washa Wi-Fi wakati wa kulala"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi iwashwe hata katika hali tuli"</string>
@@ -608,8 +605,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi ya Moja kwa Moja"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Tafuta"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Mipangilio ya kina"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Onyesha Programu"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Onyesha Nguvu ya WiFi"</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>
@@ -667,6 +662,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"ngependa kuingia katika akaunti ili uunganishe?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> inahitaji uingie katika akaunti mtandaoni kabla ya kuunganisha mtandao."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"UNGANISHA"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Mtandao huu hauna ufikiaji kwa Intaneti. Je, ungependa kutumia mtandao huu hata hivyo?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Usiulizie mtandao huu tena"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Unganisha"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Imeshindwa kuunganisha kwa mtandao"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Sahau"</string>
@@ -738,12 +735,10 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Inayopendelea Wi-Fi"</item>
     <item msgid="5267397515594230396">"Inayopendelea mitandao ya simu za mkononi"</item>
-    <item msgid="3132912693346866895">"Wi-Fi pekee"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wakati kipengele cha upigaji simu kwa Wi-Fi kimewashwa, simu yako inaweza kuelekeza simu kupitia mitandao ya Wi-Fi au mtandao wa mtoa huduma wako, kutegemea na mapendeleo yako na ni mawimbi yapi yaliyo thabiti. Kabla ya kuwasha kipengele hiki, angalia ada na maelezo mengine kwa mtoa huduma wako."</string>
     <string name="home_settings" msgid="212375129455718176">"Mwanzo"</string>
@@ -917,12 +912,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Inapatikana (soma-tu)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Jumla ya nafasi"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Inahesabu..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Programu (data na maudhui ya media)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Programu na data ya programu"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"media"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Vipakuliwa"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Picha, video"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Sauti (muziki, toni milio, podikasti n.k)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Mengineyo."</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Faili nyingine"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Data iliyowekwa kwenye akiba"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Angua hifadhi iliyoshirikishwa"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Ondoa kadi ya SD"</string>
@@ -955,6 +950,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Shughuli ya kuanguliwa inaendelea"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Nafasi ya kuhifadhi inakwisha"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Baadhi ya vipengee vya mfumo, kama vile usawazishaji, huenda visifanye kazi vizuri. Jaribu kuongeza nafasi kwa kufuta au kubanua vipengee, kama vile programu au maudhui ya vyombo vya habari."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Badilisha jina"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Pachika"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Ondoa"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Futa data yote na upangilie upye"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Futa na upangilie upya kama hifadhi ya mfumo"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Kuunganishwa kwenye kompyuta kwa USB"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Kuunganishwa kwenye kompyuta kwa USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Unganisha kama"</string>
@@ -965,6 +965,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Huruhusu programu zinazotumia MIDI zifanye kazi kupitia USB kwa kutumia programu ya MIDI kwenye kompyuta yako."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Watumiaji wengine"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Hifadhi ya kifaa"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Hifadhi unayoweza kuondoa"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> haijatumika (Jumla <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> imepachikwa"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Haikuweza kupachika <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> imeondolewa kwa usalama"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Haikuweza kuondoa <xliff:g id="NAME">%1$s</xliff:g> kwa usalama"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> imepangiliwa upya"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Haikuweza kupangilia upya <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Badilisha jina la hifadhi"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Baada ya kupanga, unaweza kutumia <xliff:g id="NAME_0">^1</xliff:g> hii katika vifaa vingine. \n\nData yote katika <xliff:g id="NAME_1">^1</xliff:g> hii itafutwa. Hifadhi nakala rudufu ya maudhui yaliyomo humo kwanza. \n\n"<b>"Hifadhi nakala rudufu ya picha na maudhui mengine"</b>" \nHamishia faili zako za maudhui kwenye hifadhi mbadala katika kifaa hiki, au uyahamishie kwenye kompyuta ukitumia kebo ya USB. \n\n"<b>"Hifadhi nakala rudufu ya programu"</b>" \nProgramu zote zilizohifadhiwa katika <xliff:g id="NAME_6">^1</xliff:g> hii zitaondolewa na data yake ifutwe. Ili kusalia na programu hizi, zihamishie kwenye hifadhi mbadala katika kifaa hiki."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Unapoondoa <xliff:g id="NAME_0">^1</xliff:g> hii, programu zilizohifadhiwa ndani yake zitaacha kufanya kazi, na faili za maudhui zilizohifadhiwa ndani yake hazitapatikana hadi itakapopachikwa tena."</b>" \n\n <xliff:g id="NAME_1">^1</xliff:g> hii imepangiliwa ili ifanye kazi kwenye kifaa hiki pekee. Haitafanya kazi kwenye vifaa vingine vyovyote."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Sanidi <xliff:g id="NAME">^1</xliff:g> yako"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Tumia kama hifadhi inayohamishika"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Kwa ajili ya kuhamisha picha na maudhui mengine kati ya vifaa."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Tumia kama hifadhi ya ndani"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Kwa ajili ya kuhifadhi kitu chochote kwenye kifaa hiki tu, ikiwa ni pamoja na programu na picha. Inahitaji kupangwa ili isifanye kazi na vifaa vingine."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Panga kawa hifadhi ya ndani"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Hii inahitaji <xliff:g id="NAME_0">^1</xliff:g> ipangwe upya ili kuifanya salama. \n\nBaada ya kuipanga, <xliff:g id="NAME_1">^1</xliff:g> hii itafanya kazi kwenye kifaa hiki pekee. \n\n"<b>"Kupanga kutafuta data yote iliyohifadhiwa kwa sasa katika <xliff:g id="NAME_2">^1</xliff:g>."</b>" Kuepuka kupoteza data, hifadhi nakala rudufu."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Futa data yote na upange upya"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Inapanga <xliff:g id="NAME">^1</xliff:g>..."</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Usiondoe <xliff:g id="NAME">^1</xliff:g> inapopanga."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Hamishia data kwenye hifadhi mpya"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Unaweza kuhamishia picha zako, faili, na data ya programu kwenye <xliff:g id="NAME">^1</xliff:g> hii mpya. \n\nKuhamisha kunachukua takriban <xliff:g id="TIME">^2</xliff:g> na kutaacha nafasi ya <xliff:g id="SIZE">^3</xliff:g> kwenye hifadhi ya ndani. Baadhi ya programu huenda hazitafanya kazi uhamishaji unapoendelea."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Hamisha sasa"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Hamisha baadaye"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Hamisha data sasa"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Kuhamisha kutachukua takriban <xliff:g id="TIME">^1</xliff:g>. Kutaacha nafasi ya <xliff:g id="SIZE">^2</xliff:g> kwenye hifadhi ya ndani."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Hamisha"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Hamisha data..."</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Wakati wa kuhamisha: \n•Usiondoe <xliff:g id="NAME">^1</xliff:g>. \n • Baadhi ya programu hazitafanya kazi kwa usahihi. \n •Weka kifaa kikae na chaji."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> iko tayari"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> yako iko tayari kutumiwa na picha na maudhui mengine."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> yako mpya inafanya kazi. \n\nKuhamishia picha, faili na data ya programu kwenye kifaa hiki, nenda kwenye Mipangilio &gt; Hifadhi."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Hamisha <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Kuhamisha <xliff:g id="APP">^1</xliff:g> na data yake kwenda <xliff:g id="NAME_0">^2</xliff:g> kutachukua dakika chache tu. Hutaweza kutumia programu hadi ukamilishe kuhamisha. \n\nUsiondoe <xliff:g id="NAME_1">^2</xliff:g> wakati wa kuhamisha."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Inahamisha <xliff:g id="APP">^1</xliff:g>..."</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Usionde <xliff:g id="NAME">^1</xliff:g> wakati wa kuhamisha. \n\nProgramu ya <xliff:g id="APP">^2</xliff:g> haitapatikana kwenye kifaa hiki hadi ukamilishe kuhamisha."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Ghairi kuhamisha"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Hali ya betri"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Kiwango cha betri"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1009,13 +1048,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Rudisha kwenye chaguo-msingi"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Kuweka upya kwa mipangilio mbadala ya APN kumekamilika"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Mipangilio ya mtandao imewekwa upya"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Hii itaweka upya mipangilio yote inayohusiana na mitandao kuwa ile iliyowekwa viwandani kama chaguo msingi, ikiwemo:\n\n"<li>"Wifi"</li>\n<li>"Data ya vifaa vya mkononi"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Hatua hii itaweka upya mipangilio yote ya mtandao, ikiwemo: \n\n"<li>"Wi-Fi"</li>\n<li>"Data ya simu za mkononi"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Weka upya mipangilio"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Ungependa kuweka upya mipangilio yote ya mtandao? Huwezi kutendua kitendo hiki."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Ungependa kuweka upya mipangilio yote ya mtandao? Huwezi kutendua kitendo hiki."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Weka upya mipangilio"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Unahitaji kuweka mchoro wako wa kufungua ili uthibitishe kuweka upya mipangilio ya mtandao."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Iwekwe upya?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Mipangilio ya mtandao imewekwa upya"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Mipangilio ya mtandao imewekwa upya"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Zima na uwashe tena kifaa"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Rejesha data ya mwanzo"</string>
     <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>
@@ -1031,9 +1069,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Futa data zote kwenye kadi ya SD, kama vile muziki au picha."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Rejesha mipangilio ambayo kompyuta kibao ilitoka nayo kiwandani"</string>
     <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_desc" msgid="1062841478823409667">"Ungependa kufuta maelezo yako yote ya kibinafsi na programu zilizopakuliwa? Huwezi kutendua hatua hii!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Futa kila kitu"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Urejeshaji wa mipangilio ya kiwandani haupatikani kwa mtumiaji huyu"</string>
@@ -1050,8 +1087,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Weka mipangilio ya ujumbe wa sauti, kupitisha simu, kusubiri simu, kitambulisho cha mteja"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Shiriki intaneti kwa USB"</string>
@@ -1083,7 +1118,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Usaidizi"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mitandao ya simu za mkononi"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mpango wa vifaa vya mkononi"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Programu chaguo-msingi ya SMS"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Programu ya SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Ungependa kubadilisha programu ya SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Ungependa kutumia <xliff:g id="NEW_APP">%1$s</xliff:g> badala ya <xliff:g id="CURRENT_APP">%2$s</xliff:g> kama programu yako ya SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Ungependa kutumia <xliff:g id="NEW_APP">%s</xliff:g> kama programu yako ya SMS?"</string>
@@ -1116,6 +1151,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Tumia GPS kutambua eneo"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Kuchanganua"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Kuchanganua"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi inachanganua"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Boresha huduma za mahali kwa kuruhusu programu na huduma ziangalie mitandao ya Wi-Fi hata wakati Wi-Fi imezimwa"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth inachanganua"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Boresha mahali kwa kuruhusu huduma za mfumo ziangalie vifaa vya Bluetooth, hata wakati Bluetooth imezimwa"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Mahali pa mtandao wa Wi-Fi na simu za mkononi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Ruhusu programu zitumie huduma ya Google ya kutambua eneo ili kukadiria mahali ulipo kwa haraka. Data ya mahali isiyokutambulisha itakusanywa na kutumwa kwa Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Eneo limethibitishwa na Wi-Fi"</string>
@@ -1161,11 +1200,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Nenosiri limewekwa"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN imewekwa"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Mchoro umewekwa"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Tumia mchoro wa kufungua kifaa chako ili uendelee."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Weka PIN ya kifaa chako ili uendelee."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Weka nenosiri la kifaa chako ili uendelee."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Nambari ya PIN si sahihi"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Nenosiri si sahihi"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Mchoro wa kufungua si sahihi"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Usalama wa kifaa"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Badilisha umbo la kufungua"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Badilisha PIN ya kufungua"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Thibitisha mchoro uliohifadhiwa"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Jaribu tena:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Mchoro wa kufungua"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Bonyeza menyu upate usaidizi"</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Ondoa kidole ukimaliza"</string>
@@ -1187,8 +1230,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Weka mchoro wa kufungua"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Badilisha umbo la kufungua"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Jinsi ya kuchora mchoro wa kufungua"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Mjarabio mengi yasiyo sahihi"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Jaribu tena baada ya sekunde <xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Majaribio mengi mno yasiyo sahihi. Jaribu tena baada ya sekunde <xliff:g id="NUMBER">%d</xliff:g>."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Programu haijasakinishwa kwenye simu yako."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Dhibiti programu"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Dhibiti na ondoa programu zilizosakinishwa"</string>
@@ -1239,7 +1281,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Panga kwa ukubwa"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Onyesha huduma zinazoendeshwa"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Onyesha michakato iliyoakibishwa"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"Programu chaguo-msingi  ya dharura"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Programu ya dharura"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Weka upya mapendeleo ya programu"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Ungependa kuweka upya mapendeleo ya programu?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Hii itaweka upya mapendeleo yote ya: \n\n "<li>"Programu zilizozimwa"</li>\n" "<li>" Arifa za programu zilizozimwa"</li>\n" "<li>"Programu chaguo-msingi kwa vitendo"</li>\n" "<li>"Vikwazo vya chinichini vya data ya programu"</li>\n" "<li>"Vikwazo vyovyote vya ruhusa"</li>\n\n"Hutapoteza data yoyote ya programu."</string>
@@ -1443,8 +1485,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Nasa pakiti zote za Bluetooth HCI katika faili"</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="select_logd_size_title" msgid="7433137108348553508">"Ukubwa wa kiweka bafa ya kumbukumbu"</string>
@@ -1745,6 +1785,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"Saa 12"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"Siku 1"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Onyesha mfumo"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Ficha mfumo"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Tumia USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Aina ya takwimu"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Ikifanya kazi chinichini"</string>
@@ -1841,7 +1882,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nenosiri la sasa:"</string>
@@ -2216,7 +2256,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Mtumiaji"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Wasifu uliozuiwa"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Ungependa kuongeza mtumiaji?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Unaweza kutumia kifaa hiki pamoja na watu wengine kwa kuongeza watumiaji wa ziada. Kila mtumiaji ana nafasi yake mwenyewe, ambayo anaweza kuweka programu anazopenda, mandhari na kadhalika. Watumiaji pia wanaweza kurekebisha mipangilio ya kifaa inayoathiri kila mtu kama Wi-Fi. \n\n Unapomwongeza mtumiaji mpya, mtu huyo anahitaji kujitayarishia nafasi yake. \n\n Mtumiaji yeyote anaweza kusasishia watumiaji wengine wote programu."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Unaweza kutumia kifaa hiki pamoja na watu wengine kwa kuongeza watumiaji wa ziada. Kila mtumiaji ana nafasi yake mwenyewe, ambayo anaweza kuweka programu anazopenda, mandhari na kadhalika. Watumiaji pia wanaweza kurekebisha mipangilio ya kifaa inayoathiri kila mtu kama Wi-Fi.\n\nUnapomwongeza mtumiaji mpya, mtu huyo anahitaji kujitayarishia nafasi yake.\n\nMtumiaji yeyote anaweza kuwasasishia watumiaji wengine wote programu."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Unapomwongeza mtumiaji mpya, mtu huyo anahitaji kusanidi nafasi yake.\n\nMtumiaji yoyote anaweza kusasisha programu kwa ajili ya watumiaji wengine wote."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Mtumiaji aongezwe sasa?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Hakikisha kuwa mtu huyu anaweza kuchukua kifaa na kuweka mapendeleo yake"</string>
@@ -2399,6 +2439,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"programu chaguo-msingi ya dharura ya barafu"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"mfumo wa programu wa kupakua programu"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"usalama wa ruhusa za programu"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"chaguo-msingi ya programu"</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>
@@ -2413,14 +2454,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Sauti ya kengele"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Sauti ya mlio"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Sauti ya arifa"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Zuia ukatizaji"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Ruhusu kipaumbele pekee"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Sheria za otomatiki"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Simu na arifa zinapoingia"</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_alarms" msgid="7380265858042606857">"Ruhusu kengele pekee"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Usikatize"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Kipaumbele tu"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Kengele pekee"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Hakuna kukatizwa"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Mlio wa simu"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Mlio chaguo-msingi wa arifa"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Tetema pia simu zinapoingia"</string>
@@ -2453,15 +2492,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Hakuna visikilizaji vya arifa vilivyosakinishwa."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Je, unataka kuwezesha <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> itaweza kusoma arifa zote zilizochapishwa na mfumo au programu yoyote iliyosakinishwa, inayoweza kujumuisha maelezo ya binafsi kama vile majina ya anwani na maandishi ya ujumbe uliotumwa kwako. Pia itaweza kukataa arifa hizi au kugusa vitufe vya kutenda ndani yake."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Vitoa masharti"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Hakuna programu za kutoa masharti"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">Programu %d hutoa masharti</item>
-      <item quantity="one">Programu %d hutoa masharti</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Hakuna vitoa masharti vilivyosanikishwa."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Je, ungependa kuwasha <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> itaweza kuongeza au kuondoa masharti katika hali ya Usinisumbue."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Inapakia programu ..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Zuia zote"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Usionyeshe arifa kutoka programu hii kabisa"</string>
@@ -2475,17 +2505,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Kipaumbele"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Nyeti"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Jina la sheria"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Ongeza sheria"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Futa sheria"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Je, ungependa kufuta \"<xliff:g id="RULE">%1$s</xliff:g>\" sheria?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Futa"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Aina ya sheria"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Isiyojulikana"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Sanidi sheria"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Weka ratiba ya sheria"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Sheria haikupatikana."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Siku"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Hamna"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Kila siku"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Isiwahi kamwe"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> hadi <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2495,15 +2531,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Kengele"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Vikumbusho"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Matukio"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Wanaopiga simu uliowachagua"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Wanaorudia kupiga simu"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Mtu yule yule akipiga simu mara ya pili ndani ya kipindi cha dakika <xliff:g id="MINUTES">%d</xliff:g>, mruhusu"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Washa kiotomatiki"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Katu"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Kila usiku"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> siku inayofuata"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Je, ungependa kukatizwa lini?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Kwa muda gani?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Bila kikomo"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other">Dakika <xliff:g id="COUNT_1">%d</xliff:g> </item>
+      <item quantity="one">Dakika <xliff:g id="COUNT_0">%d</xliff:g> </item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other">Saa <xliff:g id="COUNT_1">%d</xliff:g> </item>
+      <item quantity="one">Saa <xliff:g id="COUNT_0">%d</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Badilisha utumie hali ya arifa za kipaumbele pekee kwa muda usiojulikana"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Badilisha utumie hali ya arifa za kipaumbele pekee kwa dakika <xliff:g id="DURATION">%1$d</xliff:g> hadi <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Badilisha utumie hali ya arifa za kipaumbele pekee kwa saa moja hadi <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Badilisha utumie hali ya arifa za kipaumbele pekee kwa saa <xliff:g id="DURATION">%1$d</xliff:g> (hadi <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> )</item>
+      <item quantity="one">Badilisha utumie hali ya arifa za kipaumbele pekee kwa saa moja hadi<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Badilisha utumie kengele pekee kwa muda usiojulikana"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Badilisha utumie kengele pekee kwa dakika <xliff:g id="DURATION">%1$d</xliff:g> (hadi <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Badilisha utumie kengele pekee kwa dakika moja hadi <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Badilisha utumie kengele pekee kwa saa <xliff:g id="DURATION">%1$d</xliff:g> hadi <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Badilisha utumie kengele pekee kwa saa moja hadi <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Badilisha utumie hali ya usikatize kwa muda usiojulikana"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Badilisha utumie hali ya usikatize kwa dakika <xliff:g id="DURATION">%1$d</xliff:g> (hadi <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Badilisha utumie hali ya usikatize kwa dakika moja hadi <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Badilisha utumie hali ya usikatize kwa saa <xliff:g id="DURATION">%1$d</xliff:g> mpaka <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Badilisha utumie hali ya usikatize kwa saa moja hadi <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Badilisha utumie hali ya katiza wakati wote"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"milele"</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>
@@ -2568,7 +2665,10 @@
       <item quantity="other">Ruhusa <xliff:g id="COUNT_1">%d</xliff:g> zimetolewa</item>
       <item quantity="one">Ruhusa <xliff:g id="COUNT_0">%d</xliff:g> imetolewa</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other">Imetoa ruhusa <xliff:g id="COUNT_2">%d</xliff:g> kati ya <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="one">Imetoa ruhusa <xliff:g id="COUNT_0">%d</xliff:g> kati ya <xliff:g id="COUNT_1">%d</xliff:g></item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Baadhi ya chaguo-msingi zimewekwa"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Hakuna chaguo-misingi zilizowekwa"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Programu Zote"</string>
@@ -2579,8 +2679,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Kipaumbele"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Nyeti"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Zenye URL za kikoa"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Weka mapendeleo chaguo-msingi upya katika programu zote"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"Programu <xliff:g id="COUNT">%d</xliff:g> zimesakinishwa, ikiwemo mfumo na programu zilizopakuliwa"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Imezimwa na msimamizi"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Vipengele vya kina"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Programu isiyojulikana"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Chagua Wasifu"</string>
@@ -2595,4 +2694,11 @@
       <item quantity="other">Programu <xliff:g id="COUNT">%d</xliff:g> zinaweza kufungua URL za vikoa vyake</item>
       <item quantity="one">Programu moja inaweza kufungua URL za kikoa chake</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Haitambuliwi"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Programu Chaguo-msingi"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Programu ya kivinjari"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Hakuna Kivinjari chaguo-msingi"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Chaguo-msingi)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index e1bb33e..d9521db 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -87,4 +87,7 @@
     <dimen name="wifi_assistant_padding_start_end">24dp</dimen>
     <dimen name="wifi_assistant_padding">25dp</dimen>
     <dimen name="wifi_assistant_text_padding">24dp</dimen>
+
+    <dimen name="confirm_credentials_security_method_margin">72dp</dimen>
+    <dimen name="fab_margin">24dp</dimen>
 </resources>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index d09b23e..8cf0e86 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -68,5 +68,4 @@
     <style name="KeyguardAppWidgetItem">
         <item name="android:textSize">16sp</item>
     </style>
-
 </resources>
diff --git a/res/values-sw600dp/themes.xml b/res/values-sw600dp/themes.xml
new file mode 100644
index 0000000..f26e2f5
--- /dev/null
+++ b/res/values-sw600dp/themes.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2015 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+    <style name="Theme.ConfirmDeviceCredentials" parent="Theme.SubSettings">
+      <item name="confirmDeviceCredentialsSideMargin">0dp</item>
+      <item name="confirmDeviceCredentialsTopMargin">64dp</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/res/values-ta-rIN/arrays.xml b/res/values-ta-rIN/arrays.xml
index dc0ba6c..b9f46d5 100644
--- a/res/values-ta-rIN/arrays.xml
+++ b/res/values-ta-rIN/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"புஷ் பொத்தான்"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"ஊடகம்"</item>
     <item msgid="7924928667052300589">"சாதனம்"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"சீரற்ற இருப்பிடம்"</item>
+    <item msgid="5789673140227507995">"சிறந்த இருப்பிடம்"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"அதிர்வு"</item>
+    <item msgid="3434165993711230924">"தொடர்புகளைப் படி"</item>
+    <item msgid="616161687718081936">"தொடர்புகளை மாற்று"</item>
+    <item msgid="7638002295329050091">"அழைப்புப் பதிவைப் படி"</item>
+    <item msgid="6546959730920410907">"அழைப்புப் பதிவை மாற்று"</item>
+    <item msgid="446877710771379667">"கேலெண்டரைப் படி"</item>
+    <item msgid="7674458294386319722">"கேலெண்டரை மாற்று"</item>
+    <item msgid="8281201165558093009">"வைஃபை ஸ்கேன்"</item>
+    <item msgid="8694611243479480497">"அறிவிப்பு"</item>
+    <item msgid="7776439107987345446">"கைபேசியை ஸ்கேன் செய்"</item>
+    <item msgid="514615766544675057">"தொலைபேசியை அழை"</item>
+    <item msgid="8181415497109310680">"SMS படி"</item>
+    <item msgid="6816551144382117307">"SMS எழுது"</item>
+    <item msgid="4600463921908905030">"SMS பெறு"</item>
+    <item msgid="5958926493289432745">"அவசரநிலை SMS ஐப் பெறு"</item>
+    <item msgid="4945269495221089540">"MMS பெறு"</item>
+    <item msgid="5570472453573929087">"WAP அறிவிப்பைப் பெறு"</item>
+    <item msgid="7125408150230860501">"SMS அனுப்பு"</item>
+    <item msgid="7080337936612188061">"ICC SMS ஐப் படி"</item>
+    <item msgid="587124103118495063">"ICC SMS எழுது"</item>
+    <item msgid="2320577158869025503">"அமைப்புகளை மாற்று"</item>
+    <item msgid="1545733463471924009">"மேலே வரை"</item>
+    <item msgid="3609046903962454582">"அறிவிப்புகளை அணுகு"</item>
+    <item msgid="4671646036128214513">"கேமரா"</item>
+    <item msgid="1097324338692486211">"ஆடியோவைப் பதிவுசெய்"</item>
+    <item msgid="5031552983987798163">"ஆடியோவை இயக்கு"</item>
+    <item msgid="8374996688066472414">"கிளிப்போர்டைப் படி"</item>
+    <item msgid="3045529469061083747">"கிளிப்போர்ட்டை மாற்று"</item>
+    <item msgid="5124443975763747838">"மீடியா பொத்தான்கள்"</item>
+    <item msgid="4547883971364273343">"ஆடியோவை மையப்படுத்து"</item>
+    <item msgid="2603878814882344450">"முதன்மை ஒலியளவு"</item>
+    <item msgid="7136963238377062018">"குரல் ஒலியளவு"</item>
+    <item msgid="4270236897655923007">"அழைப்பு - ஒலியளவு"</item>
+    <item msgid="6325739889222559394">"மீடியாவின் ஒலியளவு"</item>
+    <item msgid="5762123934816216821">"அலாரத்தின் ஒலியளவு"</item>
+    <item msgid="785049718065337473">"அறிவிப்பின் ஒலியளவு"</item>
+    <item msgid="6700305533746877052">"புளூடூத் ஒலியளவு"</item>
+    <item msgid="2029227495214047094">"செயலில்"</item>
+    <item msgid="26109888160231211">"இருப்பிடத்தைக் கண்காணி"</item>
+    <item msgid="5753382310468855812">"அதிக ஆற்றல் இடத்தைக் கண்காணி"</item>
+    <item msgid="3356591542543137332">"பயன்பாட்டு புள்ளிவிவரத்தைப் பெறுக"</item>
+    <item msgid="3073734345226842233">"மைக்ரோஃபோனை முடக்கு/இயக்கு"</item>
+    <item msgid="1148142988678569310">"புராஜக்ட் மீடியா"</item>
+    <item msgid="9130014005474445273">"VPNஐ இயக்கு"</item>
+    <item msgid="1165192162975045562">"வால்பேப்பரை எழுது"</item>
+    <item msgid="7129487923652967258">"கட்டமைப்புக்கு உதவு"</item>
+    <item msgid="1069023208100114540">"ஸ்கிரீன்ஷாட்டுக்கு உதவு"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"இருப்பிடம்"</item>
+    <item msgid="8677040780775113033">"இருப்பிடம்"</item>
+    <item msgid="1660743989948992916">"இருப்பிடம்"</item>
+    <item msgid="8791172739860195290">"அதிர்வு"</item>
+    <item msgid="383413555642128046">"தொடர்புகளைப் படி"</item>
+    <item msgid="3654594895269697313">"தொடர்புகளை மாற்று"</item>
+    <item msgid="7928393476362362538">"அழைப்புப் பதிவைப் படி"</item>
+    <item msgid="6248591205254641116">"அழைப்புப் பதிவை மாற்று"</item>
+    <item msgid="6093344633066170692">"கேலெண்டரைப் படி"</item>
+    <item msgid="1334886368750347692">"கேலெண்டரை மாற்று"</item>
+    <item msgid="1638204101698708656">"இருப்பிடம்"</item>
+    <item msgid="2154671955760380322">"அறிவிப்பை இடுகையிடு"</item>
+    <item msgid="4282477730595931828">"இருப்பிடம்"</item>
+    <item msgid="4891423912898525905">"தொலைபேசியில் அழை"</item>
+    <item msgid="2623604824935968113">"SMS/MMS ஐப் படி"</item>
+    <item msgid="4420177125221176306">"SMS/MMS எழுது"</item>
+    <item msgid="3986142739951490025">"SMS/MMS பெறு"</item>
+    <item msgid="3984213795861739778">"SMS/MMS பெறு"</item>
+    <item msgid="3656243523752472788">"SMS/MMS பெறு"</item>
+    <item msgid="8105802370238551510">"SMS/MMS பெறு"</item>
+    <item msgid="1407766984645388488">"SMS/MMS அனுப்பு"</item>
+    <item msgid="3527273606643794973">"SMS/MMS ஐப் படி"</item>
+    <item msgid="4370895547001583812">"SMS/MMS எழுது"</item>
+    <item msgid="4218544235221631789">"அமைப்புகளை மாற்று"</item>
+    <item msgid="736541391767350377">"மேலே வரை"</item>
+    <item msgid="5530815681721654194">"அறிவிப்புகளை அணுகு"</item>
+    <item msgid="781213371706962767">"கேமரா"</item>
+    <item msgid="1720492593061838172">"ஆடியோவைப் பதிவுசெய்"</item>
+    <item msgid="3493046322001257041">"ஆடியோவை இயக்கு"</item>
+    <item msgid="136815868796597058">"கிளிப்போர்டைப் படி"</item>
+    <item msgid="5238692940326972503">"கிளிப்போர்ட்டை மாற்று"</item>
+    <item msgid="5753789168376302997">"மீடியா பொத்தான்கள்"</item>
+    <item msgid="3265262911688671938">"ஆடியோவை மையப்படுத்து"</item>
+    <item msgid="2098976479485046797">"முதன்மை ஒலியளவு"</item>
+    <item msgid="5660213838861789350">"குரல் ஒலியளவு"</item>
+    <item msgid="7983336752371254444">"அழைப்பு - ஒலியளவு"</item>
+    <item msgid="7878027809189330917">"மீடியாவின் ஒலியளவு"</item>
+    <item msgid="7260546305036218513">"அலாரத்தின் ஒலியளவு"</item>
+    <item msgid="9103719301075748925">"அறிவிப்பின் ஒலியளவு"</item>
+    <item msgid="7025966722295861512">"புளூடூத் ஒலியளவு"</item>
+    <item msgid="4665183401128289653">"விழிப்பில்"</item>
+    <item msgid="8584357129746649222">"இருப்பிடம்"</item>
+    <item msgid="7669257279311110599">"இருப்பிடம்"</item>
+    <item msgid="3459320345690097795">"பயன்பாட்டு புள்ளிவிவரத்தைப் பெறுக"</item>
+    <item msgid="1312534577834048535">"மைக்ரோஃபோனை முடக்கு/இயக்கு"</item>
+    <item msgid="5906017727368097853">"புராஜக்ட் மீடியா"</item>
+    <item msgid="2486614710846178542">"VPNஐ இயக்கு"</item>
+    <item msgid="5586547561693629602">"வால்பேப்பரை எழுது"</item>
+    <item msgid="32794179825485062">"கட்டமைப்புக்கு உதவு"</item>
+    <item msgid="7872852746938272552">"ஸ்கிரீன்ஷாட்டுக்கு உதவு"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"குறுகியது"</item>
     <item msgid="2560532955514699713">"நடுத்தரம்"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"குறைவு"</item>
     <item msgid="4212263919458209842">"மோசமாக உள்ளது"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"முடக்கத்தில்"</item>
-    <item msgid="5656544177755411222">"குறிப்பிட்ட அறிவிப்புகள் மட்டும்"</item>
-    <item msgid="8735337502532332056">"எதையும் தெரிவிக்காதே"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"இயல்பு"</item>
     <item msgid="866544120205026771">"நடுத்தரம்"</item>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index ae5bddb..fb99de9 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD கார்டு"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"ப்ராக்ஸி அமைப்பு"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ஆம்"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"இல்லை"</string>
-    <string name="forget" msgid="7267115980248732932">"புறக்கணி"</string>
+    <string name="forget" msgid="1400428660472591263">"மறந்துவிடு"</string>
+    <string name="save" msgid="879993180139353333">"சேமி"</string>
+    <string name="done" msgid="6942539184162713160">"முடிந்தது"</string>
     <string name="settings_label" msgid="1626402585530130914">"அமைப்பு"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"அமைப்பு"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"அமைப்பு"</string>
@@ -374,7 +372,6 @@
     <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_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>
@@ -419,8 +416,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"வடிவம்"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"பின்"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"கடவுச்சொல்"</string>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"திரைப் பூட்டு அமைத்ததும், அமைப்புகள் &gt; பாதுகாப்பு என்பதற்குச் சென்று கைரேகையை அமைக்கலாம்."</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>
@@ -522,8 +518,7 @@
     <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>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"இருப்பிடத்தைத் துல்லியமாக அறிவதை மேம்படுத்த, பயன்பாடுகளும் சேவைகளும் புளூடூத் முடக்கத்தில் இருக்கும்போது கூட, புளூடூத் சாதனங்களுக்காக ஸ்கேன் செய்யும். இதை <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ஸ்கேன் செய்தல் அமைப்புகளில்<xliff:g id="LINK_END_1">LINK_END</xliff:g> மாற்ற முடியும்."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"இதனுடன் இணை..."</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>
@@ -589,8 +584,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"இருப்பிடத்தைத் துல்லியமாக அறிவதை மேம்படுத்த, பயன்பாடுகளும் சேவைகளும் வைஃபை முடக்கத்தில் இருக்கும்போது கூட, வைஃபை நெட்வொர்க்குகளுக்காக ஸ்கேன் செய்யும். இதை <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ஸ்கேன் செய்தல் அமைப்புகளில்<xliff:g id="LINK_END_1">LINK_END</xliff:g> மாற்ற முடியும்."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"மீண்டும் காட்டாதே"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"உறக்கநிலையில் வைஃபையை இயக்கு"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"உறக்கத்தின் போது வைஃபையை இயக்குதல்"</string>
@@ -607,8 +601,6 @@
     <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_apps" msgid="6003687912727859577">"பயன்பாடுகளைக் காட்டு"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"வைஃபை வலிமையைக் காட்டு"</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>
@@ -666,6 +658,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"இணை"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"இந்த நெட்வொர்க்கில் இணைய அணுகல் இல்லை. பயன்படுத்தவா?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"இந்த நெட்வொர்க்கை மீண்டும் உறுதிப்படுத்தக் கேட்காதே"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"இணை"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"நெட்வொர்க்குடன் இணைக்க முடியவில்லை"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"மறந்துவிடு"</string>
@@ -737,12 +731,10 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"வைஃபைக்கு முன்னுரிமை"</item>
     <item msgid="5267397515594230396">"செல்லுலாருக்கு முன்னுரிமை"</item>
-    <item msgid="3132912693346866895">"வைஃபை மட்டும்"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"வைஃபை அழைப்பு இயக்கத்தில் இருக்கும் போது, முன்னுரிமை மற்றும் வலிமையாக இருக்கிற சிக்னலைப் பொறுத்து வைஃபை நெட்வொர்க்குகள் அல்லது மொபைல் நிறுவன நெட்வொர்க்குக்கு அழைப்புகளை உங்கள் ஃபோன் திசைதிருப்பும். இந்த அம்சத்தை இயக்குவதற்கு முன், கட்டணங்கள் மற்றும் பிற விவரங்கள் குறித்து உங்கள் மொபைல் நிறுவனத்திடமிருந்து தெரிந்துகொள்ளவும்."</string>
     <string name="home_settings" msgid="212375129455718176">"முகப்பு"</string>
@@ -916,12 +908,12 @@
     <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">"பயன்பாடுகள் (பயன்பாட்டுத் தரவு &amp; மீடியா உள்ளடக்கம்)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"பயன்பாடுகள் &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_music_usage" msgid="1363785144783011606">"ஆடியோ (இசை, ரிங்டோன்கள், பாட்காஸ்ட்கள், மேலும் பல)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"மற்றவை"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"பிற கோப்புகள்"</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>
@@ -954,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"அகற்றுதல் செயலில் உள்ளது"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"சேமிப்பிடம் குறைகிறது"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"ஒத்திசைத்தல் போன்ற அமைப்பின் சில செயல்பாடுகள் வேலைசெய்யாமல் போகலாம். பயன்பாடுகள் அல்லது மீடியா உள்ளடக்கம் போன்ற உருப்படிகளை நீக்குதல் அல்லது அகற்றுவதன் மூலம் சேமிப்பிடத்தை காலியாக்க முயற்சிக்கவும்."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"மறுபெயரிடு"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"பொருத்து"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"வெளியேற்று"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"அழி &amp; மீட்டமை"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"அழித்து, அகச் சேமிப்பகமாக மீட்டமை"</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>
@@ -964,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"MIDI இயக்கப்பட்ட பயன்பாடுகள், USB மூலம் MIDI மென்பொருளைப் பயன்படுத்தி கணினியில் செயல்பட அனுமதிக்கும்."</string>
     <string name="storage_other_users" msgid="808708845102611856">"பிற பயனர்கள்"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"சாதனச் சேமிப்பகம்"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"அகற்றப்படக்கூடிய சேமிப்பகம்"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> காலி (மொத்தம் <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> பொருத்தப்பட்டது"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g>ஐப் பொருத்த முடியவில்லை"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> பாதுகாப்பாக வெளியேற்றப்பட்டது"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g>ஐப் பாதுகாப்பாக வெளியேற்ற முடியவில்லை"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> மீட்டமைக்கப்பட்டது"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g>ஐ மீட்டமைக்க முடியவில்லை"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"சேமிப்பகத்திற்கு மறுபெயரிடவும்"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"மீட்டமைவுக்குப் பிறகு, <xliff:g id="NAME_0">^1</xliff:g>ஐ மற்ற சாதனங்களில் பயன்படுத்தலாம். \n\n<xliff:g id="NAME_1">^1</xliff:g> இல் உள்ள எல்லா தரவும் அழிக்கப்படும். அதனால் முதலில் காப்புப் பிரதி எடுத்துக்கொள்ளவும். \n\n"<b>"படங்கள் &amp; மற்ற மீடியாவைக் காப்புப் பிரதி எடுத்தல்"</b>" \nமீடியா கோப்புகளை சாதனத்தின் மாற்று சேமிப்பகத்திற்கு நகர்த்தவும் அல்லது USB கேபிளைப் பயன்படுத்தி கணினிக்கு மாற்றவும். \n\n"<b>"காப்புப் பிரதி பயன்பாடுகள்"</b>" \n<xliff:g id="NAME_6">^1</xliff:g> இல் சேமிக்கப்பட்ட எல்லா பயன்பாடுகளும் நிறுவல்நீக்கப்பட்டு அவற்றின் தரவு அழிக்கப்படும். இந்தப் பயன்பாடுகளை வைத்திருக்க, சாதனத்தின் மாற்று சேமிப்பகத்திற்கு அவற்றை நகர்த்தவும்."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"<xliff:g id="NAME_0">^1</xliff:g>ஐ வெளியேற்றும்போது, சேமித்த பயன்பாடுகள் வேலை செய்வதை நிறுத்தும், அதில் சேமித்த மீடியா கோப்புகள் மீண்டும் அதைச் செருகும் வரை கிடைக்காது."</b>" \n\n<xliff:g id="NAME_1">^1</xliff:g> இந்தச் சாதனத்தில் மட்டும் வேலை செய்யுமாறு மீட்டமைக்கப்பட்டது. பிற சாதனங்களில் வேலை செய்யாது."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g>ஐ அமைக்கவும்"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"கையடக்க சேமிப்பகமாகப் பயன்படுத்தவும்"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"சாதனங்களுக்கிடையே படங்களையும் பிற மீடியாவையும் நகர்த்தலாம்."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"அகச் சேமிப்பகமாகப் பயன்படுத்தவும்"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"பயன்பாடுகளும் படங்களும் உள்ளிட்ட எதையேனும் இந்தச் சாதனத்தில் மட்டும் சேமிக்க, மற்ற சாதனங்களில் அது வேலை செய்வதிலிருந்து தடுக்க, மீட்டமைவு தேவைப்படும்."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"அகச் சேமிப்பகமாக மீட்டமை"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"<xliff:g id="NAME_0">^1</xliff:g>ஐப் பாதுகாப்பானதாக்க, அதை மீட்டமைக்க வேண்டும். \n\nமீட்டமைத்த பிறகு, <xliff:g id="NAME_1">^1</xliff:g> இந்தச் சாதனத்தில் மட்டுமே வேலைசெய்யும். \n\n"<b>"மீட்டமைவு, <xliff:g id="NAME_2">^1</xliff:g> இல் தற்போது சேமிக்கப்பட்டுள்ள எல்லா தரவையும் அழிக்கும்."</b>" தரவு இழப்பைத் தவிர்க்க, காப்புப் பிரதி எடுக்கவும்."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"அழி &amp; மீட்டமை"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> மீட்டமைக்கப்படுகிறது…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"<xliff:g id="NAME">^1</xliff:g>ஐ மீட்டமைக்கும்போது, அதை அகற்ற வேண்டாம்."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"புதிய சேமிப்பகத்திற்கு நகர்த்துக"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"புதிய <xliff:g id="NAME">^1</xliff:g>க்கு படங்கள், கோப்புகள், பயன்பாட்டுத் தரவு ஆகியவற்றை நகர்த்தலாம். \n\nஇந்தச் செயலுக்கு <xliff:g id="TIME">^2</xliff:g> தேவைப்படும் மேலும் அகச் சேமிப்பகத்தில் <xliff:g id="SIZE">^3</xliff:g> காலியிடம் கிடைக்கும். இது நடைபெறுகையில் சில பயன்பாடுகள் வேலை செய்யாது."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"இப்போதே நகர்த்தவும்"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"பிறகு நகர்த்தவும்"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"தரவை நகர்த்தவும்"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"இந்தச் செயலுக்கு <xliff:g id="TIME">^1</xliff:g> ஆகும். மேலும் அகச் சேமிப்பகத்தில் <xliff:g id="SIZE">^2</xliff:g> காலியிடம் கிடைக்கும்."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"நகர்த்து"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"தரவு நகர்த்தப்படுகிறது…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"நகர்த்தும்போது: \n• <xliff:g id="NAME">^1</xliff:g>ஐ அகற்ற வேண்டாம். \n• சில பயன்பாடுகள் சரியாக வேலை செய்யாது. \n• சாதனம் சார்ஜ் செய்யப்பட்டிருக்க வேண்டும்."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> தயார்"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> படங்களையும் பிற மீடியாவையும் பயன்படுத்த, தயாராக உள்ளது."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"புதிய <xliff:g id="NAME">^1</xliff:g> வேலை செய்கிறது. \n\nசாதனத்திற்கு படங்கள், கோப்புகள், பயன்பாட்டுத் தரவை நகர்த்த, அமைப்புகள் &gt; சேமிப்பகம் என்பதற்குச் செல்லவும்."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g>ஐ நகர்த்தவும்"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<xliff:g id="APP">^1</xliff:g>ஐயும் அதன் தரவையும் <xliff:g id="NAME_0">^2</xliff:g>க்கு நகர்த்த ஒருசில வினாடிகள் மட்டுமே எடுக்கும். நகர்த்தப்படும்போது பயன்பாட்டைப் பயன்படுத்த முடியாது. \n\nநகர்த்தும்போது <xliff:g id="NAME_1">^2</xliff:g>ஐ அகற்ற வேண்டாம்."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> நகர்த்தப்படுகிறது…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"நகர்த்தும்போது <xliff:g id="NAME">^1</xliff:g>ஐ அகற்ற வேண்டாம். \n\nநகர்த்தி முடிக்கும்வரை, சாதனத்தில் <xliff:g id="APP">^2</xliff:g> பயன்பாடு கிடைக்காது."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"நகர்த்துவதை ரத்துசெய்"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"பேட்டரி நிலை"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"பேட்டரி நிலை"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNகள்"</string>
@@ -1008,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"இயல்புநிலைக்கு மீட்டமை"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"இயல்புநிலை APN அமைப்புகளை மீட்டமைப்பது முடிந்தது."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"நெட்வொர்க் அமைப்புகள் மீட்டமைப்பு"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"பின்வருபவை உட்பட நெட்வொர்க் சார்ந்த எல்லா அமைப்புகளும் ஆரம்பநிலைக்கு மீட்டமைக்கப்படும்:\n\n"<li>"வைஃபை"</li>\n<li>"மொபைல் தரவு"</li>\n<li>"புளூடூத்"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"பின்வருபவை உட்பட எல்லா நெட்வொர்க் அமைப்புகளும் மீட்டமைக்கப்படும்:\n\n"<li>"வைஃபை"</li>\n<li>"செல்லுலார் தரவு"</li>\n<li>"புளூடூத்"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"அமைப்புகளை மீட்டமை"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"எல்லா நெட்வொர்க் அமைப்புகளையும் மீட்டமைக்கவா? பழைய அமைப்புகள் மீண்டும் கிடைக்காது!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"எல்லா நெட்வொர்க் அமைப்புகளையும் மீட்டமைக்கவா? இதைச் செயல்தவிர்க்க முடியாது!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"அமைப்புகளை மீட்டமை"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"நெட்வொர்க் அமைப்புகளை மீட்டமைப்பதை உறுதிப்படுத்த, திறத்தல் வடிவத்தை வரைய வேண்டும்."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"மீட்டமைக்கவா?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"நெட்வொர்க் அமைப்புகள் மீட்டமைக்கப்பட்டன"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"நெட்வொர்க் அமைப்புகள் மீட்டமைக்கப்பட்டன"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"சாதனத்தை மீட்டமை"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"தரவின் ஆரம்பநிலை மீட்டமைப்பு"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"இது, உங்கள் டேப்லெடின் "<b>"அகச் சேமிப்பிடத்தில்"</b>" உள்ள எல்லா தரவையும் அழித்துவிடும், இவற்றில் உள்ளடங்குவன:\n\n"<li>"உங்கள் Google கணக்கு"</li>\n<li>"அமைப்பு மற்றும் பயன்பாட்டுத் தரவு, மற்றும் அமைப்புகள்"</li>\n<li>"பதிவிறக்கப்பட்டப் பயன்பாடுகள்"</li></string>
@@ -1030,9 +1065,8 @@
     <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="1062841478823409667">"உங்களின் தனிப்பட்ட தகவல் மற்றும் பதிவிறக்கப்பட்ட பயன்பாடுகள் எல்லாவற்றையும் அழிக்கவா? இதைச் செயல்தவிர்க்க முடியாது!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"எல்லாவற்றையும் அழி"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"இவருக்கு ஆரம்பநிலை மீட்டமைவு இல்லை"</string>
@@ -1049,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"குரல் அஞ்சல், அழைப்புப் பகிர்வு, அழைப்பு காத்திருப்பு, அழைப்பாளர் ஐடி போன்றவற்றை அமைக்கவும்"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB டெதெரிங்"</string>
@@ -1082,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"உதவி"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"செல்லுலார் நெட்வொர்க்குகள்"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"மொபைல் திட்டம்"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"இயல்புநிலை SMS பயன்பாடு"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS பயன்பாடு"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS பயன்பாட்டை மாற்றவா?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"<xliff:g id="CURRENT_APP">%2$s</xliff:g> க்குப் பதிலாக <xliff:g id="NEW_APP">%1$s</xliff:g> ஐ உங்கள் SMS பயன்பாடாகப் பயன்படுத்தவா?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g> ஐ உங்கள் SMS பயன்பாடாகப் பயன்படுத்தவா?"</string>
@@ -1113,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"இருப்பிடத்தைக் கண்டறிய, GPSஐப் பயன்படுத்தவும்"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"ஸ்கேன் செய்தல்"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"ஸ்கேன் செய்தல்"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"வைஃபை ஸ்கேன் செய்தல்"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"வைஃபை முடக்கத்தில் இருக்கும்போது கூட, வைஃபை நெட்வொர்க்குகள் உள்ளனவா என்று ஸ்கேன் செய்ய பயன்பாடுகளையும் சேவைகளையும் அனுமதித்து, இருப்பிட அறிதலை மேம்படுத்தவும்"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"புளூடூத் ஸ்கேன் செய்தல்"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"புளூடூத் முடக்கத்தில் இருக்கும்போது கூட, புளூடூத் சாதனங்களுக்காக ஸ்கேன் செய்ய முறைமை சேவைகளை அனுமதிப்பதன் மூலம், இருப்பிட அறிதலை மேம்படுத்தவும்"</string>
     <string name="location_network_based" msgid="6010456018401296590">"வைஃபை &amp; செல்லுலார் நெட்வொர்க் இடம்"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"உங்கள் இருப்பிடத்தை விரைவாகக் கணிக்கும் வகையில் பயன்பாடுகள், Google இன் இருப்பிடச் சேவையைப் பயன்படுத்தலாம். அநாமதேய இருப்பிடத் தரவு சேகரிக்கப்பட்டு Google க்கு அனுப்பப்படும்."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"வைஃபை மூலம் இருப்பிடம் கண்டறியப்பட்டது"</string>
@@ -1158,11 +1194,15 @@
     <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="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"தொடர, சாதனத்தின் திறப்பு வடிவத்தைப் பயன்படுத்தவும்."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"தொடர, சாதனத்தின் பின்னை உள்ளிடவும்."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"தொடர, சாதனக் கடவுச்சொல்லை உள்ளிடவும்."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"தவறான PIN"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"தவறான கடவுச்சொல்"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"தவறான வடிவம்"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"சாதனப் பாதுகாப்பு"</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>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"உதவிக்கு மெனுவை அழுத்தவும்."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"முடிந்ததும் விரலை எடுக்கவும்"</string>
@@ -1184,8 +1224,7 @@
     <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" msgid="6909161623701848863">"பல தவறான முயற்சிகள். <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>
@@ -1236,7 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"அளவின்படி வரிசைப்படுத்து"</string>
     <string name="show_running_services" msgid="5736278767975544570">"இயங்கும் சேவைகளைக் காட்டு"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"தற்காலிகச் சேமிப்பின் செயல்முறைகளைக் காட்டு"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"இயல்பு அவசரப் பயன்பாடு"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"அவசரப் பயன்பாடு"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"பயன்பாட்டு விருப்பத்தேர்வுகளை மீட்டமை"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"பயன்பாட்டு விருப்பத்தேர்வுகளை மீட்டமைக்கவா?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"இது, பின்வருபவற்றின் எல்லா விருப்பத்தேர்வுகளையும் மீட்டமைக்கும்:\n\n "<li>"முடக்கப்பட்ட பயன்பாடுகள்"</li>\n" "<li>"முடக்கப்பட்ட பயன்பாட்டின் அறிவிப்புகள்"</li>\n" "<li>"செயல்பாடுகளுக்கான இயல்புநிலைப் பயன்பாடுகள்"</li>\n" "<li>"பயன்பாடுகளுக்கான பின்புலத் தரவின் வரையறைகள்"</li>\n" "<li>"ஏதேனும் அனுமதி வரையறைகள்"</li>\n\n" எந்தப் பயன்பாட்டுத் தரவையும் இழக்கமாட்டீர்கள்."</string>
@@ -1440,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"கோப்பில் உள்ள எல்லா புளூடூத் HCI தொகுதிகளையும் படமெடு"</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="select_logd_size_title" msgid="7433137108348553508">"லாகர் பஃபர் அளவுகள்"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 மணிநேரம்"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 நாள்"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"அமைப்பைக் காட்டு"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"முறைமையை மறை"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss ஐப் பயன்படுத்து"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"புள்ளிவிவரங்கள் வகை"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"பின்புலம்"</string>
@@ -1838,7 +1876,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_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>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"பயனர்"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"வரையறுக்கப்பட்ட சுயவிவரம்"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"புதியவரைச் சேர்க்கவா?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"கூடுதல் பயனர்களை உருவாக்கி, சாதனத்தைப் பிறருடன் பகிரலாம். ஒவ்வொரு பயனருக்கும், அவர்களுக்குச் சொந்தமான பயன்பாடுகள், வால்பேப்பர், மேலும் பலவற்றைத் தனிப்பயனாக்கத் தனி இடம் இருக்கும். ஒவ்வொருவருக்கும் பயன்படக்கூடிய வைஃபை போன்ற சாதன அமைப்புகளையும் அவர்கள் சரிசெய்யலாம்.\n\nபுதியவரைச் சேர்க்கும் போது, அவர் தனக்கான இடத்தை அமைக்க வேண்டும்.\n\nஇருக்கும் பயன்பாடுகளை எவரும் புதுப்பிக்கலாம்."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"கூடுதல் பயனர்களை உருவாக்கி, சாதனத்தைப் பிறருடன் பகிரலாம். ஒவ்வொரு பயனருக்கும் பயன்பாடுகள், வால்பேப்பர் மற்றும் பலவற்றைத் தனிப்பயனாக்கத் தனி இடம் இருக்கும். ஒவ்வொருவருக்கும் பயன்படக்கூடிய வைஃபை போன்ற சாதன அமைப்புகளையும் அவர்கள் சரிசெய்யலாம்.\n\nபுதியவரைச் சேர்க்கும் போது, அவர் தனக்கான இடத்தை அமைக்க வேண்டும்.\n\nஇருக்கும் பயன்பாடுகளை எவரும் புதுப்பிக்கலாம்."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"புதியவரைச் சேர்க்கும் போது, அவர் தனக்கான இடத்தை அமைக்க வேண்டும்.\n\nஇருக்கும் பயன்பாடுகளை எவரும் புதுப்பிக்கலாம்."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"இப்போது பயனரை அமைக்கவா?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"இவர் சாதனத்தில் இருப்பதை உறுதிசெய்து, அவருக்கான இடத்தை அமைக்கவும்"</string>
@@ -2396,6 +2433,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"அவசர ice பயன்பாடு இயல்பு"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"ஆப்ஸ் பதிவிறக்கு பயன்பாடுகள் முறைமை"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"பயன்பாடுகள் அனுமதிகள் பாதுகாப்பு"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"பயன்பாடுகள் இயல்பு"</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>
@@ -2410,14 +2448,12 @@
     <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="6948120138640252732">"குறுக்கீடுகளைத் தடுத்தல்"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"முதன்மையை மட்டும் அனுமதித்தல்"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"முன்னுரிமைகளை மட்டும் அனுமதித்தல்"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"தானியங்கு விதிகள்"</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_alarms" msgid="7380265858042606857">"அலாரங்களை மட்டும் அனுமதி"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"தெரிவிக்காதே"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"முதன்மை மட்டும்"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"அலாரங்கள் மட்டும்"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"குறுக்கீடுகள் வேண்டாம்"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"மொபைலின் ரிங்டோன்"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"இயல்புநிலை அறிவிப்பு ரிங்டோன்"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"அழைப்புகளுக்கும் அதிர்வுறு"</string>
@@ -2450,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"அறிவிப்பு கவனிப்பான்கள் எதுவும் நிறுவப்படவில்லை."</string>
     <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">"பயன்பாடுகள் எதுவும் நிபந்தனைகளை வழங்கவில்லை"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d பயன்பாடுகள் நிபந்தனைகளை வழங்குகின்றன</item>
-      <item quantity="one">%d பயன்பாடு நிபந்தனைகளை வழங்குகிறது</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="loading_notification_apps" msgid="5031818677010335895">"பயன்பாடுகளை ஏற்றுகிறது..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"எல்லாம் தடு"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"இந்தப் பயன்பாட்டிலிருந்து எப்போதும் அறிவிப்புகளைக் காட்டாதே"</string>
@@ -2472,17 +2499,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"விதியின் பெயர்"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"விதியைச் சேர்"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"விதியை நீக்கு"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<xliff:g id="RULE">%1$s</xliff:g>\" விதியை நீக்கவா?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"நீக்கு"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"விதி வகை"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"தெரியாதது"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"விதியை உள்ளமைக்கவும்"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"விதியைத் திட்டமிடு"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"விதி இல்லை."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"நாட்கள்"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"ஏதுமில்லை"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"தினமும்"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"எப்போதும் வேண்டாம்"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"அழைப்புகள்"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"செய்திகள்"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"இவரிடமிருந்து அழைப்புகள்/செய்திகள்"</string>
@@ -2492,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"அலாரங்கள்"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"நினைவூட்டல்கள்"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"நிகழ்வுகள்"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"தேர்ந்தெடுக்கப்பட்ட அழைப்பாளர்கள்"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"மீண்டும் மீண்டும் அழைப்பவர்கள்"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"<xliff:g id="MINUTES">%d</xliff:g> நிமிடங்களுக்குள் இரண்டாவது முறையாக அதே எண்ணிலிருந்து அழைப்பு வந்தால், அனுமதி"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"அடுத்த நாள் <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"எப்போது குறுக்கிடலாம்?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"கால அளவு:"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"காலவரையின்றி"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> நிமிடங்கள்</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> நிமிடம்</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> மணிநேரம்</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> மணிநேரம்</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"முதன்மை அறிவிப்புகள் மட்டும் (காலவரையின்றி) என மாற்று"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> வரை, <xliff:g id="DURATION">%1$d</xliff:g> நிமிடங்களுக்கு முதன்மை அறிவிப்புகள் மட்டும் என மாற்றவும்</item>
+      <item quantity="one"> <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> வரை, ஒரு நிமிடத்திற்கு முதன்மை அறிவிப்புகள் மட்டும் என மாற்றவும்</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> மணிநேரத்திற்கு (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> வரை) முதன்மை அறிவிப்புகள் மட்டும் என மாற்றவும்</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> வரை, ஒரு மணிநேரத்திற்கு முதன்மை அறிவிப்புகள் மட்டும் என மாற்றவும்</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"அலாரங்கள் மட்டும் (காலவரையின்றி) என மாற்று"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> நிமிடங்களுக்கு (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> வரை) அலாரங்கள் மட்டும் என மாற்றவும்</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> வரை, ஒரு நிமிடத்திற்கு அலாரங்கள் மட்டும் என மாற்றவும்</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> வரை, <xliff:g id="DURATION">%1$d</xliff:g> மணிநேரத்திற்கு அலாரங்கள் மட்டும் என மாற்றவும்</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> வரை, ஒரு மணிநேரத்திற்கு அலாரங்கள் மட்டும் என மாற்றவும்</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"குறுக்கிட வேண்டாம் (கால வரையின்றி) என மாற்று"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> நிமிடங்களுக்கு (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> வரை) குறுக்கிட வேண்டாம் என மாற்றவும்</item>
+      <item quantity="one"> <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> வரை, ஒரு நிமிடத்திற்கு குறுக்கிட வேண்டாம் என மாற்றவும்</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> வரை, <xliff:g id="DURATION">%1$d</xliff:g> மணிநேரத்திற்கு குறுக்கிட வேண்டாம் என மாற்றவும்</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> வரை, ஒரு மணிநேரத்திற்கு குறுக்கிட வேண்டாம் என மாற்றவும்</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"எப்போதும் குறுக்கிடு என மாற்று"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"எப்போதும்"</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>
@@ -2565,7 +2659,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> அனுமதிகள் வழங்கப்பட்டன</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> அனுமதி வழங்கப்பட்டது</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> / <xliff:g id="COUNT_3">%d</xliff:g> அனுமதிகள் வழங்கப்பட்டன</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g> அனுமதி வழங்கப்பட்டது</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"சில இயல்புநிலைகள் அமைக்கப்பட்டன"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"இயல்புநிலைகள் எதுவும் அமைக்கப்படவில்லை"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"எல்லா பயன்பாடுகளும்"</string>
@@ -2576,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"முன்னுரிமை"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"முக்கியமானவை"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"டொமைன் URLகளுடன்"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"எல்லா பயன்பாடுகளின் முன்விருப்பத்தேர்வுகளையும் இயல்புநிலைகளுக்கு மீட்டமைக்கும்"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"சிஸ்டம் மற்றும் பதிவிறக்கிய பயன்பாடுகள் உள்பட, <xliff:g id="COUNT">%d</xliff:g> பயன்பாடுகள் நிறுவப்பட்டன"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"நிர்வாகியால் முடக்கப்பட்டது"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"மேம்பட்டவை"</string>
     <string name="unknown_app" msgid="5275921288718717656">"அறியப்படாத பயன்பாடு"</string>
     <string name="choose_profile" msgid="8229363046053568878">"சுயவிவரத்தைத் தேர்வுசெய்யவும்"</string>
@@ -2589,7 +2685,14 @@
     <string name="domain_urls_summary_one" msgid="3804994599497120956">"\'<xliff:g id="DOMAIN">%s</xliff:g>\'ஐ மட்டும் திறக்கும்"</string>
     <string name="domain_urls_summary_some" msgid="4859484048050301933">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' மற்றும் தொடர்புடைய URLகளைத் திறக்கும்"</string>
     <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> பயன்பாடுகளால் அவற்றின் டொமைன் URLகளைத் திறக்க முடியும்</item>
-      <item quantity="one">ஒரு பயன்பாட்டால் அதன் டொமைன் URLகளைத் திறக்க முடியும்</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> பயன்பாடுகள், அவற்றின் டொமைன் URLகளைத் திறக்கலாம்</item>
+      <item quantity="one">ஒரு பயன்பாடு, தனது டொமைன் URLகளைத் திறக்கலாம்</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"அறியப்படவில்லை"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"இயல்பு பயன்பாடுகள்"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"உலாவி பயன்பாடு"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"இயல்பு உலாவி இல்லை"</string>
+    <string name="default_app" msgid="6864503001385843060">"(இயல்பு)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-te-rIN/arrays.xml b/res/values-te-rIN/arrays.xml
index a40c1ce..daf575c 100644
--- a/res/values-te-rIN/arrays.xml
+++ b/res/values-te-rIN/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"పుష్ బటన్"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"మీడియా"</item>
     <item msgid="7924928667052300589">"పరికరం"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"స్థూల స్థానం"</item>
+    <item msgid="5789673140227507995">"ఖచ్చితమైన స్థానం"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"వైబ్రేట్"</item>
+    <item msgid="3434165993711230924">"పరిచయాలను చదవండి"</item>
+    <item msgid="616161687718081936">"పరిచయాలను సవరించండి"</item>
+    <item msgid="7638002295329050091">"కాల్ లాగ్‌ను చదవండి"</item>
+    <item msgid="6546959730920410907">"కాల్ లాగ్‌ను సవరించండి"</item>
+    <item msgid="446877710771379667">"క్యాలెండర్‌ను చదవండి"</item>
+    <item msgid="7674458294386319722">"క్యాలెండర్‌ను సవరించండి"</item>
+    <item msgid="8281201165558093009">"wi-fi స్కాన్"</item>
+    <item msgid="8694611243479480497">"నోటిఫికేషన్"</item>
+    <item msgid="7776439107987345446">"సెల్ స్కాన్"</item>
+    <item msgid="514615766544675057">"ఫోన్‌కు కాల్ చేయండి"</item>
+    <item msgid="8181415497109310680">"SMSను చదవండి"</item>
+    <item msgid="6816551144382117307">"SMSను వ్రాయండి"</item>
+    <item msgid="4600463921908905030">"SMSను స్వీకరించండి"</item>
+    <item msgid="5958926493289432745">"అత్యవసర SMSను స్వీకరించండి"</item>
+    <item msgid="4945269495221089540">"MMSను స్వీకరించండి"</item>
+    <item msgid="5570472453573929087">"WAP పుష్‌ను స్వీకరించండి"</item>
+    <item msgid="7125408150230860501">"SMSను పంపండి"</item>
+    <item msgid="7080337936612188061">"ICC SMSను చదవండి"</item>
+    <item msgid="587124103118495063">"ICC SMSను వ్రాయండి"</item>
+    <item msgid="2320577158869025503">"సెట్టింగ్‌లను సవరించండి"</item>
+    <item msgid="1545733463471924009">"పైభాగంలో గీయండి"</item>
+    <item msgid="3609046903962454582">"నోటిఫికేషన్‌లను ప్రాప్యత చేయండి"</item>
+    <item msgid="4671646036128214513">"కెమెరా"</item>
+    <item msgid="1097324338692486211">"ఆడియోను రికార్డ్ చేయండి"</item>
+    <item msgid="5031552983987798163">"ఆడియో ప్లే చేయండి"</item>
+    <item msgid="8374996688066472414">"క్లిప్‌బోర్డ్‌ను చదవండి"</item>
+    <item msgid="3045529469061083747">"క్లిప్‌బోర్డ్‌ను సవరించండి"</item>
+    <item msgid="5124443975763747838">"మీడియా బటన్‌లు"</item>
+    <item msgid="4547883971364273343">"ఆడియో కేంద్రీకరణ"</item>
+    <item msgid="2603878814882344450">"మాస్టర్ వాల్యూమ్"</item>
+    <item msgid="7136963238377062018">"వాయిస్ వాల్యూమ్"</item>
+    <item msgid="4270236897655923007">"రింగ్ వాల్యూమ్"</item>
+    <item msgid="6325739889222559394">"మీడియా వాల్యూమ్"</item>
+    <item msgid="5762123934816216821">"అలారం వాల్యూమ్"</item>
+    <item msgid="785049718065337473">"నోటిఫికేషన్ వాల్యూమ్"</item>
+    <item msgid="6700305533746877052">"బ్లూటూత్ వాల్యూమ్"</item>
+    <item msgid="2029227495214047094">"సక్రియంగా ఉంచండి"</item>
+    <item msgid="26109888160231211">"స్థానాన్ని పర్యవేక్షించండి"</item>
+    <item msgid="5753382310468855812">"అధిక శక్తివంతమైన స్థానాన్ని పర్యవేక్షించండి"</item>
+    <item msgid="3356591542543137332">"వినియోగ గణాంకాలను పొందండి"</item>
+    <item msgid="3073734345226842233">"మైక్రోఫోన్‌ను మ్యూట్ చేయండి/అన్‌మ్యూట్ చేయండి"</item>
+    <item msgid="1148142988678569310">"ప్రాజెక్ట్ మీడియా"</item>
+    <item msgid="9130014005474445273">"VPNని సక్రియం చేయండి"</item>
+    <item msgid="1165192162975045562">"వాల్‌పేపర్ వ్రాయండి"</item>
+    <item msgid="7129487923652967258">"నిర్మాణానికి సహాయం"</item>
+    <item msgid="1069023208100114540">"స్క్రీన్‌షాట్‌కు సహాయం"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"స్థానం"</item>
+    <item msgid="8677040780775113033">"స్థానం"</item>
+    <item msgid="1660743989948992916">"స్థానం"</item>
+    <item msgid="8791172739860195290">"వైబ్రేట్"</item>
+    <item msgid="383413555642128046">"పరిచయాలను చదవండి"</item>
+    <item msgid="3654594895269697313">"పరిచయాలను సవరించండి"</item>
+    <item msgid="7928393476362362538">"కాల్ లాగ్‌ను చదవండి"</item>
+    <item msgid="6248591205254641116">"కాల్ లాగ్‌ను సవరించండి"</item>
+    <item msgid="6093344633066170692">"క్యాలెండర్‌ను చదవండి"</item>
+    <item msgid="1334886368750347692">"క్యాలెండర్‌ను సవరించండి"</item>
+    <item msgid="1638204101698708656">"స్థానం"</item>
+    <item msgid="2154671955760380322">"నోటిఫికేషన్‌ను పోస్ట్ చేయండి"</item>
+    <item msgid="4282477730595931828">"స్థానం"</item>
+    <item msgid="4891423912898525905">"ఫోన్‌కు కాల్ చేయండి"</item>
+    <item msgid="2623604824935968113">"SMS/MMSను చదవండి"</item>
+    <item msgid="4420177125221176306">"SMS/MMSను వ్రాయండి"</item>
+    <item msgid="3986142739951490025">"SMS/MMSను స్వీకరించండి"</item>
+    <item msgid="3984213795861739778">"SMS/MMSను స్వీకరించండి"</item>
+    <item msgid="3656243523752472788">"SMS/MMSను స్వీకరించండి"</item>
+    <item msgid="8105802370238551510">"SMS/MMSను స్వీకరించండి"</item>
+    <item msgid="1407766984645388488">"SMS/MMSను పంపండి"</item>
+    <item msgid="3527273606643794973">"SMS/MMSను చదవండి"</item>
+    <item msgid="4370895547001583812">"SMS/MMSను వ్రాయండి"</item>
+    <item msgid="4218544235221631789">"సెట్టింగ్‌లను సవరించండి"</item>
+    <item msgid="736541391767350377">"పైభాగంలో గీయండి"</item>
+    <item msgid="5530815681721654194">"నోటిఫికేషన్‌లను ప్రాప్యత చేయండి"</item>
+    <item msgid="781213371706962767">"కెమెరా"</item>
+    <item msgid="1720492593061838172">"ఆడియోను రికార్డ్ చేయండి"</item>
+    <item msgid="3493046322001257041">"ఆడియో ప్లే చేయండి"</item>
+    <item msgid="136815868796597058">"క్లిప్‌బోర్డ్‌ను చదవండి"</item>
+    <item msgid="5238692940326972503">"క్లిప్‌బోర్డ్‌ను సవరించండి"</item>
+    <item msgid="5753789168376302997">"మీడియా బటన్‌లు"</item>
+    <item msgid="3265262911688671938">"ఆడియో కేంద్రీకరణ"</item>
+    <item msgid="2098976479485046797">"మాస్టర్ వాల్యూమ్"</item>
+    <item msgid="5660213838861789350">"వాయిస్ వాల్యూమ్"</item>
+    <item msgid="7983336752371254444">"రింగ్ వాల్యూమ్"</item>
+    <item msgid="7878027809189330917">"మీడియా వాల్యూమ్"</item>
+    <item msgid="7260546305036218513">"అలారం వాల్యూమ్"</item>
+    <item msgid="9103719301075748925">"నోటిఫికేషన్ వాల్యూమ్"</item>
+    <item msgid="7025966722295861512">"బ్లూటూత్ వాల్యూమ్"</item>
+    <item msgid="4665183401128289653">"సక్రియంగా ఉంచండి"</item>
+    <item msgid="8584357129746649222">"స్థానం"</item>
+    <item msgid="7669257279311110599">"స్థానం"</item>
+    <item msgid="3459320345690097795">"వినియోగ గణాంకాలను పొందండి"</item>
+    <item msgid="1312534577834048535">"మైక్రోఫోన్‌ను మ్యూట్ చేయండి/అన్‌మ్యూట్ చేయండి"</item>
+    <item msgid="5906017727368097853">"ప్రాజెక్ట్ మీడియా"</item>
+    <item msgid="2486614710846178542">"VPNని సక్రియం చేయండి"</item>
+    <item msgid="5586547561693629602">"వాల్‌పేపర్ వ్రాయండి"</item>
+    <item msgid="32794179825485062">"నిర్మాణానికి సహాయం"</item>
+    <item msgid="7872852746938272552">"స్క్రీన్‌షాట్‌కు సహాయం"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"తక్కువ సేపు"</item>
     <item msgid="2560532955514699713">"మధ్యస్థం"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"తక్కువ"</item>
     <item msgid="4212263919458209842">"క్లిష్టం"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"ఆఫ్‌లో ఉంది"</item>
-    <item msgid="5656544177755411222">"పరిమిత అంతరాయాలు"</item>
-    <item msgid="8735337502532332056">"సున్నా అంతరాయాలు"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"సాధారణం"</item>
     <item msgid="866544120205026771">"మధ్యస్థం"</item>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 6dd72a4..6558d52 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD కార్డు"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"ప్రాక్సీ సెట్టింగ్‌లు"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"అవును"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"కాదు"</string>
-    <string name="forget" msgid="7267115980248732932">"విస్మరించు"</string>
+    <string name="forget" msgid="1400428660472591263">"విస్మరించు"</string>
+    <string name="save" msgid="879993180139353333">"సేవ్ చేయి"</string>
+    <string name="done" msgid="6942539184162713160">"పూర్తయింది"</string>
     <string name="settings_label" msgid="1626402585530130914">"సెట్టింగ్‌లు"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"సెట్టింగ్‌లు"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"సెట్టింగ్‌ల సత్వరమార్గం"</string>
@@ -374,7 +372,6 @@
     <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_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>
@@ -419,8 +416,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"నమూనా"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"పిన్‌"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"పాస్‌వర్డ్"</string>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"మీరు స్క్రీన్ లాక్‌ను సెటప్ చేసిన తర్వాత, సెట్టింగ్‌లు &gt; భద్రతలో మీ వేలిముద్రను కూడా సెటప్ చేయవచ్చు."</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>
@@ -522,8 +518,7 @@
     <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>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"స్థాన ఖచ్చితత్వాన్ని మెరుగుపరచడానికి, అనువర్తనాలు మరియు సేవలు బ్లూటూత్ ఆఫ్‌లో ఉన్నప్పటికీ బ్లూటూత్ పరికరాల కోసం స్కాన్ చేస్తాయి. మీరు దీన్ని <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>స్కానింగ్ సెట్టింగ్‌లు<xliff:g id="LINK_END_1">LINK_END</xliff:g>లో మార్చవచ్చు."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"దీనికి కనెక్ట్ చేయి…"</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>
@@ -589,8 +584,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"స్థాన ఖచ్చితత్వాన్ని మెరుగుపరచడానికి, అనువర్తనాలు మరియు సేవలు Wi‑Fi ఆఫ్‌లో ఉన్నప్పటికీ Wi‑Fi నెట్‌వర్క్‌ల కోసం స్కాన్ చేస్తాయి. మీరు దీన్ని <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>స్కానింగ్ సెట్టింగ్‌లు<xliff:g id="LINK_END_1">LINK_END</xliff:g>లో మార్చవచ్చు."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"మళ్లీ చూపవద్దు"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"నిద్రావస్థలో ఉన్నప్పుడు Wi‑Fiని ఆన్‌లో ఉంచు"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"నిద్రావస్థలో Wi‑Fi ఆన్‌లో ఉంచు"</string>
@@ -607,8 +601,6 @@
     <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_apps" msgid="6003687912727859577">"అనువర్తనాలను చూపు"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"వైఫై సామర్థ్యాన్ని చూపు"</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>
@@ -666,6 +658,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"కనెక్ట్ చేయి"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"ఈ నెట్‌వర్క్‌కు ఇంటర్నెట్ ప్రాప్యత లేదు. ఈ నెట్‌వర్క్‌ను ఏదేమైనా ఉపయోగించాలా?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"ఈ నెట్‌వర్క్ కోసం మళ్లీ అడగవద్దు"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"కనెక్ట్ చేయి"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"నెట్‌వర్క్‌కు కనెక్ట్ చేయడం విఫలమైంది"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"విస్మరించు"</string>
@@ -737,12 +731,10 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fiకి ప్రాధాన్యత"</item>
     <item msgid="5267397515594230396">"సెల్యులార్‌కి ప్రాధాన్యత"</item>
-    <item msgid="3132912693346866895">"Wi-Fi మాత్రమే"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wi-Fi కాలింగ్ ఆన్‌లో ఉన్నప్పుడు, మీ ఫోన్ మీ ప్రాధాన్యత మరియు ఏ సిగ్నల్ సామర్థ్యం ఎక్కువగా ఉంది వంటి అంశాల ఆధారంగా Wi-Fi నెట్‌వర్క్‌లు లేదా మీ క్యారియర్ నెట్‌వర్క్ ద్వారా కాల్‌లు వెళ్లేలా చేస్తుంది. ఈ లక్షణాన్ని ఆన్ చేయడానికి ముందు, రుసుములు మరియు ఇతర వివరాల గురించి తెలుసుకోవడానికి మీ క్యారియర్‌ను సంప్రదించండి."</string>
     <string name="home_settings" msgid="212375129455718176">"హోమ్"</string>
@@ -916,12 +908,12 @@
     <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">"అనువర్తనాలు (అనువర్తన డేటా &amp; మీడియా కంటెంట్)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"అనువర్తనాలు &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_music_usage" msgid="1363785144783011606">"ఆడియో (సంగీతం, రింగ్‌టోన్‌లు, పాడ్‌కాస్ట్‌లు మొ.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"నానావిధమైనవి"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"ఇతర ఫైల్‌లు"</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>
@@ -954,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"అన్‌మౌంట్ ప్రోగ్రెస్‌లో ఉంది"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"నిల్వ స్థలం అయిపోతోంది"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"సమకాలీకరించడం వంటి కొన్ని సిస్టమ్ కార్యాచరణలు సరిగ్గా పని చేయకపోవచ్చు. అనువర్తనాలు లేదా మీడియా కంటెంట్ వంటి అంశాలను తొలగించడం లేదా అన్‌పిన్ చేయడం ద్వారా స్థలాన్ని ఖాళీ చేయడానికి ప్రయత్నించండి."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"పేరు మార్చు"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"మౌంట్ చేయి"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"తొలగించు"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"తొలగించు &amp; ఫార్మాట్ చేయి"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"తొలగించు &amp; అంతర్గత నిల్వగా ఫార్మాట్ చేయి"</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>
@@ -964,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"MIDI ప్రారంభిత అనువర్తనాలు USB ద్వారా మీ కంప్యూటర్‌లోని MIDI సాఫ్ట్‌వేర్‌తో పని చేసేలా అనుమతిస్తుంది."</string>
     <string name="storage_other_users" msgid="808708845102611856">"ఇతర వినియోగదారులు"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"పరికర నిల్వ"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"తీసివేయదగిన నిల్వ"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> ఖాళీ (మొత్తం <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> మౌంట్ చేయబడింది"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g>ని మౌంట్ చేయలేకపోయింది"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> సురక్షితంగా తొలగించబడింది"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g>ని సురక్షితంగా తొలగించలేకపోయింది"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> ఫార్మాట్ చేయబడింది"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g>ని ఫార్మాట్ చేయలేకపోయింది"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"నిల్వ పేరు మార్చండి"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"ఫార్మాట్ చేసిన తర్వాత, మీరు ఈ <xliff:g id="NAME_0">^1</xliff:g>ని ఇతర పరికరాల్లో ఉపయోగించవచ్చు. \n\nఈ <xliff:g id="NAME_1">^1</xliff:g>లోని మొత్తం డేటా తొలగించబడుతుంది. ముందుగా బ్యాకప్ చేయడాన్ని పరిశీలించండి. \n\n"<b>"ఫోటోలు &amp; ఇతర మీడియాను బ్యాకప్ చేయండి"</b>" \nమీ మీడియా ఫైల్‌లను ఈ పరికరంలోని ప్రత్యామ్నాయ నిల్వకు తరలించండి లేదా USB కేబుల్‌ను ఉపయోగించి వాటిని కంప్యూటర్‌కి బదిలీ చేయండి. \n\n"<b>"అనువర్తనాలను బ్యాకప్ చేయండి"</b>" \nఈ <xliff:g id="NAME_6">^1</xliff:g>లోని అన్ని అనువర్తనాలు అన్ఇన్‌స్టాల్ చేయబడతాయి మరియు వాటి డేటా తొలగించబడుతుంది. ఈ అనువర్తనాలను అలాగే ఉంచడానికి, వీటిని ఈ పరికరంలోని ప్రత్యామ్నాయ నిల్వకు తరలించండి."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"మీరు ఈ <xliff:g id="NAME_0">^1</xliff:g>ను తొలగించినప్పుడు, దీనిలో నిల్వ చేసిన అనువర్తనాలు పని చేయకుండా ఆగిపోతాయి మరియు దీనిలో నిల్వ చేసిన మీడియా ఫైల్‌లు దీన్ని తిరిగి చొప్పించే వరకు అందుబాటులో లేకుండాపోతాయి."</b>" \n\nఈ <xliff:g id="NAME_1">^1</xliff:g> ఈ పరికరంలో మాత్రమే పని చేసేలా ఫార్మాట్ చేయబడింది. ఇది ఇంక వేటిలోనూ పని చేయదు."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"మీ <xliff:g id="NAME">^1</xliff:g> సెటప్ చేయండి"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"పోర్టబుల్ నిల్వగా ఉపయోగించు"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"ఫోటోలను మరియు ఇతర మీడియాను పరికరాల మధ్య తరలించడానికి."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"అంతర్గత నిల్వగా ఉపయోగించు"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"అనువర్తనాలు మరియు ఫోటోలతో సహా దేన్నైనా ఈ పరికరంలో మాత్రమే నిల్వ చేయడానికి. దీన్ని ఇతర పరికరాలతో పని చేయకుండా నిరోధించే ఫార్మాటింగ్ అవసరం."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"అంతర్గత నిల్వగా ఫార్మాట్ చేయండి"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"ఇందుకోసం <xliff:g id="NAME_0">^1</xliff:g>ని సురక్షితంగా ఉంచడానికి దాన్ని ఫార్మాట్ చేయడం అవసరం. \n\nఫార్మాట్ చేసిన తర్వాత, ఈ <xliff:g id="NAME_1">^1</xliff:g> ఈ పరికరంలో మాత్రమే పని చేస్తుంది. \n\n"<b>"ఫార్మాట్ చేస్తే ప్రస్తుతం <xliff:g id="NAME_2">^1</xliff:g>లో నిల్వ చేయబడిన మొత్తం డేటా తొలగించబడుతుంది."</b>" డేటాను కోల్పోవడం నివారించడానికి, దాన్ని బ్యాకప్ చేయడం పరిశీలించండి."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"డేటా తొలగించి, ఫార్మాట్ చేయి"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g>ని ఫార్మాట్ చేస్తోంది…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"<xliff:g id="NAME">^1</xliff:g>ని ఫార్మాట్ చేస్తున్నప్పుడు మధ్యలో తీసివేయవద్దు."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"డేటాను కొత్త నిల్వకు తరలించండి"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"మీరు మీ ఫోటోలను, ఫైల్‌లను మరియు అనువర్తన డేటాను ఈ కొత్త <xliff:g id="NAME">^1</xliff:g>కి తరలించవచ్చు. \n\nతరలించడానికి సుమారు <xliff:g id="TIME">^2</xliff:g> పడుతుంది మరియు అంతర్గత నిల్వలో <xliff:g id="SIZE">^3</xliff:g> ఖాళీ చేయబడుతుంది. ప్రాసెస్‌లో ఉన్నప్పుడు కొన్ని అనువర్తనాలు పని చేయవు."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"ఇప్పుడే తరలించు"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"తర్వాత తరలించు"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"డేటాను ఇప్పుడే తరలించు"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"తరలించడానికి సుమారు <xliff:g id="TIME">^1</xliff:g> పడుతుంది. దీని వలన అంతర్గత నిల్వలో <xliff:g id="SIZE">^2</xliff:g> ఖాళీ చేయబడుతుంది."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"తరలించు"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"డేటాను తరలిస్తోంది…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"తరలించే సమయంలో: \n• <xliff:g id="NAME">^1</xliff:g>ని తీసివేయవద్దు. \n• కొన్ని అనువర్తనాలు సరిగ్గా పని చేయవు. \n• పరికరం ఛార్జ్ చేసి పెట్టండి."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> సిద్ధంగా ఉంది"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"మీ <xliff:g id="NAME">^1</xliff:g> ఫోటోలు మరియు ఇతర మీడియాతో ఉపయోగించేలా పూర్తిగా సెట్ చేయబడింది."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"మీ కొత్త <xliff:g id="NAME">^1</xliff:g> పని చేస్తోంది. \n\nఫోటోలు, ఫైల్‌లు మరియు అనువర్తన డేటాను ఈ పరికరానికి తరలించడానికి, సెట్టింగ్‌లు &gt; నిల్వకు వెళ్లండి."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g>ని తరలించండి"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<xliff:g id="APP">^1</xliff:g>ను మరియు దాని డేటాను <xliff:g id="NAME_0">^2</xliff:g>కి తరలించడానికి కేవలం కొన్ని క్షణాల సమయం పడుతుంది. మీరు తరలింపు పూర్తయ్యే వరకు అనువర్తనాన్ని ఉపయోగించలేరు. \n\nతరలించే సమయంలో <xliff:g id="NAME_1">^2</xliff:g>ని తీసివేయవద్దు."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g>ని తరలిస్తోంది…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"తరలించే సమయంలో <xliff:g id="NAME">^1</xliff:g>ని తీసివేయవద్దు. \n\nఈ పరికరంలోని <xliff:g id="APP">^2</xliff:g> అనువర్తనం తరలింపు పూర్తయ్యే వరకు అందుబాటులో ఉండదు."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"తరలింపు రద్దు చేయి"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"బ్యాటరీ స్థితి"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"బ్యాటరీ స్థాయి"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNలు"</string>
@@ -1008,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"డిఫాల్ట్‌కు రీసెట్ చేయి"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"డిఫాల్ట్ APN సెట్టింగ్‌లను రీసెట్ చేయడం పూర్తయింది."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"నెట్‌వర్క్ సెట్టింగ్‌లను రీసెట్ చేయి"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"దీని వలన వీటితో సహా నెట్‌వర్కింగ్‌కి సంబంధించిన అన్ని సెట్టింగ్‌లు ఫ్యాక్టరీ డిఫాల్ట్‌లకు రీసెట్ చేయబడతాయి:\n\n"<li>"Wifi"</li>\n<li>"మొబైల్ డేటా"</li>\n<li>"బ్లూటూత్"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"దీని వలన వీటితో సహా అన్ని నెట్‌వర్క్ సెట్టింగ్‌లు రీసెట్ చేయబడతాయి:\n\n"<li>"Wi‑Fi"</li>\n<li>"సెల్యులార్ డేటా"</li>\n<li>"బ్లూటూత్"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"సెట్టింగ్‌లను రీసెట్ చేయి"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"అన్ని నెట్‌వర్క్ సెట్టింగ్‌లను రీసెట్ చేయాలా? మీరు ఈ చర్యను తిరిగి రద్దు చేయలేరు!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"అన్ని నెట్‌వర్క్ సెట్టింగ్‌లను రీసెట్ చేయాలా? మీరు ఈ చర్యను తిరిగి రద్దు చేయలేరు!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"సెట్టింగ్‌లను రీసెట్ చేయి"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"మీరు నెట్‌వర్క్ సెట్టింగ్‌ల రీసెట్‌ను నిర్ధారించడానికి మీ అన్‌లాక్ నమూనాను గీయాలి."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"రీసెట్ చేయాలా?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"నెట్‌వర్క్ సెట్టింగ్‌లు రీసెట్ చేయబడ్డాయి"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"నెట్‌వర్క్ సెట్టింగ్‌లు రీసెట్ చేయబడ్డాయి"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"పరికరాన్ని రీసెట్ చేయి"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"ఫ్యాక్టరీ డేటా రీసెట్ చేయి"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ఇందువలన మీ టాబ్లెట్ యొక్క "<b>"అంతర్గత నిల్వ"</b>" నుండి వీటితో సహా, మొత్తం డేటా ఎరేజ్ చేయబడుతుంది:\n\n"<li>"మీ Google ఖాతా"</li>\n<li>"సిస్టమ్ మరియు అనువర్తన డేటా మరియు సెట్టింగ్‌లు"</li>\n<li>"డౌన్‌లోడ్ చేయబడిన అనువర్తనాలు"</li></string>
@@ -1030,9 +1065,8 @@
     <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="1062841478823409667">"మీ వ్యక్తిగత సమాచారం మరియు డౌన్‌లోడ్ చేసిన అనువర్తనాలు అన్నింటినీ తొలగించాలా? మీరు ఈ చర్యను తిరిగి రద్దు చేయలేరు!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ప్రతిదాన్ని ఎరేజ్ చేయి"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"ఈ వినియోగదారుకి ఫ్యాక్టరీ రీసెట్ అందుబాటులో లేదు"</string>
@@ -1049,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"వాయిస్ మెయిల్‌ను, కాల్ ఫార్వార్డింగ్‌ను, కాల్ వెయిటింగ్‌ను, కాలర్ IDని సెటప్ చేయండి"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB టీథరింగ్"</string>
@@ -1082,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"సహాయం"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"సెల్యులార్ నెట్‌వర్క్‌లు"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"మొబైల్ ప్లాన్"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"డిఫాల్ట్ SMS అనువర్తనం"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS అనువర్తనం"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS అనువర్తనాన్ని మార్చాలా?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"మీ SMS అనువర్తనంగా <xliff:g id="CURRENT_APP">%2$s</xliff:g>కి బదులుగా <xliff:g id="NEW_APP">%1$s</xliff:g>ని ఉపయోగించాలా?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"మీ SMS అనువర్తనంగా <xliff:g id="NEW_APP">%s</xliff:g>ని ఉపయోగించాలా?"</string>
@@ -1113,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"స్థానాన్ని గుర్తించడానికి GPSని ఉపయోగించండి"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"స్కానింగ్"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"స్కానింగ్"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi స్కానింగ్"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Wi‑Fi ఆఫ్‌లో ఉన్నప్పటికీ Wi‑Fi నెట్‌వర్క్‌ల కోసం స్కాన్ చేయడానికి అనువర్తనాలు మరియు సేవలను అనుమతించడం ద్వారా స్థానాన్ని మెరుగుపరుస్తుంది"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"బ్లూటూత్ స్కానింగ్"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"బ్లూటూత్ ఆఫ్‌లో ఉన్నప్పటికీ బ్లూటూత్ పరికరాల కోసం స్కాన్ చేయడానికి సిస్టమ్ సేవలను అనుమతించడం ద్వారా స్థానాన్ని మెరుగుపరుస్తుంది"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; సెల్యులార్ నెట్‌వర్క్ స్థానం"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"మీ స్థానాన్ని వేగవంతంగా అంచనా వేయడం కోసం Google స్థాన సేవను ఉపయోగించడానికి అనువర్తనాలను అనుమతించండి. అనామక స్థాన డేటా సేకరించబడుతుంది మరియు Googleకు పంపబడుతుంది."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"స్థానం Wi‑Fi ద్వారా గుర్తించబడింది"</string>
@@ -1158,11 +1194,15 @@
     <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="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"కొనసాగడానికి మీ పరికరం నమూనాను ఉపయోగించండి."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"కొనసాగడానికి మీ పరికరం PINను నమోదు చేయండి."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"కొనసాగడానికి మీ పరికరం పాస్‌వర్డ్‌ను నమోదు చేయండి."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN తప్పు"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"పాస్‌వర్డ్ తప్పు"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"నమూనా తప్పు"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"పరికర భద్రత"</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>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"సహాయం కోసం మెను నొక్కండి."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"పూర్తయినప్పుడు వేలిని వదలండి"</string>
@@ -1184,8 +1224,7 @@
     <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" msgid="6909161623701848863">"చాలా ఎక్కువ తప్పు ప్రయత్నాలు చేసారు. <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>
@@ -1236,7 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"పరిమాణం ద్వారా క్రమబద్ధీకరించు"</string>
     <string name="show_running_services" msgid="5736278767975544570">"అమలయ్యే సేవలను చూపు"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"కాష్ చేసిన ప్రాసెస్‌లను చూపు"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"డిఫాల్ట్ అత్యవసర అనువర్తనం"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"అత్యవసర అనువర్తనం"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"అనువర్తన ప్రాధాన్యతలను రీసెట్ చేయి"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"అనువర్తన ప్రాధాన్యతలను రీసెట్ చేయాలా?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"ఇది వీటి కోసం అన్ని ప్రాధాన్యతలను రీసెట్ చేస్తుంది:\n\n "<li>"నిలిపివేయబడిన అనువర్తనాలు"</li>\n" "<li>"నిలిపివేయబడిన అనువర్తన నోటిఫికేషన్‌లు"</li>\n" "<li>"చర్యల కోసం డిఫాల్ట్ అనువర్తనాలు"</li>\n" "<li>"అనువర్తనాల కోసం నేపథ్య డేటా పరిమితులు"</li>\n" "<li>"ఏవైనా అనుమతి పరిమితులు"</li>\n\n" మీరు అనువర్తన డేటాను కోల్పోరు."</string>
@@ -1440,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ఫైల్‌లో అన్ని బ్లూటూత్ HCI ప్యాకెట్‌లను క్యాప్చర్ చేయి"</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="select_logd_size_title" msgid="7433137108348553508">"లాగర్ బఫర్ పరిమాణాలు"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 గంటలు"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 రోజు"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"సిస్టమ్‌ను చూపు"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"సిస్టమ్ దాచు"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Ussను ఉపయోగించు"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"గణాంకాల రకం"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"నేపథ్యం"</string>
@@ -1838,7 +1876,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_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>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"వినియోగదారు"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"పరిమితం చేయబడిన ప్రొఫైల్"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"కొత్త వినియోగదారుని జోడించాలా?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"మీరు అదనపు వినియోగదారులను సృష్టించడం ద్వారా ఈ పరికరాన్ని ఇతర వ్యక్తులతో భాగస్వామ్యం చేయగలరు. ప్రతి వినియోగదారుకు వారికంటూ స్వంత స్థలం ఉంటుంది, కనుక వారు వారి స్వంత అనువర్తనాలు, వాల్‌పేపర్ మొదలైనవాటిని అనుకూలీకరించగలరు. వినియోగదారులు ప్రతి ఒక్కరినీ ప్రభావితం చేసే Wi‑Fi వంటి పరికర సెట్టింగ్‌లను కూడా సర్దుబాటు చేయగలరు.\n\nమీరు కొత్త వినియోగదారుని జోడించినప్పుడు, ఆ వ్యక్తి తన స్థలాన్ని సెటప్ చేసుకోవాలి.\n\nఏ వినియోగదారు అయినా మిగతా అందరు వినియోగదారుల కోసం అనువర్తనాలను నవీకరించగలరు."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"మీరు అదనపు వినియోగదారులను సృష్టించడం ద్వారా ఈ పరికరాన్ని ఇతర వ్యక్తులు కూడా ఉపయోగించుకునే సదుపాయం కల్పించవచ్చు. ప్రతి వినియోగదారుకు వారికంటూ ప్రత్యేక స్థలం ఉంటుంది, వారు ఆ స్థలాన్ని అనువర్తనాలు, వాల్‌పేపర్ మొదలైనవాటితో అనుకూలీకరించవచ్చు. వినియోగదారులు ప్రతి ఒక్కరిపై ప్రభావం చూపే Wi‑Fi వంటి పరికర సెట్టింగ్‌లను కూడా సర్దుబాటు చేయవచ్చు.\n\nమీరు కొత్త వినియోగదారును జోడించినప్పుడు, ఆ వ్యక్తి వారికంటూ స్వంత స్థలం సెట్ చేసుకోవాలి.\n\nఏ వినియోగదారు అయినా మిగిలిన అందరు వినియోగదారుల కోసం అనువర్తనాలను నవీకరించవచ్చు."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"మీరు కొత్త వినియోగదారుని జోడించినప్పుడు, ఆ వ్యక్తి తన స్థలాన్ని సెటప్ చేసుకోవాలి.\n\nఏ వినియోగదారు అయినా మిగతా అందరు వినియోగదారుల కోసం అనువర్తనాలను నవీకరించగలరు."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"ఇప్పుడు వినియోగదారుని సెటప్ చేయాలా?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"పరికరాన్ని తీసుకోవడానికి వ్యక్తి అందుబాటులో ఉన్నారని నిర్ధారించుకొని, ఆపై వారికి స్థలాన్ని సెటప్ చేయండి"</string>
@@ -2396,6 +2433,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"అత్యవసర ice అనువర్తనం డిఫాల్ట్"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"అనువర్తనాలు డౌన్‌లోడ్ అనువర్తనాలు సిస్టమ్"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"అనువర్తనాల అనుమతుల భద్రత"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"డిఫాల్ట్‌గా ఉన్న అనువర్తనాలు"</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>
@@ -2410,14 +2448,12 @@
     <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="6948120138640252732">"అంతరాయాలను బ్లాక్ చేయండి"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"కేవలం ప్రాధాన్యమైనవి అనుమతించ."</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"స్వయంచాలక నిబంధనలు"</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_alarms" msgid="7380265858042606857">"అలారాలు మాత్రమే అనుమతించు"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"అంతరాయం కలిగించవద్దు"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"ప్రాధాన్యత మాత్రమే"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"అలారాలు మాత్రమే"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"అంతరాయాలు ఉండకూడదు"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ఫోన్ రింగ్‌టోన్"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"డిఫాల్ట్ నోటిఫికేషన్ రింగ్‌టోన్"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"కాల్‌ల కోసం వైబ్రేట్ కూడా చేయి"</string>
@@ -2450,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"నోటిఫికేషన్ శ్రోతలు ఇన్‌స్టాల్ చేయబడలేదు."</string>
     <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">"అనువర్తనాలు ఏవీ షరతులను అందించవు"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d అనువర్తనాలు షరతులను అందిస్తాయి</item>
-      <item quantity="one">%d అనువర్తనం షరతులను అందిస్తుంది</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="loading_notification_apps" msgid="5031818677010335895">"అనువర్తనాలను లోడ్ చేస్తోంది..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"అన్నింటినీ బ్లాక్ చేయండి"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ఈ అనువర్తనం నుండి నోటిఫికేషన్‌లను ఎప్పుడూ చూపవద్దు"</string>
@@ -2472,17 +2499,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"నిబంధన పేరు"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"నిబంధనను జోడించు"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"నిబంధనను తొలగించు"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<xliff:g id="RULE">%1$s</xliff:g>\" నిబంధనను తొలగించాలా?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"తొలగించు"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"నిబంధన రకం"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"తెలియదు"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"నిబంధనను కాన్ఫిగర్ చేయి"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"షెడ్యూల్ నిబంధన"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"నిబంధన కనుగొనబడలేదు."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"రోజులు"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"ఎప్పుడూ వద్దు"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"ప్రతి రోజు"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"ఎప్పటికీ వద్దు"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> నుండి <xliff:g id="END">%2$s</xliff:g> వరకు"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"కాల్‌లు"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"సందేశాలు"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"వీరి నుండి కాల్‌లు/సందేశాలు"</string>
@@ -2492,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"అలారాలు"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"రిమైండర్‌లు"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ఈవెంట్‌లు"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ఎంచుకున్న కాలర్‌లు"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"పునరావృత కాలర్‌లను అనుమతించు"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"ఒకే వ్యక్తి <xliff:g id="MINUTES">%d</xliff:g> నిమిషం వ్యవధిలో రెండవసారి కాల్ చేస్తే, దాన్ని అనుమతిస్తుంది"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"తదుపరి రోజు <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"మీకు ఎప్పుడు అంతరాయం కలిగించాలని కోరుకుంటున్నారు?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"ఎంతసేపు?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"నిరవధికంగా"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> నిమిషాలు</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> నిమిషం</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> గంటలు</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> గంట</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"నిరవధికంగా ప్రాధాన్య నోటిఫికేషన్‌లు మాత్రమే ఎంపికకు మార్చుతుంది"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> నిమిషాల పాటు అనగా <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> వరకు ప్రాధాన్య నోటిఫికేషన్‌లు మాత్రమే ఎంపికకు మారుతుంది</item>
+      <item quantity="one">ఒక నిమిషం పాటు అనగా <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> వరకు ప్రాధాన్య నోటిఫికేషన్‌లు మాత్రమే ఎంపికకు మారుతుంది</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> గంటల పాటు (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> వరకు) ప్రాధాన్య నోటిఫికేషన్‌లు మాత్రమే ఎంపికకు మారుతుంది</item>
+      <item quantity="one">ఒక గంట పాటు అనగా <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> వరకు ప్రాధాన్య నోటిఫికేషన్‌లు మాత్రమే ఎంపికకు మారుతుంది</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"నిరవధికంగా అలారాలు మాత్రమే ఎంపికకు మార్చుతుంది"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> నిమిషాల పాటు అనగా (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> వరకు) అలారాలు మాత్రమే ఎంపికకు మారుతుంది</item>
+      <item quantity="one">ఒక నిమిషం పాటు అనగా <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> వరకు అలారాలు మాత్రమే ఎంపికకు మారుతుంది</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> గంటల పాటు అనగా <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> వరకు అలారాలు మాత్రమే ఎంపికకు మారుతుంది</item>
+      <item quantity="one">ఒక గంట పాటు అనగా <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> వరకు అలారాలు మాత్రమే ఎంపికకు మారుతుంది</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"నిరవధికంగా అంతరాయం కలిగించవద్దు ఎంపికకు మార్చుతుంది"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> నిమిషాల పాటు (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> వరకు) అంతరాయం కలిగించవద్దు ఎంపికకు మారుతుంది</item>
+      <item quantity="one">ఒక నిమిషం పాటు అనగా <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> వరకు అంతరాయం కలిగించవద్దు ఎంపికకు మారుతుంది</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> గంటల పాటు అనగా <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> వరకు అంతరాయం కలిగించవద్దు ఎంపికకు మారుతుంది</item>
+      <item quantity="one">ఒక గంట పాటు అనగా <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> వరకు అంతరాయం కలిగించవద్దు ఎంపికకు మారుతుంది</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"ఎల్లప్పుడూ అంతరాయం కలిగించు ఎంపికకు మార్చుతుంది"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ఎప్పటికీ"</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>
@@ -2565,7 +2659,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> అనుమతులు మంజూరయ్యాయి</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> అనుమతి మంజూరైంది</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_3">%d</xliff:g>లో <xliff:g id="COUNT_2">%d</xliff:g> అనుమతులు మంజూరు చేయబడ్డాయి</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>లో <xliff:g id="COUNT_0">%d</xliff:g> అనుమతి మంజూరు చేయబడింది</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"కొన్ని డిఫాల్ట్‌లు సెట్ చేయబడ్డాయి"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"డిఫాల్ట్‌లు ఏవీ సెట్ చేయబడలేదు"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"అన్ని అనువర్తనాలు"</string>
@@ -2576,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ప్రాధాన్యత"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"ముఖ్యం"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"డొమైన్ URLలు కలిగి ఉన్నవి"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"అన్ని అనువర్తనాల్లో ప్రాధాన్యతలను డిఫాల్ట్‌లకు రీసెట్ చేస్తుంది"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"సిస్టమ్ మరియు డౌన్‌లోడ్ చేసిన అనువర్తనాలతో సహా <xliff:g id="COUNT">%d</xliff:g> అనువర్తనాలు ఇన్‌స్టాల్ చేయబడ్డాయి"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"నిర్వాహకుని ద్వారా నిలిపివేయబడింది"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"అధునాతనం"</string>
     <string name="unknown_app" msgid="5275921288718717656">"తెలియని అనువర్తనం"</string>
     <string name="choose_profile" msgid="8229363046053568878">"ప్రొఫైల్‌ను ఎంచుకోండి"</string>
@@ -2592,4 +2688,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> అనువర్తనాలు వాటి డొమైన్ URLలను తెరవగలవు</item>
       <item quantity="one">ఒక అనువర్తనం దాని డొమైన్ URLలను తెరవగలదు</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"గుర్తించలేదు"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"డిఫాల్ట్ అనువర్తనాలు"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"బ్రౌజర్ అనువర్తనం"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"డిఫాల్ట్ బ్రౌజర్ లేదు"</string>
+    <string name="default_app" msgid="6864503001385843060">"(డిఫాల్ట్)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 2a630c3..a434181 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"ปุ่มกด"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"ต่ำ"</item>
     <item msgid="4212263919458209842">"วิกฤต"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"ปิด"</item>
-    <item msgid="5656544177755411222">"การรบกวนที่จำกัด"</item>
-    <item msgid="8735337502532332056">"การรบกวนเป็นศูนย์"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"ปกติ"</item>
     <item msgid="866544120205026771">"ปานกลาง"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index da12b81..c1d5202 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"การ์ด SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"การตั้งค่าพร็อกซี"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ใช่"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"ไม่"</string>
-    <string name="forget" msgid="7267115980248732932">"ไม่จำ"</string>
+    <string name="forget" msgid="1400428660472591263">"ไม่จำ"</string>
+    <string name="save" msgid="879993180139353333">"บันทึก"</string>
+    <string name="done" msgid="6942539184162713160">"เสร็จสิ้น"</string>
     <string name="settings_label" msgid="1626402585530130914">"การตั้งค่า"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"การตั้งค่า"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"ทางลัดการตั้งค่า"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"เสียบที่ชาร์จของคุณ แล้วลองอีกครั้ง"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"ไม่มี PIN หรือรหัสผ่านล็อกหน้าจอ"</string>
     <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>
@@ -521,7 +518,7 @@
     <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="ble_scan_notify_text" msgid="9019985398053764737">"เพื่อปรับปรุงความแม่นยำของตำแหน่ง บริการของ Google จะสแกนหาอุปกรณ์บลูทูธ แม้ในเวลาที่ปิดบลูทูธ คุณสามารถเปลี่ยนแปลงคุณลักษณะนี้ได้ในLINK_BEGINการตั้งค่าการสแกนLINK_END"</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"เพื่อปรับปรุงความแม่นยำของตำแหน่ง แอปและบริการจะสแกนหาอุปกรณ์บลูทูธแม้ในเวลาที่ปิดบลูทูธ คุณสามารถเปลี่ยนแปลงคุณลักษณะนี้ได้ใน<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>การตั้งค่าการสแกน<xliff:g id="LINK_END_1">LINK_END</xliff:g>"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"เชื่อมต่อกับ…"</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>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"เพื่อปรับปรุงความแม่นยำของตำแหน่ง บริการของ Google จะสแกนหาเครือข่าย Wi-Fi แม้ในเวลาที่ปิด Wi-Fi อยู่ คุณสามารถเปลี่ยนแปลงคุณลักษณะนี้ได้ในLINK_BEGINการตั้งค่าการสแกนLINK_END"</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"เพื่อปรับปรุงความแม่นยำของตำแหน่ง แอปและบริการจะสแกนหาเครือข่าย Wi‑Fi แม้ในเวลาที่ปิด Wi‑Fi คุณสามารถเปลี่ยนแปลงคุณลักษณะนี้ได้ใน<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>การตั้งค่าการสแกน<xliff:g id="LINK_END_1">LINK_END</xliff:g>"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"ไม่ต้องแสดงข้อความนี้อีก"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"เปิด WiFi ระหว่างที่อยู่ในโหมดสลีป"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"เปิด Wi-Fi ระหว่างอยู่ในโหมดสลีป"</string>
@@ -604,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"WiFi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"สแกน"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"ขั้นสูง"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"แสดงแอป"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"แสดงความแรงของ Wi-Fi"</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>
@@ -663,6 +658,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"เชื่อมต่อ"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"เครือข่ายนี้ไม่มีการเข้าถึงอินเทอร์เน็ต ยืนยันที่จะใช้เครือข่ายนี้ไหม"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"ไม่ต้องถามอีกสำหรับเครือข่ายนี้"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"เชื่อมต่อ"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ไม่สามารถเชื่อมต่อกับเครือข่าย"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"ไม่จำ"</string>
@@ -729,21 +726,17 @@
     <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> WiFi ฮอตสปอตแบบพกพา"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"การโทรผ่าน Wi-Fi"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"ค่ากำหนดในการโทร"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"โหมดการโทรผ่าน Wi-Fi"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"ต้องการใช้ Wi-Fi"</item>
     <item msgid="5267397515594230396">"ต้องการใช้เครือข่ายมือถือ"</item>
-    <item msgid="3132912693346866895">"Wi-Fi เท่านั้น"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"เมื่อเปิดการโทรผ่าน Wi-Fi โทรศัพท์จะสามารถวางเส้นทางสายเรียกผ่านเครือข่าย Wi-Fi หรือเครือข่ายของผู้ให้บริการของคุณได้ ทั้งนี้ขึ้นอยู่กับค่ากำหนดของคุณและสัญญาณฝั่งที่แรงกว่า โปรดสอบถามค่าธรรมเนียมและรายละเอียดอื่นๆ กับผู้ให้บริการก่อนที่จะเปิดคุณลักษณะนี้"</string>
     <string name="home_settings" msgid="212375129455718176">"หน้าแรก"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"แสดง"</string>
     <string name="sound_settings" msgid="5534671337768745343">"เสียง"</string>
@@ -915,12 +908,12 @@
     <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="5128673488173839077">"แอปและข้อมูลแอป"</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_media_misc_usage" msgid="235452944021647124">"เบ็ดเตล็ด"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"ไฟล์อื่นๆ"</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>
@@ -953,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"กำลังยกเลิกการต่อเชื่อม"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"พื้นที่จัดเก็บเหลือน้อย"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"ฟังก์ชันบางอย่างของระบบ เช่น การซิงค์ อาจทำงานได้ไม่ถูกต้อง ให้ลองเพิ่มพื้นที่จัดเก็บข้อมูลด้วยการลบหรือเลิกตรึงรายการ เช่น แอป หรือเนื้อหาสื่อ"</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"เปลี่ยนชื่อ"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"ต่อเชื่อม"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"นำอุปกรณ์ออก"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"ลบและจัดรูปแบบ"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"ลบและจัดรูปแบบเป็นที่เก็บภายใน"</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>
@@ -963,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"ให้แอปพลิเคชันที่รองรับ MIDI ทำงานกับซอฟต์แวร์ MIDI ผ่าน USB บนคอมพิวเตอร์ของคุณ"</string>
     <string name="storage_other_users" msgid="808708845102611856">"ผู้ใช้รายอื่นๆ"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"ที่เก็บข้อมูลอุปกรณ์"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"ที่เก็บข้อมูลแบบถอดได้"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"ว่าง <xliff:g id="FREE">%1$s</xliff:g> (ทั้งหมด <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"ต่อเชื่อม<xliff:g id="NAME">%1$s</xliff:g>แล้ว"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"ไม่สามารถต่อเชื่อม<xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"นำ<xliff:g id="NAME">%1$s</xliff:g>ออกได้อย่างปลอดภัยแล้ว"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"ไม่สามารถนำ<xliff:g id="NAME">%1$s</xliff:g>ออกได้อย่างปลอดภัย"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"จัดรูปแบบ<xliff:g id="NAME">%1$s</xliff:g>แล้ว"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"ไม่สามารถจัดรูปแบบ<xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"เปลี่ยนชื่อที่เก็บข้อมูล"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"หลังจากการฟอร์แมต คุณสามารถใช้ <xliff:g id="NAME_0">^1</xliff:g> นี้ในอุปกรณ์อื่นๆ ได้ \n\nข้อมูลทั้งหมดใน <xliff:g id="NAME_1">^1</xliff:g> นี้จะถูกลบ ขอแนะนำให้คุณสำรองข้อมูลไว้ก่อน \n\n"<b>"สำรองข้อมูลรูปภาพและสื่ออื่นๆ"</b>" \nย้ายไฟล์สื่อของคุณไปยังที่จัดเก็บข้อมูลสำรองบนอุปกรณ์นี้ หรือโอนไปยังคอมพิวเตอร์ที่ใช้สาย USB \n\n"<b>"สำรองข้อมูลแอป"</b>" \nแอปทั้งหมดที่จัดเก็บบน <xliff:g id="NAME_6">^1</xliff:g> นี้จะถูกถอนการติดตั้งและข้อมูลของแอปจะถูกลบ หากต้องการเก็บแอปเหล่านี้ไว้ ให้ย้ายไปยังที่จัดเก็บข้อมูลสำรองบนอุปกรณ์นี้"</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"เมื่อคุณนำ <xliff:g id="NAME_0">^1</xliff:g> นี้ออก แอปที่จัดเก็บไว้จะหยุดทำงาน และจะไม่พบไฟล์สื่อที่จัดเก็บไว้จนกว่าจะมีการใส่การ์ด SD นี้เข้าไปอีกครั้ง"</b>" \n\nโดย <xliff:g id="NAME_1">^1</xliff:g> นี้ได้รับการฟอร์แมตเพื่อให้ทำงานบนอุปกรณ์นี้เท่านั้น และจะไม่ทำงานบนอุปกรณ์อื่น"</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"ตั้งค่า <xliff:g id="NAME">^1</xliff:g> ของคุณ"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"ใช้เป็นที่จัดเก็บข้อมูลแบบพกพา"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"สำหรับการย้ายรูปภาพและสื่ออื่นๆ ระหว่างอุปกรณ์"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"ใช้เป็นที่จัดเก็บข้อมูลภายใน"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"สำหรับการจัดเก็บสิ่งต่างๆ ไว้บนอุปกรณ์นี้เท่านั้น รวมถึงแอปและรูปภาพ จำเป็นต้องมีการฟอร์แมตที่ป้องกันไม่ให้มีการทำงานร่วมกับอุปกรณ์อื่นๆ"</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"ฟอร์แมตเป็นที่จัดเก็บข้อมูลภายใน"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"จำเป็นต้องฟอร์แมต <xliff:g id="NAME_0">^1</xliff:g> เพื่อให้มีความปลอดภัย \n\nหลังการฟอร์แมต <xliff:g id="NAME_1">^1</xliff:g> จะทำงานบนอุปกรณ์นี้เท่านั้น \n\n"<b>"การฟอร์แมตจะลบข้อมูลทั้งหมดที่จัดเก็บไว้ใน <xliff:g id="NAME_2">^1</xliff:g> ขณะนี้"</b>" ขอแนะนำให้คุณสำรองข้อมูลเพื่อหลีกเลี่ยงการสูญหายของข้อมูล"</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"ลบและจัดฟอร์แมต"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"กำลังฟอร์แมต <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"ไม่ต้องนำ <xliff:g id="NAME">^1</xliff:g> ออกขณะฟอร์แมต"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ย้ายข้อมูลไปที่จัดเก็บข้อมูลใหม่"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"คุณสามารถย้ายรูปภาพ ไฟล์ และข้อมูลแอปไปยัง <xliff:g id="NAME">^1</xliff:g> ใหม่นี้ \n\nการย้ายจะใช้เวลาประมาณ <xliff:g id="TIME">^2</xliff:g> และจะทำให้มีพื้นที่ว่าง <xliff:g id="SIZE">^3</xliff:g> บนที่จัดเก็บข้อมูลภายใน แอปบางแอปจะไม่ทำงานขณะดำเนินการ"</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"ย้ายเลย"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"ย้ายในภายหลัง"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"ย้ายข้อมูลเลย"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"การย้ายจะใช้เวลาประมาณ <xliff:g id="TIME">^1</xliff:g> และจะทำให้มีพื้นที่ว่าง <xliff:g id="SIZE">^2</xliff:g> บนที่จัดเก็บข้อมูลภายใน"</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"ย้าย"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"กำลังย้ายข้อมูล…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"ระหว่างการย้าย: \n• ห้ามนำ <xliff:g id="NAME">^1</xliff:g> ออก\n• แอปบางแอปจะไม่ทำงานอย่างถูกต้อง \n• ชาร์จไฟอุปกรณ์ไว้เสมอ"</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> พร้อมแล้ว"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> ของคุณพร้อมใช้งานกับรูปภาพและสื่ออื่นๆ แล้ว"</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> ใหม่ของคุณกำลังทำงาน \n\nหากต้องการย้ายรูปภาพ ไฟล์ และข้อมูลแอปมายังอุปกรณ์นี้ ให้ไปที่การตั้งค่า &amp;gt ที่จัดเก็บข้อมูล"</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"ย้าย <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"การย้าย <xliff:g id="APP">^1</xliff:g> และข้อมูลในแอปไปยัง <xliff:g id="NAME_0">^2</xliff:g> จะใช้เวลาไม่นาน คุณจะไม่สามารถใช้แอปดังกล่าวได้จนกว่าการย้ายจะเสร็จสมบูรณ์ \n\nห้ามนำ <xliff:g id="NAME_1">^2</xliff:g> ออกระหว่างการย้าย"</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"กำลังย้าย <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"ห้ามนำ <xliff:g id="NAME">^1</xliff:g> ออกขณะทำการย้าย \n\nแอป <xliff:g id="APP">^2</xliff:g> บนอุปกรณ์นี้จะไม่สามารถใช้ได้จนกว่าการย้ายจะเสร็จสมบูรณ์"</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ยกเลิกการย้าย"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"สถานะแบตเตอรี่"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ระดับแบตเตอรี่"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"รีเซ็ตเป็นค่าเริ่มต้น"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"รีเซ็ตการตั้งค่า APN กลับเป็นค่าเริ่มต้นเรียบร้อยแล้ว"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"รีเซ็ตการตั้งค่าเครือข่าย"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"ระบบจะรีเซ็ตการตั้งค่าทั้งหมดที่เกี่ยวข้องกับเครือข่ายเป็นค่าเริ่มต้น รวมถึง:\n\n"<li>"Wi-Fi"</li>"ข้อมูลมือถือ\n"<li></li>\n<li>"บลูทูธ"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"การดำเนินการนี้จะรีเซ็ตการตั้งค่าเครือข่ายทั้งหมด รวมถึง:\n\n"<li>"Wi‑Fi"</li>\n<li>"ข้อมูลมือถือ"</li>\n<li>"บลูทูธ"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"รีเซ็ตการตั้งค่า"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"ต้องการรีเซ็ตการตั้งค่าเครือข่ายทั้งหมดหรือ คุณจะไม่สามารถย้อนกลับได้!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"รีเซ็ตการตั้งค่าเครือข่ายทั้งหมดใช่ไหม คุณจะไม่สามารถยกเลิกการทำงานนี้ได้!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"รีเซ็ตการตั้งค่า"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"คุณต้องวาดรูปแบบการปลดล็อกเพื่อยืนยันการรีเซ็ตการตั้งค่าเครือข่าย"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"รีเซ็ตไหม"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"รีเซ็ตการตั้งค่าเครือข่ายแล้ว"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"รีเซ็ตการตั้งค่าเครือข่ายแล้ว"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"รีเซ็ตอุปกรณ์"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"รีเซ็ตข้อมูลเป็นค่าเริ่มต้น"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"การดำเนินการนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่จัดเก็บข้อมูลภายใน"</b>"ของแท็บเล็ตของคุณ ซึ่งประกอบด้วย\n\n"<li>"บัญชี Google ของคุณ"</li>\n<li>"ข้อมูลและการตั้งค่าของระบบและแอปพลิเคชัน"</li>\n<li>"แอปพลิเคชันที่ดาวน์โหลด"</li></string>
@@ -1029,9 +1065,8 @@
     <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="1062841478823409667">"ลบข้อมูลส่วนบุคคลและแอปที่ดาวน์โหลดทั้งหมดใช่ไหม คุณไม่สามารถยกเลิกการทำงานนี้ได้!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ลบทุกอย่าง"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"การรีเซ็ตเป็นค่าจากโรงงานไม่สามารถใช้ได้สำหรับผู้ใช้รายนี้"</string>
@@ -1048,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"ตั้งค่าข้อความเสียง การโอนสาย สายเรียกซ้อน หมายเลขผู้โทร"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"ปล่อยสัญญาณผ่าน USB"</string>
@@ -1081,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"ความช่วยเหลือ"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"เครือข่ายมือถือ"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"แผนบริการอุปกรณ์เคลื่อนที่"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"แอป SMS ค่าเริ่มต้น"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"แอป SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"เปลี่ยนแอป SMS ไหม"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"ใช้ <xliff:g id="NEW_APP">%1$s</xliff:g> เป็นแอป SMS ของคุณแทน <xliff:g id="CURRENT_APP">%2$s</xliff:g> ไหม"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"ใช้ <xliff:g id="NEW_APP">%s</xliff:g> เป็นแอป SMS ของคุณไหม"</string>
@@ -1112,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ใช้ GPS เพื่อระบุตำแหน่ง"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"การสแกน"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"การสแกน"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"การสแกนหา Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"ปรับปรุงตำแหน่งโดยอนุญาตให้แอปและบริการสแกนหาเครือข่าย Wi‑Fi แม้ในเวลาที่ปิด Wi‑Fi"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"การสแกนหาบลูทูธ"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"ปรับปรุงตำแหน่งโดยให้บริการของระบบสแกนหาอุปกรณ์บลูทูธ แม้ในเวลาที่ปิดบลูทูธ"</string>
     <string name="location_network_based" msgid="6010456018401296590">"ตำแหน่ง Wi-Fi และเครือข่าย"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"ให้แอปต่างๆ ใช้บริการระบุตำแหน่งของ Google เพื่อระบุตำแหน่งโดยประมาณของคุณรวดเร็วยิ่งขึ้น โดยจะมีการรวบรวมและส่งข้อมูลตำแหน่งที่ไม่ระบุชื่อให้ Google"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"ตำแหน่งที่กำหนดโดย WiFi"</string>
@@ -1157,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"ตั้งค่ารหัสผ่านแล้ว"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"ตั้งค่า PIN แล้ว"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"ตั้งค่ารูปแบบแล้ว"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"ใช้รูปแบบอุปกรณ์ของคุณเพื่อดำเนินการต่อ"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"ป้อน PIN อุปกรณ์ของคุณเพื่อดำเนินการต่อ"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"ป้อนรหัสผ่านอุปกรณ์ของคุณเพื่อดำเนินการต่อ"</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN ไม่ถูกต้อง"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"รหัสผ่านไม่ถูกต้อง"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"รูปแบบไม่ถูกต้อง"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"ความปลอดภัยของอุปกรณ์"</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_wrong" msgid="4694973540770105678">"ลองอีกครั้ง:"</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>
@@ -1183,8 +1224,7 @@
     <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" msgid="6909161623701848863">"ดำเนินการไม่ถูกต้องหลายครั้งเกินไป ลองอีกครั้งใน <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>
@@ -1235,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"จัดเรียงตามขนาด"</string>
     <string name="show_running_services" msgid="5736278767975544570">"แสดงบริการที่ใช้งานอยู่"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"แสดงกระบวนการที่เก็บแคชไว้"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"แอปฉุกเฉิน"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"รีเซ็ตค่ากำหนดแอปพลิเคชัน"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"รีเซ็ตค่ากำหนดแอปหรือไม่"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"การดำเนินการนี้จะรีเซ็ตค่ากำหนดทั้งหมดสำหรับ:\n\n "<li>"แอปที่ปิดใช้งาน"</li>\n" "<li>"การแจ้งเตือนแอปที่ปิดใช้งาน"</li>\n" "<li>"แอปพลิเคชันเริ่มต้นสำหรับการทำงานต่างๆ"</li>\n" "<li>"}ข้อจำกัดข้อมูลในพื้นหลังสำหรับแอป"</li>\n" "<li>"ข้อจำกัดสิทธิ์ใดๆ"</li>\n\n" ทั้งนี้ คุณจะไม่สูญเสียข้อมูลใดๆ ของแอป"</string>
@@ -1440,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"บันทึกแพ็คเก็ตบลูทูธ HCI ทั้งหมดในไฟล์"</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="select_logd_size_title" msgid="7433137108348553508">"ขนาดบัฟเฟอร์ของ Logger"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 ชั่วโมง"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 วัน"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"แสดงระบบ"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"ซ่อนระบบ"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"ใช้ Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"ประเภทสถิติ"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"พื้นหลัง"</string>
@@ -1838,7 +1876,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_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>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"ผู้ใช้"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"โปรไฟล์ที่ถูกจำกัด"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"ต้องการเพิ่มผู้ใช้ใหม่ใช่ไหม"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"คุณสามารถแชร์อุปกรณ์นี้กับผู้อื่นได้โดยการสร้างผู้ใช้เพิ่มเติม ผู้ใช้แต่ละคนจะมีพื้นที่ของตนเองซึ่งสามารถปรับใช้กับแอป วอลล์เปเปอร์ และอื่นๆ ของตนเอง ผู้ใช้สามารถปรับการตั้งค่าของอุปกรณ์ เช่น Wi‑Fi ที่มีผลกับทุกคน\n\nเมื่อคุณเพิ่มผู้ใช้ใหม่ ผู้ใช้ดังกล่าวจะต้องตั้งค่าพื้นที่ของตน\n\nผู้ใช้ทุกคนสามารถอัปเดตแอปสำหรับผู้ใช้รายอื่นได้"</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"คุณสามารถแชร์อุปกรณ์นี้กับผู้อื่นได้โดยการสร้างผู้ใช้เพิ่มเติม ผู้ใช้แต่ละคนจะมีพื้นที่ของตนเองซึ่งสามารถปรับใช้กับแอป วอลล์เปเปอร์ และอื่นๆ ผู้ใช้สามารถปรับการตั้งค่าอุปกรณ์ เช่น Wi‑Fi ที่มีผลกับทุกคน\n\nเมื่อคุณเพิ่มผู้ใช้ใหม่ ผู้ใช้ดังกล่าวจะต้องตั้งค่าพื้นที่ของตน\n\nผู้ใช้ทุกคนสามารถอัปเดตแอปสำหรับผู้ใช้รายอื่นๆ ทั้งหมดได้"</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"เมื่อคุณเพิ่มผู้ใช้ใหม่ ผู้ใช้ดังกล่าวจะต้องตั้งค่าพื้นที่ของตนเอง\n\nผู้ใช้ทุกคนสามารถอัปเดตแอปสำหรับผู้ใช้รายอื่นได้"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"ตั้งค่าผู้ใช้เลยไหม"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"ตรวจสอบว่าบุคคลดังกล่าวสามารถนำอุปกรณ์ไปตั้งค่าพื้นที่ของตนได้"</string>
@@ -2393,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"การจำกัด จำกัด ถูกจำกัด"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"การแก้ไขข้อความ แก้ไข เสียง สั่น อัตโนมัติ ภาษา ท่าทางสัมผัส แนะนำ คำแนะนำ ธีม คำที่ไม่เหมาะสม พิมพ์ อีโมจิ นานาชาติ"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"รีเซ็ตค่ากำหนดเป็นค่าเริ่มต้น"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"ค่าเริ่มต้นของแอป ICE ฉุกเฉิน"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"แอป ดาวน์โหลด แอปพลิเคชัน ระบบ"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"ความปลอดภัยในการอนุญาตแอป"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"แอป ค่าเริ่มต้น"</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>
@@ -2411,14 +2448,12 @@
     <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="6948120138640252732">"บล็อกเสียงรบกวน"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"อนุญาตเฉพาะเรื่องสำคัญ"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"กฎอัตโนมัติ"</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_alarms" msgid="7380265858042606857">"อนุญาตเฉพาะการปลุก"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"ห้ามรบกวน"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"เฉพาะเรื่องสำคัญ"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"เฉพาะปลุกเท่านั้น"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"ไม่มีการรบกวน"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"เสียงเรียกเข้า"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"เสียงเรียกเข้าเริ่มต้นสำหรับการแจ้งเตือน"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"สั่นเมื่อมีสายเรียกเข้าด้วย"</string>
@@ -2451,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"ไม่มีตัวฟังการแจ้งเตือนติดตั้งอยู่"</string>
     <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">"ไม่มีแอปที่ให้บริการเงื่อนไข"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d แอปให้บริการเงื่อนไข</item>
-      <item quantity="one">%d แอปให้บริการเงื่อนไข</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="loading_notification_apps" msgid="5031818677010335895">"กำลังโหลดแอป..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"บล็อกทั้งหมด"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ไม่ต้องแสดงการแจ้งเตือนจากแอปนี้"</string>
@@ -2473,17 +2499,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"ชื่อกฎ"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"เพิ่มกฎ"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"ลบกฎ"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"ลบกฎ \"<xliff:g id="RULE">%1$s</xliff:g>\" ใช่ไหม"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"ลบ"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"ประเภทของกฎ"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"ไม่ทราบ"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"กำหนดค่ากฎ"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"กฎที่มีกำหนดการ"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"ไม่พบกฎ"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"วัน"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"ไม่มี"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"ทุกวัน"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"ไม่ใช้เลย"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> ถึง <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"การโทร"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"ข้อความ"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"สาย/ข้อความจาก"</string>
@@ -2493,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"การปลุก"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"การเตือนความจำ"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"กิจกรรม"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ผู้โทรที่เลือกไว้"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ผู้โทรซ้ำ"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"อนุญาตถ้าผู้โทรคนเดิมโทรเป็นครั้งที่ 2 ภายใน <xliff:g id="MINUTES">%d</xliff:g> นาที"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> วันถัดไป"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"คุณต้องการรับการแจ้งเตือนเมื่อใด"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"โปรดระบุระยะเวลา"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"ไม่มีกำหนด"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> นาที</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> นาที</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ชั่วโมง</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ชั่วโมง</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"เปลี่ยนเป็นการแจ้งเตือนเฉพาะเรื่องสำคัญโดยไม่มีกำหนด"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">เปลี่ยนเป็นการแจ้งเตือนเฉพาะเรื่องสำคัญเป็นเวลา <xliff:g id="DURATION">%1$d</xliff:g> นาทีจนถึงเวลา <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">เปลี่ยนเป็นการแจ้งเตือนเฉพาะเรื่องสำคัญเป็นเวลา 1 นาทีจนถึงเวลา <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">เปลี่ยนเป็นการแจ้งเตือนเฉพาะเรื่องสำคัญเป็นเวลา <xliff:g id="DURATION">%1$d</xliff:g> ชั่วโมง (จนถึงเวลา <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">เปลี่ยนเป็นการแจ้งเตือนเฉพาะเรื่องสำคัญเป็นเวลา 1 ชั่วโมงจนถึงเวลา <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"เปลี่ยนเป็นเฉพาะปลุกเท่านั้นโดยไม่มีกำหนด"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">เปลี่ยนเป็นเฉพาะปลุกเท่านั้นเป็นเวลา <xliff:g id="DURATION">%1$d</xliff:g> นาที (จนถึงเวลา <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">เปลี่ยนเป็นเฉพาะปลุกเท่านั้นเป็นเวลา 1 นาทีจนถึงเวลา <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">เปลี่ยนเป็นเฉพาะปลุกเท่านั้นเป็นเวลา <xliff:g id="DURATION">%1$d</xliff:g> ชั่วโมงจนถึงเวลา <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">เปลี่ยนเป็นเฉพาะปลุกเท่านั้นเป็นเวลา 1 ชั่วโมงจนถึงเวลา <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"เปลี่ยนเป็นห้ามรบกวนโดยไม่มีกำหนด"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">เปลี่ยนเป็นห้ามรบกวนเป็นเวลา <xliff:g id="DURATION">%1$d</xliff:g> นาที (จนถึงเวลา <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">เปลี่ยนเป็นห้ามรบกวนเป็นเวลา 1 นาทีจนถึงเวลา <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">เปลี่ยนเป็นห้ามรบกวนเป็นเวลา <xliff:g id="DURATION">%1$d</xliff:g> ชั่วโมงจนถึงเวลา <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">เปลี่ยนเป็นห้ามรบกวนเป็นเวลา 1 ชั่วโมงจนถึงเวลา <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"เปลี่ยนเป็นรบกวนได้เสมอ"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ตลอดไป"</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>
@@ -2566,7 +2659,10 @@
       <item quantity="other">มอบสิทธิ์ <xliff:g id="COUNT_1">%d</xliff:g> รายการ</item>
       <item quantity="one">มอบสิทธิ์ <xliff:g id="COUNT_0">%d</xliff:g> รายการ</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other">อนุญาต <xliff:g id="COUNT_2">%d</xliff:g> จาก <xliff:g id="COUNT_3">%d</xliff:g> รายการแล้ว</item>
+      <item quantity="one">อนุญาต <xliff:g id="COUNT_0">%d</xliff:g> จาก <xliff:g id="COUNT_1">%d</xliff:g> รายการแล้ว</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"ตั้งค่าเริ่มต้นไว้บางส่วน"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"ไม่ได้ตั้งค่าเริ่มต้น"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"แอปทั้งหมด"</string>
@@ -2577,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ความสำคัญสูง"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"ละเอียดอ่อน"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ที่มี URL โดเมน"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"รีเซ็ตค่ากำหนดในทุกแอปเป็นค่าเริ่มต้น"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"ติดตั้ง <xliff:g id="COUNT">%d</xliff:g> แอป รวมถึงแอประบบและแอปที่ดาวน์โหลดแล้ว"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"ปิดใช้โดยผู้ดูแลระบบ"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"ขั้นสูง"</string>
     <string name="unknown_app" msgid="5275921288718717656">"แอปที่ไม่รู้จัก"</string>
     <string name="choose_profile" msgid="8229363046053568878">"เลือกโปรไฟล์"</string>
@@ -2593,4 +2688,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> แอปสามารถเปิด URL โดเมนของตัวเอง</item>
       <item quantity="one">1 แอปสามารถเปิด URL โดเมนของตัวเอง</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"ไม่รู้จัก"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"แอปเริ่มต้น"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"แอปเบราว์เซอร์"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"ไม่มีเบราว์เซอร์เริ่มต้น"</string>
+    <string name="default_app" msgid="6864503001385843060">"(ค่าเริ่มต้น)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index eb9017d..baad023 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"button na Push"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"mababa"</item>
     <item msgid="4212263919458209842">"kritikal"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Naka-off"</item>
-    <item msgid="5656544177755411222">"Mga limitadong pagkagambala"</item>
-    <item msgid="8735337502532332056">"Zero na pagkagambala"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Katamtaman"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 85f8145..bcd398e 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD card"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Mga setting ng proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Kanselahin"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"KANSELAHIN"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"MAGPATULOY"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"OO"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"HINDI"</string>
-    <string name="forget" msgid="7267115980248732932">"KALIMUTAN"</string>
+    <string name="forget" msgid="1400428660472591263">"Kalimutan"</string>
+    <string name="save" msgid="879993180139353333">"I-save"</string>
+    <string name="done" msgid="6942539184162713160">"Tapos na"</string>
     <string name="settings_label" msgid="1626402585530130914">"Mga Setting"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Mga Setting"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Shortcut ng Mga Setting"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"I-plug in ang iyong charger at subukang muli."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Walang PIN o password sa pag-lock ng screen"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Kailangan mong magtakda ng PIN o password ng lock screen bago ka makakapagsimula sa pag-encrypt."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Kailangan mong iguhit ang iyong pattern sa pag-unlock upang kumpirmahin ang pag-e-encrypt sa iyong device."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"I-encrypt?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Hindi na mababawi ang pagpapatakbo ng pag-encrypt at kung aantalahin mo ito, maiwawala mo ang data. Tumatagal ang pag-encrypt nang isang oras o higit pa, kung kailan magre-restart ang tablet nang ilang beses."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Hindi na mababawi ang pagpapatakbo ng pag-encrypt at kung aantalahin mo ito, mawawalan ka ng data. Tumatagal ang pag-encrypt nang isang oras o higit pa, kung kailan magre-restart ang telepono nang ilang beses."</string>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Advanced"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Advanced na Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Kapag naka-on Bluetooth, maaari makipag-ugnayan device mo sa iba kalapit Bluetooth device."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"Upang pahusayin ang katumpakan ang lokasyon, mag-ii-scan ang mga serbisyo ng Google para sa mga Bluetooth device, kahit na naka-off ang Bluetooth. Maaari mo itong baguhin sa LINK_BEGINmga setting ng pag-ii-scanLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Upang pahusayin ang katumpakan ng lokasyon, magsa-scan ang mga app at serbisyo para sa mga Bluetooth device, kahit na naka-off ang Bluetooth. Maaari mo itong baguhin sa <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>mga setting ng pagsa-scan<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Kumonekta sa…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Maaalis sa pagkakakonekta ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g> mula sa audio ng media."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Maaalis ang koneksyon ng <xliff:g id="DEVICE_NAME">%1$s</xliff:g> mula sa handsfree na audio."</string>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"Upang pahusayin ang katumpakan ng lokasyon, mag-ii-scan ang mga serbisyo ng Google para sa mga Wi‑Fi network, kahit na naka-off ang Wi‑Fi. Maaari mo itong baguhin sa LINK_BEGINmga setting ng pag-ii-scanLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Upang pahusayin ang katumpakan ng lokasyon, magsa-scan ang mga app at serbisyo para sa mga Wi‑Fi network, kahit na naka-off ang Wi‑Fi. Maaari mo itong baguhin sa <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>mga setting ng pagsa-scan<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Huwag ipakitang muli"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Panatilihing naka-on ang Wi-Fi habang naka-sleep"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Naka-on ang Wi-Fi sa sleep"</string>
@@ -604,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"I-scan"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Advanced"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Ipakita ang mga App"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Ipakita Lakas ng WiFi"</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>
@@ -663,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Mag-sign in upang kumonekta?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"Kinakailangan ka ng <xliff:g id="APP_NAME">%1$s</xliff:g> na mag-sign in online bago ka makakakonekta sa network."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"KUMONEKTA"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Walang access sa Internet ang network na ito. Gamitin pa rin ang network na ito?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Huwag nang tanungin muli sa network na ito"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Kumonekta"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nabigong kumonekta sa network."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Kalimutan"</string>
@@ -734,12 +731,10 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Mas gusto ang Wi-Fi"</item>
     <item msgid="5267397515594230396">"Mas gusto ang cellular"</item>
-    <item msgid="3132912693346866895">"Wi-Fi lang"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Kapag naka-on ang pagtawag sa Wi-Fi, maaaring magruta ng mga tawag ang iyong telepono sa pamamagitan ng mga Wi-Fi network o network ng iyong carrier, depende sa iyong kagustuhan at kung aling signal ang mas malakas. Bago i-on ang feature na ito, sumangguni sa iyong carrier hinggil sa mga bayarin at iba pang mga detalye."</string>
     <string name="home_settings" msgid="212375129455718176">"Home"</string>
@@ -913,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Available (read-only)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Kabuuang espasyo"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Kinakalkula..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Apps (data ng app &amp; nilalaman ng media)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Mga app at data ng app"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Mga Download"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Mga larawan, video"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (musika, mga ringtone, mga podcast, atbp.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Misc."</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Iba pang mga file"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Naka-cache na data"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Unmount nabahagi imbakan"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"I-unmount ang SD card"</string>
@@ -951,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Nagaganap ang pag-unmount"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Nauubusan na ang puwang ng storage"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Maaaring hindi gumana nang tama ang ilang paggana ng system, gaya ng pag-sync. Subukang magbakante ng puwang sa pamamagitan ng pagtanggal o pag-unpin ng mga item, gaya ng apps o nilalaman ng media."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Palitan ang pangalan"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"I-mount"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"I-eject"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Burahin at i-format"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Burahin at i-format internal storage"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Koneksyon ng computer ng USB"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Koneksyon ng computer ng USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Kumonekta bilang"</string>
@@ -961,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Hinahayaan ang mga application na na-enable ng MIDI na gumana sa pamamagitan ng USB gamit ang MIDI software sa iyong computer."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Iba pang mga user"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Storage ng device"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Naaalis na storage"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> ang libre (Kabuuan <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Na-mount na ang <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Hindi ma-mount ang <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"Na-eject na nang ligtas ang <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Hindi ma-eject nang ligtas ang <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"Na-format na ang <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Hindi ma-format ang <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Palitan ang pangalan ng storage"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Pagkatapos ng pagfo-format, maaari mong gamitin ang <xliff:g id="NAME_0">^1</xliff:g> na ito sa iba pang mga device. \n\nBuburahin ang lahat ng data sa <xliff:g id="NAME_1">^1</xliff:g> na ito. Isaalang-alang muna ang pagba-back up. \n\n"<b>"I-back up ang mga larawan &amp; at iba pang media"</b>" \nIlipat ang iyong mga media file sa alternatibong storage sa device na ito, o ilipat ang mga ito sa isang computer gamit ang USB cable. \n\n"<b>"I-back up ang mga app"</b>" \nAng lahat ng app na nakaimbak sa <xliff:g id="NAME_6">^1</xliff:g> na ito ay ia-uninstall at buburahin ang data ng mga ito. Upang mapanatili ang mga app na ito, ilipat ang mga ito sa alternatibong storage sa device na ito."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Kapag na-eject mo ang <xliff:g id="NAME_0">^1</xliff:g> na ito, hihinto sa paggana ang mga app na nakaimbak dito, at hindi magiging available ang mga media file na nakaimbak dito hanggang sa muli itong mailagay."</b>" \n\nAng <xliff:g id="NAME_1">^1</xliff:g> na ito ay naka-format na gumana lang sa device na ito. Hindi ito gagana sa anumang iba pang device."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"I-set up ang iyong <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Gamitin bilang portable na storage"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Para sa paglilipat ng mga larawan at iba pang media sa pagitan ng mga device."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Gamitin bilang internal storage"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Para lang sa pag-iimbak ng kahit ano sa device na ito, kabilang ang mga app at larawan. Nangangailangan ng pagfo-format na pumipigil sa paggana nito sa iba pang mga device."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"I-format bilang internal storage"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Kinakailangan nitong ma-format ang <xliff:g id="NAME_0">^1</xliff:g> upang gawin itong secure. \n\nPagkatapos ng pagfo-format, ang <xliff:g id="NAME_1">^1</xliff:g> na ito ay gagana lang sa device na ito. \n\n"<b>"Binubura ng pagfo-format ang lahat ng data na kasalukuyang nakaimbak sa <xliff:g id="NAME_2">^1</xliff:g>."</b>" Upang maiwasang mawala ang data, isaalang-alang ang pagba-back up dito."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Burahin at i-format"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Pino-format ang <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Huwag alisin ang <xliff:g id="NAME">^1</xliff:g> habang nagfo-format ito."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Maglipat ng data sa bagong storage"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Maaari mong ilipat ang iyong mga larawan, file at data ng app sa bagong <xliff:g id="NAME">^1</xliff:g> na ito. \n\nAng paglilipat ay magtatagal ng humigit-kumulang <xliff:g id="TIME">^2</xliff:g> at magbabakante ng <xliff:g id="SIZE">^3</xliff:g> sa internal storage. Hindi gagana ang ilang app habang isinasagawa ito."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Maglipat ngayon"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Maglipat sa ibang pagkakataon"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Maglipat ng data ngayon"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Ang paglilipat ay magtatagal ng humigit-kumulang <xliff:g id="TIME">^1</xliff:g>. Magbabakante ito ng <xliff:g id="SIZE">^2</xliff:g> sa internal storage."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Ilipat"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Naglilipat ng data…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Habang naglilipat: \n• Huwag alisin ang <xliff:g id="NAME">^1</xliff:g>. \n• Hindi gagana nang tama ang ilang app. \n• Panatilihing naka-charge ang device."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"Nakahanda na ang <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Nakahanda na ang iyong <xliff:g id="NAME">^1</xliff:g> na gamitin sa mga larawan at iba pang media."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Gumagana ang iyong bagong <xliff:g id="NAME">^1</xliff:g>. \n\nUpang maglipat ng mga larawan, file at data ng app patungo sa device na ito, pumunta sa Mga Setting &gt; Storage."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Ilipat ang <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Tatagal lang ng ilang sandali ang paglilipat ng <xliff:g id="APP">^1</xliff:g> at ng data nito sa <xliff:g id="NAME_0">^2</xliff:g>. Hindi mo magagamit ang app hanggang sa matapos ang paglilipat. \n\nHuwag alisin ang <xliff:g id="NAME_1">^2</xliff:g> habang naglilipat."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Inililipat ang <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Huwag alisin ang <xliff:g id="NAME">^1</xliff:g> habang naglilipat. \n\nHindi magiging available ang <xliff:g id="APP">^2</xliff:g> app sa device na ito hanggang sa matapos ang paglilipat."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Kanselahin ang paglilipat"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Status ng baterya"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Antas ng baterya"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Mga APN"</string>
@@ -1005,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"I-reset sa default"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Nakumpleto ang pag-reset sa default na mga setting ng APN."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"I-reset ang mga network setting"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Ire-reset nito sa mga default ng factory ang lahat ng setting na kaugnay sa networking, kabilang ang:\n\n"<li>"Wifi"</li>\n<li>"Data sa mobile"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Ire-reset nito ang lahat ng network setting, kabilang ang:\n\n"<li>"Wi‑Fi"</li>\n<li>"Cellular data"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"I-reset ang mga setting"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"I-reset ang lahat ng network setting? Hindi mo na mababawi ang pagkilos na ito!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"I-reset ang lahat ng network setting? Hindi mo maaaring i-undo ang pagkilos na ito!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"I-reset ang mga setting"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Kailangan mong iguhit ang iyong pattern sa pag-unlock upang kumpirmahin ang pag-reset ng mga network setting."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"I-reset?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"I-reset ang mga network setting"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Na-reset na ang mga network setting"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"I-reset ang device"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Factory data reset"</string>
     <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>
@@ -1027,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Burahin ang lahat ng data sa SD card, gaya ng musika o mga larawan"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"I-reset ang tablet"</string>
     <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_desc" msgid="1062841478823409667">"Burahin ang lahat ng iyong personal na impormasyon at na-download na app? Hindi mo maaaring i-undo ang pagkilos na ito!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Burahin ang lahat"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Hindi available ang factory reset para sa user na ito"</string>
@@ -1046,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"I-set up ang voicemail, pagpasa ng tawag, call waiting, caller ID"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Pag-tether sa USB"</string>
@@ -1079,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Tulong"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mga cellular network"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobile plan"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Default na SMS app"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS app"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Palitan ang SMS app?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Gamitin ang <xliff:g id="NEW_APP">%1$s</xliff:g> sa halip na ang <xliff:g id="CURRENT_APP">%2$s</xliff:g> bilang iyong SMS app?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Gamitin ang <xliff:g id="NEW_APP">%s</xliff:g> bilang iyong SMS app?"</string>
@@ -1110,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Gamitin ang GPS upang matukoy ang lokasyon"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Pagsa-scan"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Nagsa-scan"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Pagsa-scan para sa Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Pahusayin ang lokasyon sa pamamagitan ng pagpapahintulot sa mga app at serbisyo na mag-scan para sa mga Wi-Fi network, kahit na naka-off ang Wi-Fi"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Pagsa-scan para sa Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Pahusayin ang lokasyon sa pamamagitan ng pagpapahintulot sa mga serbisyo ng system na mag-scan para sa mga Bluetooth device, kahit na naka-off ang Bluetooth"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Lokasyon ng Wi-Fi at cellular network"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Ipagamit sa apps ang serbisyo ng lok. ng Google para mabilis na itantya ang iyong lok.  Kokolektahin at ipapadala sa Google ang mga di alam na data ng lok."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Natukoy ng Wi-Fi ang lokasyon"</string>
@@ -1155,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Naitakda ang password"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Naitakda ang PIN"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Itinakda ang pattern"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Gamitin ang iyong pattern sa device upang magpatuloy."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Ilagay ang iyong PIN sa device upang magpatuloy."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Ilagay ang iyong password sa device upang magpatuloy."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Maling PIN"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Maling password"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Maling pattern"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Seguridad ng device"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Baguhin ang naka-unlock na pattern"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Baguhin ang naka-unlock na PIN"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Kumpirmahin ang naka-save na pattern"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Subukang muli:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Gumawa ng pattern sa pag-unlock"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pindutin ang Menu para sa tulong."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"I-angat ang daliri kapag tapos na"</string>
@@ -1181,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Itakda ang naka-unlock na pattern"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Baguhin ang naka-unlock na pattern"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Paano kumuha ng isang naka-unlock na pattern"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Masyadong maraming maling pagtatangka!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Subukang muli sa loob ng <xliff:g id="NUMBER">%d</xliff:g> (na) segundo."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Masyadong maraming maling pagsubok. Subukang muli sa loob ng <xliff:g id="NUMBER">%d</xliff:g> (na) segundo."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Hindi naka-install ang application sa iyong telepono."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Pamahalaan ang apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Pamahalaan at alisin ang naka-install na apps"</string>
@@ -1233,7 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Pag-uri-uriin ayon sa laki"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Pakita tumatakbo serbisyo"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Ipakita na-cache proseso"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"Default na app na pang-emergency"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Emergency app"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"I-reset kagustuhan sa app"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"I-reset ang gusto sa app?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Ire-reset nito ang lahat ng kagustuhan para sa:\n\n "<li>"Naka-disable na apps"</li>\n" "<li>"Mga naka-disable na notification ng app"</li>\n" "<li>"Mga default na application para sa mga pagkilos"</li>\n" "<li>"Mga paghihigpit sa data sa background para sa apps"</li>\n" "<li>"Anumang mga paghihigpit sa pahintulot"</li>\n\n" Hindi ka mawawalan ng anumang data ng app."</string>
@@ -1437,8 +1479,6 @@
     <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="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="select_logd_size_title" msgid="7433137108348553508">"Mga laki ng buffer ng Logger"</string>
@@ -1739,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 oras"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 araw"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Ipakita ang system"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Itago ang system"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Gamitin ang Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Uri ng mga stats"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Background"</string>
@@ -1835,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Kasalukuyang password:"</string>
@@ -2210,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"User"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Pinaghihigpitang profile"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Magdagdag ng bagong user?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Maaari mong ibahagi ang device na ito sa iba pang mga tao sa pamamagitan ng paggawa ng mga karagdagang user. Ang bawat user ay may sariling espasyo, na mako-customize niya gamit ang sarili niyang mga app, wallpaper at iba pa. Maaari ding isaayos ng mga user ang mga setting ng device gaya ng Wi‑Fi na makakaapekto sa lahat.\n\nKapag nagdagdag ka ng bagong user, kailangang i-set up ng taong iyon ang kanyang espasyo.\n\nAng sinumang user ay maaaring mag-update ng mga app para sa lahat ng iba pang user."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Maaari mong ibahagi ang device na ito sa iba pang mga tao sa pamamagitan ng paggawa ng mga karagdagang user. Ang bawat user ay may sariling espasyo, na mako-customize niya gamit ang mga app, wallpaper at iba pa. Maaari ding isaayos ng mga user ang mga setting ng device tulad ng Wi‑Fi na makakaapekto sa lahat.\n\nKapag nagdagdag ka ng bagong user, kailangang i-set up ng taong iyon ang kanyang espasyo.\n\nAng sinumang user ay maaaring mag-update ng mga app para sa lahat ng iba pang user."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Kapag nagdagdag ka ng bagong user, kailangang i-set up ng taong iyon ang kanyang espasyo.\n\nAng sinumang user ay maaaring mag-update ng mga app para sa lahat ng iba pang user."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"I-set up ang user ngayon?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Tiyaking available ang tao na kunin ang device at i-set up ang kanyang espasyo"</string>
@@ -2393,6 +2433,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"default na ice app na pang-emergency"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"system ng mga application ng pag-download ng mga app"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"seguridad ng mga pahintulot sa mga app"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"default ng mga app"</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>
@@ -2407,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume ng alarm"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume ng pag-ring"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume ng notification"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"I-block ang mga pagkaantala"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Priyoridad lang pinapayagan"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Mga awtomatikong panuntunan"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Kapag dumating ang mga tawag at 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_alarms" msgid="7380265858042606857">"Payagan lang ang mga alarm"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Huwag manggambala"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Priyoridad lang"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Mga alarm lang"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Walang pagkaantala"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ringtone ng telepono"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Default na ringtone sa notification"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Mag-vibrate din para sa tawag"</string>
@@ -2447,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Walang mga naka-install na notification listener."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Paganahin ang <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Mababasa ng <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ang lahat ng notification na na-post ng system o ng anumang naka-install na app, na maaaring may kasamang personal na impormasyon tulad ng mga pangalan ng contact at teksto ng mga mensaheng ipinadala sa iyo. Magagawa din nitong i-dismiss ang mga notification na ito o pumindot ng mga button ng pagkilos sa loob ng mga ito."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Mga provider ng kundisyon"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Walang app ang nagbibigay ng mga kundisyon"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="one">Nagbibigay ang %d app ng mga kundisyon</item>
-      <item quantity="other">Nagbibigay ang %d na app ng mga kundisyon</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Walang naka-install na mga provider ng kundisyon."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"I-enable ang <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"Magagawa ng <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> na magdagdag ng mga kundisyon sa paglabas sa mode na Huwag istorbohin."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Naglo-load ng mga app..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"I-block lahat"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Huwag kailanman magpakita ng mga notification mula sa app na ito"</string>
@@ -2469,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priyoridad"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitibo"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Pangalan ng panuntunan"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Magdagdag ng panuntunan"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"I-delete ang panuntunan"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"I-delete ang panuntunang \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"I-delete"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Uri ng panuntunan"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Hindi alam"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"I-configure ang panuntunan"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Panuntunan sa iskedyul"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Hindi nahanap ang panuntunan."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Mga Araw"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Wala"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Araw-araw"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Hindi Kailanman"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> hanggang <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2489,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Mga Alarm"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Mga Paalala"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Mga Kaganapan"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Mga napiling tumatawag"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Mga umulit na tumatawag"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Kung tumawag ang iisang tao sa pangalawang pagkakataon sa loob ng <xliff:g id="MINUTES">%d</xliff:g> (na) minuto, payagan ito"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Awtomatikong i-on"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Hindi Kailanman"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Bawat gabi"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> sa susunod na araw"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Kailan mo gustong maabala?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Gaano katagal?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Walang tiyak na katapusan"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> minuto</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> na minuto</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> oras</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> na oras</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Gawing mga priyoridad na notification lang nang walang tiyak na katapusan"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Gawing mga priyoridad na notification lang sa loob ng <xliff:g id="DURATION">%1$d</xliff:g> minuto hanggang <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Gawing mga priyoridad na notification lang sa loob ng <xliff:g id="DURATION">%1$d</xliff:g> na minuto hanggang <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Gawing mga priyoridad na notification lang sa loob ng <xliff:g id="DURATION">%1$d</xliff:g> oras (hanggang <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Gawing mga priyoridad na notification lang sa loob ng <xliff:g id="DURATION">%1$d</xliff:g> na oras (hanggang <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Gawing mag-a-alarm lang nang walang tiyak na katapusan"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">Gawing mag-a-alarm lang sa loob ng <xliff:g id="DURATION">%1$d</xliff:g> minuto (hanggang <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Gawing mag-a-alarm lang sa loob ng <xliff:g id="DURATION">%1$d</xliff:g> na minuto (hanggang <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="one">Gawing mag-a-alarm lang sa loob ng <xliff:g id="DURATION">%1$d</xliff:g> oras hanggang <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Gawing mag-a-alarm lang sa loob ng <xliff:g id="DURATION">%1$d</xliff:g> na oras hanggang <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Gawing huwag mang-abala nang walang tiyak na katapusan"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Gawing huwag mang-abala sa loob ng <xliff:g id="DURATION">%1$d</xliff:g> minuto (hanggang <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Gawing huwag mang-abala sa loob ng <xliff:g id="DURATION">%1$d</xliff:g> na minuto (hanggang <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Gawing huwag mang-abala sa loob ng <xliff:g id="DURATION">%1$d</xliff:g> oras hanggang <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Gawing huwag mang-abala sa loob ng <xliff:g id="DURATION">%1$d</xliff:g> na oras hanggang <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Gawing palaging mang-abala"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"habambuhay"</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"</string>
@@ -2562,7 +2659,10 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> pahintulot ang ibinigay</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> na pahintulot ang ibinigay</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> ng <xliff:g id="COUNT_3">%d</xliff:g> pahintulot ang ibinigay</item>
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> ng <xliff:g id="COUNT_3">%d</xliff:g> na pahintulot ang ibinigay</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"May nakatakdang ilang default"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Walang nakatakdang mga default"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Lahat ng app"</string>
@@ -2573,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Priyoridad"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensitibo"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"May mga URL ng domain"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"I-reset ang mga kagustuhan sa lahat ng app sa mga default"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> (na) app ang naka-install, kasama na ang system at mga na-download na app"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Na-disable ng administrator"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Hindi kilalang app"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Pumili ng Profile"</string>
@@ -2589,4 +2688,11 @@
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> app ang maaaring magbukas ng mga URL ng domain ng mga ito</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> na app ang maaaring magbukas ng mga URL ng domain ng mga ito</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Hindi nakilala"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Mga Default na App"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Browser app"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Walang default na Browser"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Default)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index 4d03ce1..ab4bcde 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Düğme"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"düşük"</item>
     <item msgid="4212263919458209842">"kritik düzeyde düşük"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Kapalı"</item>
-    <item msgid="5656544177755411222">"Sınırlı kesilme"</item>
-    <item msgid="8735337502532332056">"Sıfır kesilme"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Orta"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 5332687..346f825 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD kart"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy ayarları"</string>
     <string name="cancel" msgid="6859253417269739139">"İptal"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"İPTAL"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"DEVAM"</string>
     <string name="okay" msgid="1997666393121016642">"TAMAM"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"EVET"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"HAYIR"</string>
-    <string name="forget" msgid="7267115980248732932">"UNUT"</string>
+    <string name="forget" msgid="1400428660472591263">"Unut"</string>
+    <string name="save" msgid="879993180139353333">"Kaydet"</string>
+    <string name="done" msgid="6942539184162713160">"Bitti"</string>
     <string name="settings_label" msgid="1626402585530130914">"Ayarlar"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Ayarlar"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Ayarlar kısayolu"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Şarj cihazınızı takıp tekrar deneyin."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ekran kilitleme PIN\'i veya şifresi yok"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Şifrelemeyi başlatabilmek için öncelikle ekran kilitleme PIN\'i veya şifresi ayarlamanız gerekir."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Cihazınızın şifrelenmesini onaylamak için kilit açma deseninizi çizmeniz gerekir."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Şifrelensin mi?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Şifreleme işlemi geri döndürülemez ve şifreleme sırasında işlemi durdurursanız veri kaybedersiniz. Şifreleme bir saat veya daha fazla sürebilir ve tablet bu süre içinde birkaç kez yeniden başlatılır."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Şifreleme işlemi geri döndürülemez ve şifreleme sırasında işlemi durdurursanız veri kaybedersiniz. Şifreleme bir saat veya daha fazla sürebilir ve telefon bu süre içinde birkaç kez yeniden başlatılır."</string>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Gelişmiş"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Gelişmiş Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetooth açık olduğunda, cihazınız yakındaki Bluetooth cihazlarla iletişim kurabilir."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"Google hizmetleri, konum doğruluğunu iyileştirmek için Bluetooth kapalı bile olsa Bluetooth cihazları tarayacaktır. Bu ayarı, LINK_BEGINtarama ayarlarındaLINK_END değiştirebilirsiniz."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Uygulamalar ve hizmetler, konum doğruluğunu iyileştirmek için Bluetooth kapalı bile olsa Bluetooth cihazları tarayacaktır. Bu ayarı, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>tarama ayarlarından<xliff:g id="LINK_END_1">LINK_END</xliff:g> değiştirebilirsiniz."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Bağlan…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> medya ses profilinden ayrılacak."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> eller serbest ses profilinden ayrılacak."</string>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"Google hizmetleri, konum doğruluğunu iyileştirmek için Kablosuz özelliği kapalı bile olsa kablosuz ağları tarayacaktır. Bu ayarı, LINK_BEGINtarama ayarlarındaLINK_END değiştirebilirsiniz."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Uygulamalar ve hizmetler, konum doğruluğunu iyileştirmek için kablosuz özelliği kapalı olsa bile kablosuz ağları tarayacaktır. Bu ayarı <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>tarama ayarlarından<xliff:g id="LINK_END_1">LINK_END</xliff:g> değiştirebilirsiniz."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Bir daha gösterme"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Uykudayken Kablosuz\'u açık tut"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Uykudayken Kablosuz açık"</string>
@@ -604,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Kablosuz Dğrdn Bğlnt"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Tara"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Gelişmiş"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Uygulamaları Göster"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Kablosuz Gücünü Göster"</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>
@@ -663,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Bağlanmak için oturum açılsın mı?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g>, ağa bağlanmadan önce çevrimiçinde oturum açmanızı gerektiriyor."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"BAĞLAN"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Bu ağın İnternet erişimi yok. Yine de bu ağ kullanılsın mı?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Bu ağ için bir daha sorma"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Bağlan"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Ağa bağlanılamadı"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unut"</string>
@@ -729,21 +726,17 @@
     <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> taşınabilir Kablosuz hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android Ortak Erişim Noktası"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Kablosuz çağrı"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Çağrı tercihi"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Kablosuz çağrı modu"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Kablosuz bağlantı tercih edildi"</item>
     <item msgid="5267397515594230396">"Hücresel ağ tercih edildi"</item>
-    <item msgid="3132912693346866895">"Yalnızca kablosuz"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Kablosuz çağrı açık olduğunda, telefonunuz tercihinize ve hangi sinyalin daha güçlü olduğuna bağlı olarak çağrıları kablosuz ağlar veya operatörünüzün ağı üzerinden yönlendirebilir. Bu özelliği açmadan önce, ücretleri ve diğer ayrıntıları öğrenmek için operatörünüze danışın."</string>
     <string name="home_settings" msgid="212375129455718176">"Ana Ekran"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekran"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ses"</string>
@@ -915,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Kullanılabilir (salt okunur)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Toplam alan"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Hesaplanıyor..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Uygulamalar (uygulama verileri ve medya içeriği)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Uygulamalar ve uygulama verileri"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Medya"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"İndirilenler"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Resimler, videolar"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Ses (müzik, zil sesleri vb...)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Çeşitli"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Diğer dosyalar"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Önbelleğe alınan veriler"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Payl dep birimnn bağl kes"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD kartının bağlantısını kes"</string>
@@ -953,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Kaldırma işlemi devam ediyor"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Depolama alanı bitiyor"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Senkronizasyon gibi bazı sistem işlevleri doğru çalışmayabilir. Uygulamalar ve medya içerikleri gibi bazı öğelerin sabitleme işaretini kaldırarak veya öğeleri silerek yer açmayı deneyin."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Yeniden adlandır"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Ekle"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Çıkar"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Sil ve biçimlendir"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Sil ve dahili depolama olarak biçimlendir"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB bilgisayar bağlantısı"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB bilgisayar bağlantısı"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Şu şekilde bağlan:"</string>
@@ -963,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"MIDI özellikli uygulamaların bilgisayarınızda MIDI yazılımıyla USB üzerinden çalışmasına olanak verir."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Diğer kullanıcılar"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Depolama cihazları"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Çıkarılabilir depolama birimi"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> boş (Toplam <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> eklendi"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g> eklenemedi"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> güvenli bir şekilde çıkarıldı"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g> güvenli bir şekilde çıkarılamadı"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> biçimlendirildi"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> biçimlendirilemedi"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Depolama alanına yeni ad ver"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Biçimlendirdikten sonra, bu <xliff:g id="NAME_0">^1</xliff:g> birimini başka cihazlarda kullanabilirsiniz. \n\nBu <xliff:g id="NAME_1">^1</xliff:g> birimindeki veriler silinecektir. Önce yedeklemeyi düşünün. \n\n"<b>"Fotoğrafları ve diğer medyaları yedekleyin"</b>" \nMedya dosyalarınızı bu cihazdaki alternatif bir depolama birimine taşıyın veya USB kablosu kullanarak bir bilgisayara aktarın. \n\n"<b>"Uygulamaları yedekleyin"</b>" \nBu <xliff:g id="NAME_6">^1</xliff:g> biriminde depolanan tüm uygulamaların yüklemesi kaldırılacak ve verileri silinecektir. Bu uygulamaları korumak için bu cihazdaki bir farklı bir depolama alanına taşıyın."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Bu <xliff:g id="NAME_0">^1</xliff:g> birimini çıkardığınızda, tekrar takılana kadar içinde depolanmış olan uygulamalar artık çalışmaz ve depolanmış medya dosyaları ise kullanılamaz."</b>" \n\nBu <xliff:g id="NAME_1">^1</xliff:g> birimi sadece bu cihazda çalışacak şekilde biçimlendirilmiştir. Başka cihazlarda çalışmaz."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> cihazınızı kurun"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Taşınabilir bir depolama birimi kullanın"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Fotoğrafları ve diğer medyaları cihazlar arasında taşımak için."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Dahili depolama olarak kullanın"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Yalnızca bu cihaza öğe depolamak içindir (uygulamalar ve fotoğraflar dahil). Başka cihazlarda çalışmasını engelleyecek şekilde biçimlendirme gerekir."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Dahili depolama olarak biçimlendirin"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Bu, <xliff:g id="NAME_0">^1</xliff:g> biriminin güvenli olması için biçimlendirilmesini gerektirir. \n\nBiçimlendirdikten sonra bu <xliff:g id="NAME_1">^1</xliff:g> birimi sadece bu cihazda çalışır. \n\n"<b>"Biçimlendirme işlemi <xliff:g id="NAME_2">^1</xliff:g> üzerinde depolanmış olan tüm bilgileri siler."</b>" Verilerin kaybolmaması için yedeklemeyi düşünün."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Sil ve biçimlendir"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> biçimlendiriliyor…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Biçimlendirilirken <xliff:g id="NAME">^1</xliff:g> birimini çıkarmayın."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Verileri yeni depolama birimine taşı"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Fotoğraflarınızı, dosyalarınızı ve uygulama verilerinizi bu yeni <xliff:g id="NAME">^1</xliff:g> birimine taşıyabilirsiniz. \n\nTaşıma işlemi yaklaşık <xliff:g id="TIME">^2</xliff:g> sürer ve dahili depolama biriminde <xliff:g id="SIZE">^3</xliff:g> yer açar. Bazı uygulamalar bu işlem sırasında çalışmaz."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Şimdi taşı"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Daha sonra taşı"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Verileri şimdi taşı"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Taşıma işlemi yaklaşık <xliff:g id="TIME">^1</xliff:g> sürer. Dahili depolamada <xliff:g id="SIZE">^2</xliff:g> yer açar."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Taşı"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Veriler taşınıyor…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Taşıma sırasında: \n• <xliff:g id="NAME">^1</xliff:g> birimini çıkartmayın. \n• Bazı uygulamalar düzgün çalışmaz. \n• Cihaz şarjlı olmalıdır."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> hazır"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> biriminiz fotoğraflar ve diğer medyalarla birlikte kullanılacak şekilde kuruldu."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Yeni <xliff:g id="NAME">^1</xliff:g> biriminiz çalışıyor. \n\nFotoğrafları, dosyaları ve uygulama verilerini bu cihaza taşımak için Ayarlar &gt; Depolama\'ya gidin."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> uygulamasını taşıyın"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<xliff:g id="APP">^1</xliff:g> uygulamasını ve verilerini <xliff:g id="NAME_0">^2</xliff:g> birimine taşımak sadece birkaç saniye sürer. Taşıma işlemi tamamlanana kadar uygulamayı kullanamazsınız. \n\nTaşıma sırasında <xliff:g id="NAME_1">^2</xliff:g> birimini çıkartmayın."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> taşınıyor…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Taşıma sırasında <xliff:g id="NAME">^1</xliff:g> birimini çıkarmayın. \nTaşıma işlemi tamamlanana kadar bu cihazdaki \n<xliff:g id="APP">^2</xliff:g> uygulaması kullanılamaz."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Taşımayı iptal et"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Pil durumu"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Pil düzeyi"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN\'ler"</string>
@@ -1007,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Varsayılana sıfırla"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Varsayılan APN ayarlarına sıfırlama tamamlandı"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Ağ ayarlarını sıfırla"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Bu işlem ağ ile ilgili tüm ayarları fabrika varsayılanlarına sıfırlayacaktır. Sıfırlanacak ayarlar şunları içerir: \n\n"<li>"Kablosuz"</li>\n<li>"Mobil veri"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Bu işlemle, şunlar da dahil olmak üzere tüm ağ ayarlarınız sıfırlanacak:\n\n"<li>"Kablosuz ağ"</li>\n<li>"Hücresel veri"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Ayarları sıfırla"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Tüm ağ ayarları sıfırlansın mı? Bu işlemi geri alamazsınız!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Tüm ağ ayarlarınız sıfırlansın mı? Bu işlemi geri alamazsınız!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Ayarları sıfırla"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Ağ ayarlarını sıfırlamayı onaylamak için kilit açma deseninizi çizmeniz gerekir."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Sıfırlansın mı?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Ağ ayarları sıfırlandı"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Ağ ayarları sıfırlandı"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Cihazı sıfırla"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrika verilerine sıfırla"</string>
     <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>
@@ -1029,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD kartındaki müzik ve fotoğraf gibi tüm verileri sil"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tableti sıfırla"</string>
     <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_desc" msgid="1062841478823409667">"Tüm kişisel bilgileriniz ve indirdiğiniz uygulamalar silinsin mi? Bu işlemi geri alamazsınız!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Her şeyi sil"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Bu kullanıcı için fabrika ayarlarına sıfırlama işlevi kullanılamıyor"</string>
@@ -1048,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Sesli mesaj, çağrı yönlendirme ve bekletme, arayan kimliğini ayarla"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB tethering"</string>
@@ -1081,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Yardım"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Hücresel ağlar"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobil plan"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Varsayılan SMS uygulaması"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS uygulaması"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS uygulaması değiştirilsin mi?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"<xliff:g id="NEW_APP">%1$s</xliff:g>, SMS uygulamanız olarak <xliff:g id="CURRENT_APP">%2$s</xliff:g> yerine kullanılsın mı?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"SMS uygulamanız olarak <xliff:g id="NEW_APP">%s</xliff:g> kullanılsın mı?"</string>
@@ -1112,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Konumu belirlemek için GPS\'yi kullan"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Tarama"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Tarama"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Kablosuz taraması"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Kablosuz özelliği kapalı olsa bile kablosuz ağların uygulamalar ve hizmetler tarafından taranmasına izin vererek konum bilgisini iyileştirin"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth taraması"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Bluetooth kapalı bile olsa Bluetooth cihazların sistem hizmetleri tarafından taranmasına izin vererek konum bilgisini iyileştirin"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Kablosuz ve hücresel ağ konumu"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Uygulamalar konumunuzu daha hızlı tahmin edebilmek için Google\'ın konum bilgilerini kullanabilsin. Anonim konum bilgileri toplanıp Google\'a gönderilir."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Konum, Kablosuz tarafından belirlendi"</string>
@@ -1157,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Şifre ayarlandı"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN ayarlandı"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Desen ayarlandı"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Devam etmek için cihazınızın desenini kullanın."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Devam etmek için cihazınızın PIN\'ini kullanın."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Devam etmek için cihazınızın şifresini girin."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Yanlış PIN"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Yanlış şifre"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Yanlış desen"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Cihaz güvenliği"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Kilit açma desenini değiştir"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Kilit açma PIN\'ini değiştir"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Kaydedilen deseni onaylayın"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Tekrar deneyin:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Kilit açma deseni çizin"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Yardım için Menü\'ye basın."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Bitirdiğinizde parmağınızı kaldırın"</string>
@@ -1183,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Kilit açma desenini ayarla"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Kilit açma desenini değiştir"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Kilit açma deseni çizme yöntemi"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Çok fazla sayıda yanlış deneme yapıldı!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> saniye içinde tekrar deneyin."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Çok fazla yanlış giriş yapıldı. <xliff:g id="NUMBER">%d</xliff:g> saniye içinde tekrar deneyin."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Uygulama, telefonunuzda yüklü değil."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Uygulamaları yönet"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Yüklü uygulamaları yönet ve kaldır"</string>
@@ -1235,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Boyuta göre sırala"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Çalışan hizmetleri göster"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Önbllğe alınan işlm göstr"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Acil durum uygulaması"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Uygulama tercihlerini sıfırla"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Uygulama tercihleri sıfırlansın mı?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Bu işlem şunlar için tüm tercihleri sıfırlayacaktır:\n\n "<li>"Devre dışı bırakılan uygulamalar"</li>\n" "<li>"Devre dışı bırakılan uygulama bildirimleri"</li>\n" "<li>"İşlemler için varsayılan uygulamalar"</li>\n" "<li>"Uygulamalar için arka plan veri kısıtlamaları"</li>\n" "<li>"Tüm izin kısıtlamaları"</li>\n\n" Hiçbir uygulama verisini kaybetmeyeceksiniz."</string>
@@ -1440,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Bir dosyadaki tüm Bluetooth HCI paketlerini yakala"</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="select_logd_size_title" msgid="7433137108348553508">"Günlük Kaydedici arabellek boyutları"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 saat"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 gün"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Sistem işlemlerini göster"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Sistemi gizle"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"USS\'yi kullan"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"İstatistik türü"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Arka plan"</string>
@@ -1838,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Geçerli şifre:"</string>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Kullanıcı"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Kısıtlı profil"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Yeni kullanıcı eklensin mi?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Bu cihazı, ek kullanıcılar oluşturarak başka kişilerle paylaşabilirsiniz. Her bir kullanıcının kendi uygulamaları, duvar kağıtları ve diğer öğeleriyle özelleştirebileceği kendi alanı olur. Kullanıcılar, Kablosuz bağlantı gibi herkesi etkileyen cihaz ayarlarını da yapabilirler.\n\nYeni bir kullanıcı eklediğinizde, bu kişinin kendi alanını ayarlaması gerekir.\n\nHerhangi bir kullanıcı, diğer tüm kullanıcılar için uygulamaları güncelleyebilir."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Ek kullanıcılar oluşturarak bu cihazı başkalarıyla paylaşabilirsiniz. Her kullanıcının uygulamalarla, duvar kağıdıyla ve başka ayarlarla özelleştirebileceği kendi alanı olur. Kullanıcılar ayrıca kablosuz ağ gibi herkesi etkileyen cihaz ayarlarını değiştirebilirler.\n\nYeni bir kullanıcı eklediğinizde, ilgili kişinin kendi alanını ayarlaması gerekir.\n\nHer kullanıcı diğer tüm kullanıcılar için uygulamaları güncelleyebilir."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Yeni bir kullanıcı eklediğinizde, bu kişinin kendi alanını ayarlaması gerekir.\n\nHerhangi bir kullanıcı, diğer tüm kullanıcılar için uygulamaları güncelleyebilir."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Kullanıcı şimdi yapılandırılsın mı?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"İlgili kişinin cihazı almak ve kendi alanının kurulumunu yapmak için müsait olduğundan emin olun"</string>
@@ -2393,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"kısıtlama kısıtla kısıtlı"</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_reset_apps" msgid="6420313678620788457">"sıfırlama tercihler varsayılan"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"acil durum ice (acil durum gerektiğinde - adg) uygulaması varsayılanı"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"uygulama indirme uygulamalar sistem"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"uygulama izinleri güvenliği"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"uygulama varsayılanı"</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>
@@ -2411,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarm sesi düzeyi"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Zil sesi düzeyi"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Bildirim sesi düzeyi"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Kesintileri engelleme"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Yalnızca öncelik şunlara izin verir"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Otomatik kurallar"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Çağrı ve 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_alarms" msgid="7380265858042606857">"Yalnızca alarmlara izin ver"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Kesme"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Yalnızca öncelikliler"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Yalnızca alarmlar"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Kesinti yok"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefon zil sesi"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Varsayılan bildirim zil sesi"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Çağrılarda ayrıca titret"</string>
@@ -2451,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Bildirim dinleyici yüklü değil."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> etkinleştirilsin mi?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> sistem veya uygulama tarafından yayınlanan tüm bildirimleri okuyabilecektir. Bu bildirimler kişi adları ve size gönderilen iletilerin metinleri gibi kişisel bilgileri içerebilir. Ayrıca bu bildirimleri kapatabilecek veya içindeki işlem düğmelerine dokunabilecektir."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Koşul sağlayıcılar"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Hiçbir uygulama koşul sağlamıyor"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d uygulama koşul sağlıyor</item>
-      <item quantity="one">%d uygulama koşul sağlıyor</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Hiçbir koşul sağlayıcı yüklü değil."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> etkinleştirilsin mi?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g>, Rahatsız etmeyin moduna çıkış koşulları ekleyebilecektir."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Uygulamalar yükleniyor..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Tümünü engelle"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Bu uygulamadan gelen bildirimleri asla gösterme"</string>
@@ -2473,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Öncelik"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Hassas"</string>
     <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_downtime_category" msgid="2654477732333340290">"Bildirim istenmeyen zaman"</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 öncelikliler"</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="zen_mode_rule_name" msgid="5149068059383837549">"Kural adı"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Kural ekle"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Kuralı sil"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<xliff:g id="RULE">%1$s</xliff:g>\" adlı kural silinsin mi?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Sil"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Kural türü"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Bilinmiyor"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Kural yapılandır"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Zamanlama kuralı"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Kural bulunamadı."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Gün"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Yok"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Her gün"</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="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> ile <xliff:g id="END">%2$s</xliff:g> arası"</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">"Şunlardan çağrılar/iletiler"</string>
@@ -2493,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmlar"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Hatırlatıcılar"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Etkinlikler"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Seçili arayanlar"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Tekrar arayanlar"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Aynı kişi <xliff:g id="MINUTES">%d</xliff:g> dakika içinde ikinci defa ararsa izin ver"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Otomatik olarak aç"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Hiçbir zaman"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Her gece"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"Ertesi gün <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Kesintinin ne zaman yapılmasını istiyorsunuz?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Ne kadar süre?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Süresiz"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dakika</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> dakika</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> saat</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> saat</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Süresiz olarak yalnızca öncelikli bildirimler seçeneğine değiştir"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> dakika için öncelikli bildirimler seçeneğine değiştir (şu saate kadar: <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Bir dakika için öncelikli bildirimler seçeneğine değiştir (şu saate kadar: <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> bir saat için öncelikli bildirimler seçeneğine değiştir (şu saate kadar: <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Bir saat için öncelikli bildirimler seçeneğine değiştir (şu saate kadar: <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Süresiz olarak yalnızca alarmlar seçeneğine değiştir"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> dakika için yalnızca alarmlar seçeneğine geç (şu saate kadar: <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Bir dakika için yalnızca alarmlar seçeneğine değiştir (şu saate kadar: <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> saat için yalnızca alarmlar seçeneğine değiştir (şu saate kadar: <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Bir saat için yalnızca alarmlar seçeneğine değiştir (şu saate kadar: <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Süresiz olarak kesme yok seçeneğine değiştir"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> dakika için kesinti yok moduna geç (şu saate kadar: <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Bir dakika için kesinti yok seçeneğine değiştir (şu saate kadar: <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> saat için kesinti yok seçeneğine değiştir (şu saate kadar:<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Bir saat için kesinti yok seçeneğine geç (şu saate kadar: <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Her zaman kes seçeneğine değiştir"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"sonsuza kadar"</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>
@@ -2566,7 +2659,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> izin verildi</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> izin verildi</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other">Toplam <xliff:g id="COUNT_3">%d</xliff:g> izinden <xliff:g id="COUNT_2">%d</xliff:g> tanesi onaylandı</item>
+      <item quantity="one">Toplam <xliff:g id="COUNT_1">%d</xliff:g> izinden <xliff:g id="COUNT_0">%d</xliff:g> tanesi onaylandı</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Bazı varsayılan tercihler ayarlandı"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Hiçbir varsayılan tercih ayarlanmadı"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Tüm uygulamalar"</string>
@@ -2577,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Öncelikli olanlar"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Hassas olanlar"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Alan URL\'leri ile"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Tüm uygulamalardaki tercihleri varsayılanlara sıfırla"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"Sistem uygulamaları ve indirilen uygulamalar dahil olmak üzere <xliff:g id="COUNT">%d</xliff:g> uygulama yüklendi"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Yönetici tarafından devre dışı bırakıldı"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"İleri düzey"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Bilinmeyen uygulama"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Profil Seçin"</string>
@@ -2593,4 +2688,11 @@
       <item quantity="other"> Bu alan URL\'lerini <xliff:g id="COUNT">%d</xliff:g> uygulama açabilir</item>
       <item quantity="one">Bu alan URL\'lerini bir uygulama açabilir</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Tanınmadı"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Varsayılan Uygulamalar"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Tarayıcı uygulaması"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Varsayılan Tarayıcı yok"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Varsayılan)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 6f7f0ee..43c356b 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Кнопка Push"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"низький"</item>
     <item msgid="4212263919458209842">"критичний"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Вимкнено"</item>
-    <item msgid="5656544177755411222">"Обмежені перешкоди"</item>
-    <item msgid="8735337502532332056">"Нульові перешкоди"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Нормальний"</item>
     <item msgid="866544120205026771">"Середній"</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index a724568..dc26f74 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -270,12 +270,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Карта SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Налашт-ня проксі"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ТАК"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"НІ"</string>
-    <string name="forget" msgid="7267115980248732932">"ІГНОРУВАТИ"</string>
+    <string name="forget" msgid="1400428660472591263">"Ігнорувати"</string>
+    <string name="save" msgid="879993180139353333">"Зберегти"</string>
+    <string name="done" msgid="6942539184162713160">"Готово"</string>
     <string name="settings_label" msgid="1626402585530130914">"Налаштування"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Налаштування"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Ярлик налаштувань"</string>
@@ -378,7 +376,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Підключіть зарядний пристрій і повторіть спробу."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Потрібно ввести PIN-код або пароль для блокування екрана"</string>
     <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>
@@ -537,7 +534,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Розширені"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Розшир. налаштування Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Коли Bluetooth увімкнено, пристрій може обмінюватися даними з пристроями Bluetooth поблизу."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"Щоб покращити точність локації, сервіси Google шукають пристрої Bluetooth, навіть якщо Bluetooth вимкнено. Це можна змінити в LINK_BEGINналаштуваннях скануванняLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Щоб точніше визначати місцеположення, додатки та сервіси шукають пристрої Bluetooth, навіть якщо Bluetooth вимкнено. Це можна змінити в <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>налаштуваннях сканування<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Підключ. до…"</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>
@@ -603,7 +600,7 @@
     <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" msgid="8382526568324164356">"Щоб покращити точність локації, сервіси Google шукають мережі Wi-Fi, навіть якщо Wi-Fi вимкнено. Це можна змінити в LINK_BEGINналаштуваннях скануванняLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Щоб точніше визначати місцеположення, додатки та сервіси шукають мережі Wi‑Fi, навіть якщо Wi‑Fi вимкнено. Це можна змінити в <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>налаштуваннях сканування<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Більше не показувати"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Не від’єднуватися від Wi‑Fi у режимі сну"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Не вимикати Wi‑Fi у режимі сну"</string>
@@ -620,8 +617,6 @@
     <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_apps" msgid="6003687912727859577">"Показати додатки"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Потужність Wi-Fi"</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>
@@ -679,6 +674,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ПІД’ЄДНАТИСЯ"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Ця мережа не має доступу до Інтернету. Усе одно ввійти в цю мережу?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Не запитувати знову для цієї мережі"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Підключ."</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Помилка під’єднання до мережі."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Видалити"</string>
@@ -750,16 +747,14 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi за умовчанням"</item>
     <item msgid="5267397515594230396">"Мобільна мережа за умовчанням"</item>
-    <item msgid="3132912693346866895">"Лише Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Якщо ввімкнути Wi-Fi, ваш телефон зможе спрямовувати дзвінки через мережі Wi-Fi або мережу вашого оператора, залежно від вибраних налаштувань і потужності сигналу мережі. Перш ніж увімкнути цю функцію, уточніть в оператора, скільки коштує ця послуга, та інші деталі."</string>
     <string name="home_settings" msgid="212375129455718176">"Головний екран"</string>
-    <string name="display_settings_title" msgid="1708697328627382561">"Відображ."</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Екран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Гучність"</string>
@@ -931,12 +926,12 @@
     <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="5128673488173839077">"Додатки та їх дані"</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_media_misc_usage" msgid="235452944021647124">"Інше"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Інші файли"</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>
@@ -969,6 +964,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Виконується відключ."</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Закінчується пам’ять"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Деякі системні функції, як-от синхронізація, можуть працювати неправильно. Звільніть місце, видаливши або відкріпивши елементи, наприклад програми чи медіа-вміст."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Перейменувати"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Підключити"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Вийняти"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Стерти та відформатувати"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Стерти та відформатувати як внутрішню пам’ять"</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>
@@ -979,6 +979,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Дозволити додаткам із підтримкою MIDI працювати через USB з програмним забезпеченням MIDI на комп’ютері."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Інші користувачі"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Пам’ять пристрою"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Знімний носій"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> безкоштовно (усього – <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Пристрій <xliff:g id="NAME">%1$s</xliff:g> підключено"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Не вдалося підключити пристрій <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"Пристрій <xliff:g id="NAME">%1$s</xliff:g> безпечно вийнято"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Не вдалося безпечно вийняти пристрій <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> відформатовано"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Не вдалося відформатувати носій <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Перейменувати пам’ять"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Після форматування можна використовувати пристрій пам’яті <xliff:g id="NAME_0">^1</xliff:g> на інших пристроях. \n\nУсі дані на пристрої пам’яті <xliff:g id="NAME_1">^1</xliff:g> буде стерто. Щоб зберегти їх, створіть резервні копії. \n\n"<b>"Створіть резервні копії фотографій та іншого медіавмісту"</b>" \nПеремістіть медіафайли в альтернативне сховище на пристрої або перенесіть їх на комп’ютер за допомогою USB-кабелю. \n\n"<b>"Створіть резервні копії додатків"</b>" \nУсі додатки, які ви зберегли на пристрої пам’яті <xliff:g id="NAME_6">^1</xliff:g>, буде видалено, а їх дані стерто. Щоб зберегти ці додатки, перемістіть їх в альтернативне сховище на цьому пристрої."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Коли ви виймете пристрій пам’яті <xliff:g id="NAME_0">^1</xliff:g>, додатки, які зберігаться на ньому, перестануть працювати, а медіафайли будуть недоступні, поки ви не вставите його знову."</b>" \n\n<xliff:g id="NAME_1">^1</xliff:g> відформатовано для роботи лише на цьому пристрої. Він не працюватиме на жодному іншому."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Налаштуйте пристрій пам’яті <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Використовувати як портативний пристрій пам’яті"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Для переміщення фотографій та інших медіафайлів між пристроями."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Використовувати як внутрішню пам’ять"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Для зберігання вмісту лише на цьому пристрої, зокрема додатків і фотографій. Потрібне форматування (ви не зможете скористатися пристроєм пам’яті на інших пристроях)."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Відформатувати як вн. пам’ять"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Щоб захистити пристрій пам’яті <xliff:g id="NAME_0">^1</xliff:g>, потрібно відформатувати його. \n\nПісля форматування <xliff:g id="NAME_1">^1</xliff:g> працюватиме лише на цьому пристрої. \n\n"<b>"Під час форматування буде стерто всі дані, які зберігаються на пристрої пам’яті <xliff:g id="NAME_2">^1</xliff:g>."</b>" Щоб не втратити дані, скопіюйте їх."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Очистити й відформатувати"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> форматується…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Не виймайте пристрій пам’яті <xliff:g id="NAME">^1</xliff:g> під час форматування."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Перемістити дані в нове сховище"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Ви можете перемістити фотографії, файли та дані додатків на новий пристрій пам’яті (<xliff:g id="NAME">^1</xliff:g>). \n\nЦе займе приблизно <xliff:g id="TIME">^2</xliff:g> та звільнить <xliff:g id="SIZE">^3</xliff:g> внутрішньої пам’яті. Під час переміщення деякі додатки не працюватимуть."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Перемістити"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Перемістити пізніше"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Перемістіть дані зараз"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Переміщення займе приблизно <xliff:g id="TIME">^1</xliff:g>. Буде звільнено <xliff:g id="SIZE">^2</xliff:g> внутрішньої пам’яті."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Перемістити"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Переміщення даних…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Під час переміщення дотримуйтеся вказівок нижче. \n• Не виймайте пристрій <xliff:g id="NAME">^1</xliff:g>. \n• Деякі додатки не працюватимуть належним чином. \n• Переконайтеся, що пристрій заряджено."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"Пристрій пам’яті <xliff:g id="NAME">^1</xliff:g> налаштовано"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"На пристрої пам’яті <xliff:g id="NAME">^1</xliff:g> можна зберігати фотографії й інші медіафайли."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Новий пристрій пам’яті <xliff:g id="NAME">^1</xliff:g> налаштовано. \n\nЩоб перемістити на нього фотографії, файли й дані додатків, перейдіть у \"Налаштування\" &gt; \"Пам’ять\"."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Перемістити додаток <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Переміщення додатка <xliff:g id="APP">^1</xliff:g> та його даних на пристрій <xliff:g id="NAME_0">^2</xliff:g> займе лише кілька хвилин. Ви не зможете користуватися додатком, поки не завершиться переміщення. \n\nНе видаляйте <xliff:g id="NAME_1">^2</xliff:g> під час переміщення"</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Переміщення додатка <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Не видаляйте <xliff:g id="NAME">^1</xliff:g> під час переміщення. \n\nВи не зможете користуватися додатком <xliff:g id="APP">^2</xliff:g> на цьому пристрої, поки не завершиться переміщення."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Скасувати переміщення"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Стан акумулятора"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Рівень заряду акумулятора"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Точки доступу"</string>
@@ -1023,13 +1062,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Відн.налашт.за умовч."</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Відновлення налаштувань APN за умовчанням здійснено."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Скидання налаштувань мереж"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Відновляться заводські налаштування мереж, зокрема:\n\n"<li>"Wi-Fi"</li>\n<li>"мобільного Інтернету"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Відновляться всі налаштування мереж, зокрема: \n\n"<li>"Wi-Fi"</li>\n<li>"мобільні дані"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Скинути налаштування"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Скинути всі налаштування мереж? Цю дію не можна скасувати."</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Скинути всі налаштування мереж? Цю дію не можна скасувати."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Скинути налаштування"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Щоб скинути налаштування мереж, намалюйте ключ розблокування."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Скинути?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Скидання налаштувань мереж"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Налаштування мереж скинуто"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Скинути параметри пристрою"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Скидання налаштувань"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Це зітре всі дані з "<b>"внутрішньої пам’яті"</b>" вашого планшетного ПК, зокрема:\n\n"<li>"ваш обліковий запис Google"</li>\n<li>"дані й налаштування системи та програм"</li>\n<li>"завантажені програми"</li>"."</string>
@@ -1045,9 +1083,8 @@
     <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="1062841478823409667">"Стерти всю особисту інформацію та завантажені додатки? Цю дію не можна скасувати."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Видалити все"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Цей користувач не може відновити заводські налаштування"</string>
@@ -1064,8 +1101,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Налашт. гол.пошту, переадр.викл., парал.викл., ідент.абонента"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Прив\'язка USB"</string>
@@ -1097,7 +1132,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Довідка"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Мобільні мережі"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Тарифний план"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Програма для SMS за умовчанням"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Додаток для SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Змінити програму для SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Використовувати для SMS додаток <xliff:g id="NEW_APP">%1$s</xliff:g> замість <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Використовувати для SMS додаток <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
@@ -1128,6 +1163,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Використовувати GPS для визначення місцезнаходження"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Пошук"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Пошук"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Шукати мережі Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Щоб покращити точність визначення місцеположення, дозвольте додаткам і сервісам шукати мережі Wi‑Fi, навіть якщо Wi-Fi вимкнено"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Шукати пристрої Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Щоб покращити точність визначення місцеположення, дозвольте сервісам системи шукати пристрої Bluetooth, навіть якщо Bluetooth вимкнено"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Локація Wi‑Fi і моб. мереж"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Дозвольте програмам користуватися службою визначення місцезнаходження Google, щоб швидше оцінювати ваше місцезнаходження. Анонімна інформація про місцезнаходження збиратиметься та надсилатиметься в Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Місцезнаходження, визначене Wi-Fi"</string>
@@ -1173,11 +1212,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Пароль установлено"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-код установлено"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Ключ установлено"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Щоб продовжити, введіть ключ пристрою."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Щоб продовжити, введіть PIN-код пристрою."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Щоб продовжити, введіть пароль пристрою."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Неправильний PIN-код"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Неправильний пароль"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Неправильний ключ"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Безпека пристрою"</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_wrong" msgid="4694973540770105678">"Повторити спробу:"</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>
@@ -1199,8 +1242,7 @@
     <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" msgid="6909161623701848863">"Забагато невдалих спроб. Повторіть через <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>
@@ -1251,7 +1293,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Сортувати за розміром"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Показати запущені служби"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Показати кешовані процеси"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"Додаток для екстрених викликів за умовчанням"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Додаток для екстрених викликів"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Скинути налаштування"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Скинути налашт. програм?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Буде скинуто всі налаштування для:\n\n "<li>"вимкнених програм"</li>\n" "<li>"вимкнених сповіщень програм"</li>\n" "<li>"програм за умовчанням для виконання дій"</li>\n" "<li>"обмежень щодо фонових даних для програм"</li>\n" "<li>"усіх обмежень щодо дозволів"</li>\n\n" Жодні дані програм не буде втрачено."</string>
@@ -1455,8 +1497,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Робити знімки всіх пакетів інтерфейсу Bluetooth у файлі"</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="select_logd_size_title" msgid="7433137108348553508">"Розміри буфера журналу"</string>
@@ -1521,7 +1561,7 @@
     <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_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>
@@ -1757,6 +1797,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 годин"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 день"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Показувати систему"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Сховати системні процеси"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Використовувати USS (Unique Set Size)"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Тип статистики"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Фонові"</string>
@@ -1853,7 +1894,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_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>
@@ -2228,7 +2268,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Користувач"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Профіль з обмеженням"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Додати нового користувача?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Цим пристроєм можуть користуватися кілька користувачів. Для цього потрібно створити додаткові профілі. Власник профілю може налаштувати його на свій смак, вибрати фоновий малюнок, установити потрібні додатки тощо. Користувачі також можуть налаштовувати певні параметри пристрою, які застосовуватимуться до решти користувачів, як-от налаштування Wi-Fi.\n\nКористувач має налаштувати свій профіль після створення.\n\nБудь-який користувач пристрою може оновлювати додатки для решти користувачів."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Цим пристроєм можуть користуватися кілька користувачів. Для цього потрібно створити додаткові профілі. Власник профілю може налаштувати його на свій смак: вибирати фоновий малюнок, установлювати потрібні додатки тощо. Користувачі також можуть налаштовувати певні параметри пристрою, які застосовуватимуться до решти профілів, як-от Wi-Fi.\n\nКоли ви створите новий профіль, користувач має його налаштувати.\n\nБудь-який користувач пристрою може оновлювати додатки для решти користувачів."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Користувач має налаштувати свій профіль після створення.\n\nБудь-який користувач пристрою може оновлювати додатки для решти користувачів."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Створити користувача зараз?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Переконайтеся, що користувач може взяти пристрій і налаштувати профіль"</string>
@@ -2411,6 +2451,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"додаток для екстрених викликів за умовчанням"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"додатки завантажити додаток системний"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"додатки дозволи безпека"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"додатки за умовчанням"</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>
@@ -2425,14 +2466,12 @@
     <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="6948120138640252732">"Блокувати сповіщення"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Дозволити лише пріоритетні"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Правила автоматизації"</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_alarms" msgid="7380265858042606857">"Дозволити лише сигнали"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Не турбувати"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Лише пріоритетні"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Лише сигнали"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Без сповіщень"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Мелодія телефону"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Сигнал сповіщень за умовчанням"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Також вібросигнал для дзвінків"</string>
@@ -2467,17 +2506,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Служби читання сповіщень не встановлено."</string>
     <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">"Немає додатків, які надають умови"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="one">%d додаток надає умови</item>
-      <item quantity="few">%d додатки надають умови</item>
-      <item quantity="many">%d додатків надають умови</item>
-      <item quantity="other">%d додатка надають умови</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="loading_notification_apps" msgid="5031818677010335895">"Завантаження додатків…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блокувати всі"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ніколи не показувати сповіщення з цього додатка"</string>
@@ -2491,17 +2519,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"Назва правила"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Додати правило"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Видалити правило"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Видалити правило \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Видалити"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Тип правила"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Невідомо"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Налаштувати правило"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Указати правило"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Правило не знайдено."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Дні"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Ніколи"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Щодня"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Ніколи"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Дзвінки"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Повідомлення"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Дзвінки або повідомлення від користувача"</string>
@@ -2511,15 +2545,92 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Сигнали"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Нагадування"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Події"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Вибрані абоненти"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Повторні вхідні виклики"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Дозволити звуковий сигнал, якщо та сама особа телефонує знову через <xliff:g id="MINUTES">%d</xliff:g> хв"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"Наступного дня о <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Коли вас можна турбувати?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Як довго?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Без обмежень"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> хвилина</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> хвилини</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> хвилин</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> хвилини</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> година</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> години</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> годин</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> години</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Вибрати лише пріоритетні сповіщення без обмежень"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Вибрати лише пріоритетні сповіщення на <xliff:g id="DURATION">%1$d</xliff:g> хвилину до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Вибрати лише пріоритетні сповіщення на <xliff:g id="DURATION">%1$d</xliff:g> хвилини до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Вибрати лише пріоритетні сповіщення на <xliff:g id="DURATION">%1$d</xliff:g> хвилин до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Вибрати лише пріоритетні сповіщення на <xliff:g id="DURATION">%1$d</xliff:g> хвилини до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Вибрати лише пріоритетні сповіщення на <xliff:g id="DURATION">%1$d</xliff:g> годину до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Вибрати лише пріоритетні сповіщення на <xliff:g id="DURATION">%1$d</xliff:g> години до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Вибрати лише пріоритетні сповіщення на <xliff:g id="DURATION">%1$d</xliff:g> годин до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Вибрати лише пріоритетні сповіщення на <xliff:g id="DURATION">%1$d</xliff:g> години до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Вибрати лише сигнали без обмежень"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">Вибрати сигнали лише на <xliff:g id="DURATION">%1$d</xliff:g> хвилину до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Вибрати сигнали лише на <xliff:g id="DURATION">%1$d</xliff:g> хвилини до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Вибрати сигнали лише на <xliff:g id="DURATION">%1$d</xliff:g> хвилин до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Вибрати сигнали лише на <xliff:g id="DURATION">%1$d</xliff:g> хвилини до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="one">Вибрати сигнали лише на <xliff:g id="DURATION">%1$d</xliff:g> годину до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Вибрати сигнали лише на <xliff:g id="DURATION">%1$d</xliff:g> години до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Вибрати сигнали лише на <xliff:g id="DURATION">%1$d</xliff:g> годин до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Вибрати сигнали лише на <xliff:g id="DURATION">%1$d</xliff:g> години до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Вибрати опцію \"Не турбувати\" без обмежень"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Вибрати опцію \"Не турбувати\" на <xliff:g id="DURATION">%1$d</xliff:g> хвилину до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Вибрати опцію \"Не турбувати\" на <xliff:g id="DURATION">%1$d</xliff:g> хвилини до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Вибрати опцію \"Не турбувати\" на <xliff:g id="DURATION">%1$d</xliff:g> хвилин до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Вибрати опцію \"Не турбувати\" на <xliff:g id="DURATION">%1$d</xliff:g> хвилини до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Вибрати опцію \"Не турбувати\" на <xliff:g id="DURATION">%1$d</xliff:g> годину до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Вибрати опцію \"Не турбувати\" на <xliff:g id="DURATION">%1$d</xliff:g> години до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Вибрати опцію \"Не турбувати\" на <xliff:g id="DURATION">%1$d</xliff:g> годин до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Вибрати опцію \"Не турбувати\" на <xliff:g id="DURATION">%1$d</xliff:g> години до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Вибрати опцію \"Завжди надсилати\""</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"завжди"</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>
@@ -2586,7 +2697,12 @@
       <item quantity="many">Надано <xliff:g id="COUNT_1">%d</xliff:g> дозволів</item>
       <item quantity="other">Надано <xliff:g id="COUNT_1">%d</xliff:g> дозволу</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one">Надано <xliff:g id="COUNT_2">%d</xliff:g> дозвіл із <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="few">Надано <xliff:g id="COUNT_2">%d</xliff:g> дозволи з <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="many">Надано <xliff:g id="COUNT_2">%d</xliff:g> дозволів із <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="other">Надано <xliff:g id="COUNT_2">%d</xliff:g> дозволу з <xliff:g id="COUNT_3">%d</xliff:g></item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Налаштовано деякі значення за умовчанням"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Немає значень за умовчанням"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Усі додатки"</string>
@@ -2597,8 +2713,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Пріоритетні"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Конфіденційні"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"З URL-адресами домену"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Відновити параметри всіх додатків за умовчанням"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"Встановлено додатків (зокрема системних і завантажених): <xliff:g id="COUNT">%d</xliff:g>"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Вимкнено адміністратором"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Розширені налаштування"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Невідомий додаток"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Вибрати профіль"</string>
@@ -2615,4 +2730,11 @@
       <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> додатків можуть відкривати URL-адреси свого домену</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> додатка можуть відкривати URL-адреси свого домену</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Не розпізнано"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Додатки за умовчанням"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Додаток веб-переглядача"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Немає веб-переглядача за умовчанням"</string>
+    <string name="default_app" msgid="6864503001385843060">"(За умовчанням)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-ur-rPK/arrays.xml b/res/values-ur-rPK/arrays.xml
index 6401539..e3d8e51 100644
--- a/res/values-ur-rPK/arrays.xml
+++ b/res/values-ur-rPK/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'‎"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"پش بٹن"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"میڈیا"</item>
     <item msgid="7924928667052300589">"آلہ"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"اندازاً مقام"</item>
+    <item msgid="5789673140227507995">"ٹھیک مقام"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"وائبریٹ"</item>
+    <item msgid="3434165993711230924">"رابطوں کو پڑھیں"</item>
+    <item msgid="616161687718081936">"رابطوں میں ترمیم کریں"</item>
+    <item msgid="7638002295329050091">"کال لاگ پڑھیں"</item>
+    <item msgid="6546959730920410907">"کال لاگ میں ترمیم کریں"</item>
+    <item msgid="446877710771379667">"کیلنڈر پڑھیں"</item>
+    <item msgid="7674458294386319722">"کیلنڈر میں ترمیم کریں"</item>
+    <item msgid="8281201165558093009">"‏wi-fi اسکین"</item>
+    <item msgid="8694611243479480497">"اطلاع"</item>
+    <item msgid="7776439107987345446">"سیل اسکین"</item>
+    <item msgid="514615766544675057">"فون پر کال کریں"</item>
+    <item msgid="8181415497109310680">"‏SMS پڑھیں"</item>
+    <item msgid="6816551144382117307">"‏SMS لکھیں"</item>
+    <item msgid="4600463921908905030">"‏SMS وصول کریں"</item>
+    <item msgid="5958926493289432745">"‏ہنگامی SMS موصول کریں"</item>
+    <item msgid="4945269495221089540">"‏MMS وصول کریں"</item>
+    <item msgid="5570472453573929087">"‏WAP پش وصول کریں"</item>
+    <item msgid="7125408150230860501">"‏SMS بھیجیں"</item>
+    <item msgid="7080337936612188061">"‏ICC SMS پڑھیں"</item>
+    <item msgid="587124103118495063">"‏ICC SMS لکھیں"</item>
+    <item msgid="2320577158869025503">"ترتیبات میں ترمیم کریں"</item>
+    <item msgid="1545733463471924009">"سب سے اوپر ڈرا کریں"</item>
+    <item msgid="3609046903962454582">"اطلاعات تک رسائی حاصل کریں"</item>
+    <item msgid="4671646036128214513">"کیمرا"</item>
+    <item msgid="1097324338692486211">"آڈیو ریکارڈ کریں"</item>
+    <item msgid="5031552983987798163">"آڈیو چلائیں"</item>
+    <item msgid="8374996688066472414">"کلپ بورڈ پڑھیں"</item>
+    <item msgid="3045529469061083747">"کلپ بورڈ میں ترمیم کریں"</item>
+    <item msgid="5124443975763747838">"میڈیا بٹنز"</item>
+    <item msgid="4547883971364273343">"آڈیو فوکس"</item>
+    <item msgid="2603878814882344450">"ماسٹر والیوم"</item>
+    <item msgid="7136963238377062018">"صوتی والیوم"</item>
+    <item msgid="4270236897655923007">"رنگ والیوم"</item>
+    <item msgid="6325739889222559394">"میڈیا والیوم"</item>
+    <item msgid="5762123934816216821">"الارم والیوم"</item>
+    <item msgid="785049718065337473">"اطلاع کا والیوم"</item>
+    <item msgid="6700305533746877052">"بلوٹوتھ والیوم"</item>
+    <item msgid="2029227495214047094">"اسکرین آن رکھیں"</item>
+    <item msgid="26109888160231211">"مقام پر نگاہ رکھیں"</item>
+    <item msgid="5753382310468855812">"اعلی قوت کے مقام پر نگاہ رکھیں"</item>
+    <item msgid="3356591542543137332">"استعمال کے اعداد و شمار حاصل کریں"</item>
+    <item msgid="3073734345226842233">"مائیکروفون کو خاموش کریں/اس کی آواز چلائیں"</item>
+    <item msgid="1148142988678569310">"پروجیکٹ میڈیا"</item>
+    <item msgid="9130014005474445273">"‏VPN کو فعال کریں"</item>
+    <item msgid="1165192162975045562">"لکھنے کا وال پیپر"</item>
+    <item msgid="7129487923652967258">"مدد کا ڈھانچہ"</item>
+    <item msgid="1069023208100114540">"مدد کا اسکرین شاٹ"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"مقام"</item>
+    <item msgid="8677040780775113033">"مقام"</item>
+    <item msgid="1660743989948992916">"مقام"</item>
+    <item msgid="8791172739860195290">"وائبریٹ"</item>
+    <item msgid="383413555642128046">"رابطوں کو پڑھیں"</item>
+    <item msgid="3654594895269697313">"رابطوں میں ترمیم کریں"</item>
+    <item msgid="7928393476362362538">"کال لاگ پڑھیں"</item>
+    <item msgid="6248591205254641116">"کال لاگ میں ترمیم کریں"</item>
+    <item msgid="6093344633066170692">"کیلنڈر پڑھیں"</item>
+    <item msgid="1334886368750347692">"کیلنڈر میں ترمیم کریں"</item>
+    <item msgid="1638204101698708656">"مقام"</item>
+    <item msgid="2154671955760380322">"اطلاع شائع کریں"</item>
+    <item msgid="4282477730595931828">"مقام"</item>
+    <item msgid="4891423912898525905">"فون پر کال کریں"</item>
+    <item msgid="2623604824935968113">"‏SMS/MMS پڑھیں"</item>
+    <item msgid="4420177125221176306">"‏SMS/MMS لکھیں"</item>
+    <item msgid="3986142739951490025">"‏SMS/MMS وصول کریں"</item>
+    <item msgid="3984213795861739778">"‏SMS/MMS وصول کریں"</item>
+    <item msgid="3656243523752472788">"‏SMS/MMS موصول کریں"</item>
+    <item msgid="8105802370238551510">"‏SMS/MMS وصول کریں"</item>
+    <item msgid="1407766984645388488">"‏SMS/MMS بھیجیں"</item>
+    <item msgid="3527273606643794973">"‏SMS/MMS پڑھیں"</item>
+    <item msgid="4370895547001583812">"‏SMS/MMS لکھیں"</item>
+    <item msgid="4218544235221631789">"ترتیبات میں ترمیم کریں"</item>
+    <item msgid="736541391767350377">"سب سے اوپر ڈرا کریں"</item>
+    <item msgid="5530815681721654194">"اطلاعات تک رسائی حاصل کریں"</item>
+    <item msgid="781213371706962767">"کیمرا"</item>
+    <item msgid="1720492593061838172">"آڈیو ریکارڈ کریں"</item>
+    <item msgid="3493046322001257041">"آڈیو چلائیں"</item>
+    <item msgid="136815868796597058">"کلپ بورڈ پڑھیں"</item>
+    <item msgid="5238692940326972503">"کلپ بورڈ میں ترمیم کریں"</item>
+    <item msgid="5753789168376302997">"میڈیا بٹنز"</item>
+    <item msgid="3265262911688671938">"آڈیو فوکس"</item>
+    <item msgid="2098976479485046797">"ماسٹر والیوم"</item>
+    <item msgid="5660213838861789350">"صوتی والیوم"</item>
+    <item msgid="7983336752371254444">"رنگ والیوم"</item>
+    <item msgid="7878027809189330917">"میڈیا والیوم"</item>
+    <item msgid="7260546305036218513">"الارم والیوم"</item>
+    <item msgid="9103719301075748925">"اطلاع کا والیوم"</item>
+    <item msgid="7025966722295861512">"بلوٹوتھ کا والیوم"</item>
+    <item msgid="4665183401128289653">"بیدار رہیں"</item>
+    <item msgid="8584357129746649222">"مقام"</item>
+    <item msgid="7669257279311110599">"مقام"</item>
+    <item msgid="3459320345690097795">"استعمال کے اعداد و شمار حاصل کریں"</item>
+    <item msgid="1312534577834048535">"مائیکروفون کو خاموش کریں/اس کی آواز چلائیں"</item>
+    <item msgid="5906017727368097853">"پروجیکٹ میڈیا"</item>
+    <item msgid="2486614710846178542">"‏VPN کو فعال کریں"</item>
+    <item msgid="5586547561693629602">"لکھنے کا وال پیپر"</item>
+    <item msgid="32794179825485062">"مدد کا ڈھانچہ"</item>
+    <item msgid="7872852746938272552">"مدد کا اسکرین شاٹ"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"مختصر"</item>
     <item msgid="2560532955514699713">"متوسط"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"کم"</item>
     <item msgid="4212263919458209842">"اہم"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"آف"</item>
-    <item msgid="5656544177755411222">"محدود رکاوٹیں"</item>
-    <item msgid="8735337502532332056">"صفر رکاوٹیں"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"عام"</item>
     <item msgid="866544120205026771">"متوسط"</item>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index dec3f94..d631866 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"‏SD کارڈ"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"پراکسی ترتیبات"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ہاں"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"نہیں"</string>
-    <string name="forget" msgid="7267115980248732932">"بھول جائیں"</string>
+    <string name="forget" msgid="1400428660472591263">"بھول جائیں"</string>
+    <string name="save" msgid="879993180139353333">"محفوظ کریں"</string>
+    <string name="done" msgid="6942539184162713160">"ہوگیا"</string>
     <string name="settings_label" msgid="1626402585530130914">"ترتیبات"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"ترتیبات"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"ترتیبات کا شارٹ کٹ"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"اپنا چارجر لگائیں اور دوبارہ کوشش کریں۔"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"‏کوئی لاک اسکرین PIN یا پاس ورڈ نہیں ہے"</string>
     <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>
@@ -419,8 +416,7 @@
     <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>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"‏اسکرین لاک کو ترتیب دے دینے کے بعد، آپ ترتیبات ‎&lt;‎ سیکیورٹی میں اپنی فنگر پرنٹ کو ترتیب دے سکتے ہیں۔"</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>
@@ -522,8 +518,7 @@
     <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>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"مقام کی درستگی کو بہتر بنانے کیلئے، بلوٹوتھ آف ہونے پر بھی ایپس اور سروسز بلوٹوتھ آلات اسکین کریں گی۔ آپ اس کو <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>اسکیننگ ترتیبات<xliff:g id="LINK_END_1">LINK_END</xliff:g> میں تبدیل کر سکتے ہیں۔"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"اس سے مربوط ہوں…"</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>
@@ -589,8 +584,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"‏مقام کی درستگی کو بہتر بنانے کیلئے، Wi‑Fi آف ہونے پر بھی ایپس اور سروسز Wi‑Fi نیٹ ورکس اسکین کریں گی۔ آپ اس کو <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>اسکیننگ ترتیبات<xliff:g id="LINK_END_1">LINK_END</xliff:g> میں تبدیل کر سکتے ہیں۔"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"دوبارہ نہ دکھائیں"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"‏سونے کے دوران Wi‑Fi آن رکھیں"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"‏سکرین آف ہونے پر Wi‑Fi آن"</string>
@@ -607,8 +601,6 @@
     <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_apps" msgid="6003687912727859577">"ایپس دکھائیں"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"‏WiFi کی قوت دکھائیں"</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>
@@ -666,6 +658,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"مربوط کریں"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"اس نیٹ ورک کو انٹرنیٹ تک رسائی نہیں ہے۔ بہر صورت اس نیٹ ورک کا استعمال کریں؟"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"اس نیٹ ورک کیلئے دوبارہ نہ پوچھیں"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"مربوط کریں"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"نیٹ ورک سے مربوط ہونے میں ناکام رہا"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"بھول جائیں"</string>
@@ -732,21 +726,17 @@
     <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> پورٹیبل Wi‑Fi ہاٹ اسپاٹ"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"‏Wi-Fi کالنگ"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"کال کرنے کی ترجیح"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"‏Wi-Fi کالنگ کی وضع"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"‏Wi-Fi ترجیحی"</item>
     <item msgid="5267397515594230396">"سیلولر ترجیحی"</item>
-    <item msgid="3132912693346866895">"‏صرف Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"‏Wi-Fi کالنگ آن ہونے پر، آپ کا فون آپ کی ترجیح اور زیادہ مضبوط سگنل کی بنیاد پر کالز کا روٹ Wi-Fi یا آپ کے کیریئر نیٹ ورک کے ذریعہ کر سکتا ہے۔ اس خصوصیت کو آن کرنے سے پہلے، فیس اور دیگر تفصیلات کیلئے اپنے کیریئر سے رابطہ کریں۔"</string>
     <string name="home_settings" msgid="212375129455718176">"ہوم"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ڈسپلے"</string>
     <string name="sound_settings" msgid="5534671337768745343">"آواز"</string>
@@ -918,12 +908,12 @@
     <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="5128673488173839077">"ایپس اور ایپ کا ڈیٹا"</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_media_misc_usage" msgid="235452944021647124">"متفرقات"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"دیگر فائلز"</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>
@@ -956,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"ان ماؤنٹ پیشرفت میں ہے"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"اسٹوریج کی جگہ کم ہو رہی ہے"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"ممکن ہے کچھ سسٹم فنکشنز، جیسے مطابقت پذیری، صحیح طریقے سے کام نہ کریں۔ ایپس یا میڈیا مواد جیسے آئٹمز کو حذف یا غیر نشان زد کرکے جگہ خالی کرنے کی کوشش کریں۔"</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"نام تبدیل کریں"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"ماؤنٹ کریں"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"خارج کریں"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"مٹائیں اور فارمیٹ کریں"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"بطور اندرونی اسٹوریج مٹائیں اور فارمیٹ کریں"</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>
@@ -966,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"‏MIDI فعال کردہ ایپلیکیشنز کو آپ کے کمپیوٹر پر MIDI سافٹ ویئر کے ساتھ USB پر کام کرنے دیتا ہے۔"</string>
     <string name="storage_other_users" msgid="808708845102611856">"دوسرے صارفین"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"آلہ کا اسٹوریج"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"ہٹائے جانے قابل اسٹوریج"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> مفت (کُل <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> کو ماؤنٹ کر دیا گیا"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g> کو ماؤنٹ نہیں کیا جا سکا"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> کو محفوظ طریقے سے خارج کر دیا گیا"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g> کو محفوظ طریقے سے خارج نہیں کیا جا سکا"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> کو فارمیٹ کر دیا گیا"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> کو فارمیٹ نہیں کیا جا سکا"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"اسٹوریج کا نام تبدیل کریں"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"‏فارمیٹنگ کے بعد، آپ اس <xliff:g id="NAME_0">^1</xliff:g> کو دوسرے آلات میں استعمال کر سکتے ہیں۔ ‎\n\n‎اس <xliff:g id="NAME_1">^1</xliff:g> پر موجود سبھی ڈیٹا کو ہٹا دیا جائے گا۔ پہلے بیک اپ لینے کے بارے میں غور کریں۔ ‎\n\n"<b>"‎تصاویر اور دیگر میڈیا کا بیک اپ لیں‎"</b>" \n‎اپنی میڈیا فائلیں اس آلہ پر موجود متبادل اسٹوریج میں منتقل کریں یا ایک USB کیبل استعمال کر کے انہیں کسی کمپیوٹر پر منتقل کریں۔ ‎\n\n"<b>"‎ایپس کا بیک اپ لیں‎"</b>" \n‎اس <xliff:g id="NAME_6">^1</xliff:g> پر اسٹور کردہ سبھی ایپس ان انسٹال کر دی جائیں گی اور ان کا ڈیٹا ہٹا دیا جائے گا۔ ان ایپس کو رکھنے کیلئے، انہیں اس آلہ پر موجود متبادل اسٹوریج میں منتقل کریں۔"</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714">"‏"<b>"جب آپ اس <xliff:g id="NAME_0">^1</xliff:g> کو نکالیں گے تب اس پر اسٹور کردہ ایپس کام کرنا بند کر دیں گی اور اس پر اسٹور کردہ میڈیا فائلیں اس وقت تک دستیاب نہیں ہوں گی جب تک اسے دوبارہ داخل نہیں کر دیا جائے گا۔‎"</b>" \n\n‎اس <xliff:g id="NAME_1">^1</xliff:g> کو صرف اس آلہ پر کام کرنے کیلئے فارمیٹ کیا گیا ہے۔ یہ کسی دوسرے پر کام نہیں کرے گا۔"</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"اپنا <xliff:g id="NAME">^1</xliff:g> ترتیب دیں"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"پورٹیبل اسٹوریج کے بطور استعمال کریں"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"آلات کے درمیان تصاویر اور دیگر میڈیا منتقل کرنے کیلئے۔"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"داخلی اسٹوریج کے بطور استعمال کریں"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"صرف اس آلہ پر، ایپس اور تصاویر سمیت کوئی بھی چیز اسٹور کرنے کیلئے۔ ایسی فارمیٹنگ درکار ہوتی ہے جو اسے دوسرے آلات کے ساتھ کام کرنے سے روکتی ہے۔"</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"بطور داخلی اسٹوریج فارمیٹ کریں"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"‏یہ تقاضہ کرتا ہے کہ <xliff:g id="NAME_0">^1</xliff:g> کو محفوظ کرنے کیلئے اس کو فارمیٹ کیا جائے۔ ‎\n\n‎فارمیٹنگ کے بعد، یہ <xliff:g id="NAME_1">^1</xliff:g> صرف اس آلہ پر کام کرے گا۔ ‎\n\n"<b>"‎فارمیٹنگ سے <xliff:g id="NAME_2">^1</xliff:g> پر فی الحال اسٹور کردہ سبھی ڈیٹا مٹ جاتا ہے۔"</b>" ڈیٹا گم ہونے سے بچنے کیلئے، اس کا بیک اپ لینے پر غور کریں۔"</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"مٹائیں اور فارمیٹ کریں"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> کو فارمیٹ کیا جا رہا ہے…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"<xliff:g id="NAME">^1</xliff:g> کو فارمیٹ کیے جانے کے وقت اسے نہ ہٹائیں۔"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ڈیٹا نئے اسٹوریج میں منتقل کریں"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"‏آپ اپنی تصاویر، فائلیں اور ایپ ڈیٹا اس نئے <xliff:g id="NAME">^1</xliff:g> میں منتقل کر سکتے ہیں۔ ‎\n\n‎منتقلی میں تقریباً <xliff:g id="TIME">^2</xliff:g> لگتا ہے اور اس سے داخلی اسٹوریج پر <xliff:g id="SIZE">^3</xliff:g> جگہ خالی ہو جائے گی۔ اس کے جاری رہتے ہوئے کچھ ایپس کام نہیں کریں گی۔"</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"ابھی منتقل کریں"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"بعد میں منتقل کریں"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"ڈیٹا ابھی منتقل کریں"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"منتقلی میں تقریباً <xliff:g id="TIME">^1</xliff:g> لگتا ہے۔ اس سے داخلی اسٹوریج پر <xliff:g id="SIZE">^2</xliff:g> جگہ خالی ہو جائے گی۔"</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"منتقل کریں"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"ڈیٹا منتقل کیا جا رہا ہے…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"منتقلی کے دوران: \n• <xliff:g id="NAME">^1</xliff:g> کو نہ ہٹائیں۔ \n• کچھ ایپس ٹھیک سے کام نہیں کریں گی۔ \n• آلے کو چارج رکھیں۔"</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> تیار ہے"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"آپ کا <xliff:g id="NAME">^1</xliff:g> تصاویر اور دیگر میڈیا کے ساتھ استعمال کرنے کیلئے تیار ہے۔"</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"‏آپ کا نیا <xliff:g id="NAME">^1</xliff:g> کام کر رہا ہے۔ ‎\n\n‎تصاویر، فائلیں اور ایپ کا ڈیٹا اس آلہ پر منتقل کرنے کیلئے، ترتیبات &gt; اسٹوریج پر جائیں۔"</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> کو منتقل کریں"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"‏<xliff:g id="APP">^1</xliff:g> اور اس کا ڈیٹا <xliff:g id="NAME_0">^2</xliff:g> میں منتقل کرنے میں بس تھوڑی دیر لگے گی۔ منتقلی مکمل ہونے تک آپ ایپ کو استعمال نہیں کر سکیں گے۔ ‎\n\n‎منتقلی کے دوران <xliff:g id="NAME_1">^2</xliff:g> کو نہ ہٹائیں۔"</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> کو منتقل کیا جا رہا ہے…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"‏منتقلی کے دوران <xliff:g id="NAME">^1</xliff:g> کو نہ ہٹائیں۔ ‎\n\n‎اس آلہ پر <xliff:g id="APP">^2</xliff:g> ایپ منتقلی مکمل ہونے تک دستیاب نہیں ہوگی۔"</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"منتقلی منسوخ کریں"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"بیٹری کا اسٹیٹس"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"بیٹری کی سطح"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1010,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"ڈیفالٹ پر دوبارہ ترتیب دیں"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"‏ڈیفالٹ APN ترتیبات کو دوبارہ ترتیب دینے کا عمل مکمل ہو گیا۔"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"نیٹ ورک کی ترتیبات دوبارہ ترتیب دے دی گئیں"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"‏یہ نیٹ ورکنگ سے متعلقہ سبھی ترتیبات کو فیکٹری ڈیفالٹس پر ترتیب دے دیگی، بشمول:\n\n"<li>"Wifi"</li>\n<li>"موبائل ڈیٹا"</li>\n<li>"بلوٹوتھ"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"‏یہ نیٹ ورک کی سبھی ترتیبات کو دوبارہ ترتیب دے گا، بشمول:\n\n"<li>"Wi‑Fi"</li>\n<li>"سیلولر ڈیٹا"</li>\n<li>"بلوٹوتھ"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"ترتیبات دوبارہ ترتیب دیں"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"نیٹ ورک کی سبھی ترتیبات کو دوبارہ ترتیب دیں؟ آپ اس عمل کو لوٹا نہیں سکتے ہیں!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"نیٹ ورک کی سبھی ترتیبات کو دوبارہ ترتیب دیں؟ آپ اس کارروائی کو کالعدم نہیں کر سکتے ہیں!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"ترتیبات دوبارہ ترتیب دیں"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"نیٹ ورک ترتیبات دوبارہ ترتیب دینے کی توثیق کرنے کیلئے آپ کو اپنا غیر مقفل کرنے کا پیٹرن ڈرا کرنے کی ضرورت ہے۔"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"دوبارہ ترتیب دیں؟"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"نیٹ ورک کی ترتیبات دوبارہ ترتیب دے دی گئیں"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"نیٹ ورک کی ترتیبات کو دوبارہ ترتیب دیا گیا ہے"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"آلہ کو دوبارہ ترتیب دیں"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"فیکٹری ڈیٹا ری سیٹ"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"‏یہ آپ کے ٹیبلٹ کے "<b>"داخلی اسٹوریج"</b>" سے سبھی ڈیٹا کو حذف کر دے گا، بشمول:\n\n"<li>"آپ کا Google اکاؤنٹ"</li>\n<li>"سسٹم اور ایپ ڈیٹا اور ترتیبات"</li>\n<li>"ڈاؤن لوڈ کردہ ایپس"</li></string>
@@ -1032,9 +1065,8 @@
     <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="1062841478823409667">"آپ کی سبھی ذاتی معلومات اور ڈاؤن لوڈ کردہ ایپس ہٹا دیں؟ آپ اس کارروائی کو کالعدم نہیں کر سکتے ہیں!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ہر چیز کو حذف کریں"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"اس صارف کیلئے فیکٹری ری سیٹ دستیاب نہیں ہے"</string>
@@ -1051,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"‏صوتی میل، کال فاورڈنگ، کال ویٹنگ، کالر ID کو ترتیب دیں"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"‏USB مربوط کرنا"</string>
@@ -1084,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"مدد"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"سیلولر نیٹ ورکس"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"موبائل پلان"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"‏ڈیفالٹ SMS ایپ"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"‏SMS ایپ"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"‏SMS ایپ تبدیل کریں؟"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"‏اپنے SMS ایپ بطور <xliff:g id="CURRENT_APP">%2$s</xliff:g> کے بجائے <xliff:g id="NEW_APP">%1$s</xliff:g> کو استعمال کریں؟"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"‏<xliff:g id="NEW_APP">%s</xliff:g> کو اپنے SMS ایپ کے بطور استعمال کریں؟"</string>
@@ -1115,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"‏مقام کا تعین کرنے کیلئے GPS استعمال کریں"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"اسکیننگ"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"اسکیننگ"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"‏Wi‑Fi اسکیننگ"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"‏Wi‑Fi آف ہونے پر بھی ایپس اور سروسز کو Wi‑Fi نیٹ ورکس اسکین کرنے کی اجازت دے کر مقام کو بہتر بنائیں"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"بلوٹوتھ اسکیننگ"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"بلوٹوتھ آف ہونے پر بھی سسٹم سروسز کو بلوٹوتھ آلات اسکین کرنے کی اجازت دے کر مقام کو بہتر بنائیں"</string>
     <string name="location_network_based" msgid="6010456018401296590">"‏Wi‑Fi و سیلولر نیٹ ورک کا مقام"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"‏اپنے مقام کا تیزی سے اندازہ لگانے کیلئے ایپس کو Google کی مقام کی سروس کا استعمال کرنے دیں۔ گمنام مقام کا ڈیٹا جمع کیا جائے گا اور Google کو بھیجا جائے گا۔"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"‏Wi‑Fi کے ذریعہ مقام کا تعین کیا گیا"</string>
@@ -1160,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"پاس ورڈ سیٹ کر دیا گیا ہے"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"‏PIN سیٹ کر دیا گیا ہے"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"پیٹرن سیٹ کر دیا گیا ہے"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"جاری رکھنے کیلئے اپنے آلے کا پیٹرن استعمال کریں۔"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"‏جاری رکھنے کیلئے اپنے آلے کا PIN درج کریں۔"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"جاری رکھنے کیلئے اپنے آلے کا پاس ورڈ درج کریں۔"</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"‏غلط PIN"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"غلط پاس ورڈ"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"غلط پیٹرن"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"آلہ کی سیکیورٹی"</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_wrong" msgid="4694973540770105678">"دوبارہ کوشش کریں:"</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>
@@ -1186,8 +1224,7 @@
     <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" msgid="6909161623701848863">"کافی زیادہ غلط کوششیں کی گئیں۔ <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>
@@ -1238,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"سائز کے لحاظ سے ترتیب دیں"</string>
     <string name="show_running_services" msgid="5736278767975544570">"چلنے والی سروسز دکھائیں"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"کیش کردہ پروسیسز کو دکھائیں"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"ہنگامی ایپ"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"ایپ کی ترجیحات کو دوبارہ ترتیب دیں"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"ایپ کی ترجیحات کو دوبارہ ترتیب دیں؟"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"یہ مندرجہ ذیل کیلئے تمام ترجیحات کو دوبارہ ترتیب دے گا:\n\n "<li>"غیر فعال ایپس"</li>\n" "<li>"غیر فعال ایپس کی اطلاعات"</li>\n" "<li>"کارروائیوں کیلئے ڈیفالٹ ایپلیکیشنز"</li>\n" "<li>"ایپس کیلئے پس منظر کے ڈیٹا کی پابندیاں"</li>\n" "<li>"کوئی اجازتی پابندیاں"</li>\n\n" آپ کسی ایپ کے ڈیٹا سے محروم نہیں ہوں گے۔"</string>
@@ -1443,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"‏سبھی بلوٹوتھ HCI کے پیکٹس ایک فائل میں قید کریں"</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="select_logd_size_title" msgid="7433137108348553508">"لاگر بفر کے سائز"</string>
@@ -1745,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 گھنٹے"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 دن"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"سسٹم دکھائیں"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"سسٹم چھپائیں"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"‏Uss کا استعمال کریں"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"اعداد و شمار کی قسم"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"پس منظر"</string>
@@ -1841,7 +1876,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_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>
@@ -2216,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"صارف"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"محدود پروفائل"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"نیا صارف شامل کریں؟"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"‏آپ اضافی صارفین بنا کر دوسرے لوگوں کے ساتھ اس آلہ کا اشتراک کر سکتے ہیں۔ ہر صارف کے پاس اپنی جگہ ہوتی ہے، جسے وہ خود اپنی ایپس، وال پیپر وغیرہ کے ساتھ حسب ضرورت بنا سکتے ہیں۔ صارفین Wi‑Fi جیسی آلہ کی ترتیبات کو ایڈجسٹ بھی کر سکتے ہیں جس کا اثر ہر کسی پر پڑتا ہے۔\n\nجب آپ ایک نیا صارف شامل کرتے ہیں تو اس شخص کو اپنی جگہ کو ترتیب دینا ہوتا ہے۔\n\nکوئی بھی صارف دیگر سبھی صارفین کیلئے ایپس کو اپ ڈیٹ کر سکتا ہے۔"</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"‏آپ اضافی صارفین بنا کر دوسرے لوگوں کے ساتھ اس آلہ کا اشتراک کر سکتے ہیں۔ ہر صارف کے پاس اپنی جگہ ہوتی ہے، جسے وہ ایپس، وال پیپر وغیرہ کے ساتھ حسب ضرورت بنا سکتا ہے۔ صارفین Wi‑Fi جیسی آلہ کی ترتیبات کو ایڈجسٹ بھی کر سکتے ہیں جس کا اثر ہر کسی پر ہوتا ہے۔\n\nجب آپ ایک نیا صارف شامل کرتے ہیں تو اسے اپنی جگہ کو ترتیب دینا ہوتا ہے۔\n\nکوئی بھی صارف دیگر سبھی صارفین کیلئے ایپس کو اپ ڈیٹ کر سکتا ہے۔"</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"جب آپ ایک نیا صارف شامل کرتے ہیں تو اس شخص کو اپنی جگہ کو ترتیب دینے کی ضرورت ہوتی ہے\n\nکوئی بھی صارف دیگر سبھی صارفین کیلئے ایپس کو اپ ڈیٹ کر سکتا ہے۔"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"صارف کو ابھی ترتیب دیں؟"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"یقینی بنائیں کہ وہ شخص آلہ لینے اور اپنی جگہ ترتیب دینے کیلئے دستیاب ہے"</string>
@@ -2396,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"پابندی پابندی لگائیں پابندی عائد کردہ"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"‏متن کی اصلاح آواز درست کریں وائبریٹ کریں خودکار زبان اشارہ تجویز کریں تجویز تھیم ناگوار لفظ ٹائپ کریں emoji بین الاقوامی"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"ترجیحات کو ڈیفالٹ پر دوبارہ ترتیب دیں"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"ہنگامی آئس ایپ ڈیفالٹ"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"ایپس ایپلیکیشنز سسٹم ڈاؤن لوڈ کرتی ہیں"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"ایپس کی اجازتوں کی سیکیورٹی"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"ڈیفالٹ ایپس"</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>
@@ -2414,14 +2448,12 @@
     <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="6948120138640252732">"مداخلتیں مسدود کریں"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"صرف ترجیحی اجازتیں"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"خودکار اصول"</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_alarms" msgid="7380265858042606857">"صرف الارمز کی اجازت دیں"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"مداخلت نہ کریں"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"صرف ترجیحی"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"صرف الارمز"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"کوئی مداخلتیں نہیں"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"فون رنگ ٹون"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"اطلاع کا ڈیفالٹ رنگ ٹون"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"کالز کیلئے وائبریٹ بھی کرے"</string>
@@ -2454,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"کوئی نوٹیفکیشن لسنرز انسٹال نہیں ہیں۔"</string>
     <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">"کوئی ایپس شرائط فراہم نہیں کرتی ہیں"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">‏‎%d ایپس شرائط فراہم کرتی ہیں</item>
-      <item quantity="one">‏‎%d ایپ شرائط فراہم کرتی ہے</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="loading_notification_apps" msgid="5031818677010335895">"ایپس لوڈ ہو رہی ہیں…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"سبھی کو مسدود کریں"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"اس ایپ سے کبھی بھی اطلاعات نہ دکھائیں"</string>
@@ -2476,17 +2499,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"اصول کا نام"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"اصول شامل کریں"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"اصول حذف کریں"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<xliff:g id="RULE">%1$s</xliff:g>\" اصول حذف کریں؟"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"حذف کریں"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"اصول کی قسم"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"نامعلوم"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"اصول کنفیگر کریں"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"شیڈول کا اصول"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"اصول نہیں ملا۔"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"دن"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"کوئی نہیں"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"ہر دن"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">"، "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"کبھی نہیں"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> تا <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"کالز"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"پیغامات"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"کالز/پیغامات منجانب"</string>
@@ -2496,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"الارمز"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"یاد دہانیاں"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ایونٹس"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"منتخب کردہ کالرز"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"کالرز دہرائیں"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"اگر ایک ہی شخص <xliff:g id="MINUTES">%d</xliff:g> منٹ کے اندر دوسری بار کال کرتا ہے تو اس کی اجازت دیں"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> اگلے دن"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"آپ مداخلت کب پسند کریں گے؟"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"کب تک؟"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"غیر متعینہ"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> منٹ</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> منٹ</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> گھنٹے</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> گھنٹہ</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"غیر معینہ مدت تک صرف ترجیحی اطلاعات میں تبدیل کریں"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> تک <xliff:g id="DURATION">%1$d</xliff:g> منٹ کیلئے صرف ترجیحی اطلاعات میں تبدیل کریں</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> تک ایک منٹ کیلئے صرف ترجیحی اطلاعات میں تبدیل کریں</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> گھنٹے (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> تک) کیلئے صرف ترجیحی اطلاعات میں تبدیل کریں</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> تک ایک گھنٹے کیلئے صرف ترجیحی اطلاعات میں تبدیل کریں</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"غیر معینہ مدت تک صرف الارمز میں تبدیل کریں"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> منٹ (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> تک) کیلئے صرف الارمز میں تبدیل کریں</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> تک ایک منٹ کیلئے صرف الارمز میں تبدیل کریں</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> تک <xliff:g id="DURATION">%1$d</xliff:g> گھنٹے کیلئے صرف الارمز میں تبدیل کریں</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> تک ایک گھنٹے کیلئے صرف الارمز میں تبدیل کریں</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"غیر معینہ مدت تک مداخلت نہ کریں میں تبدیل کریں"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> منٹ (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> تک) کیلئے مداخلت نہ کریں میں تبدیل کریں</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> تک ایک منٹ کیلئے مداخلت نہ کریں میں تبدیل کریں</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> تک <xliff:g id="DURATION">%1$d</xliff:g> گھنٹے کیلئے مداخلت نہ کریں میں تبدیل کریں</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> تک ایک گھنٹے کیلئے مداخلت نہ کریں میں تبدیل کریں</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"ہمیشہ مداخلت کریں میں تبدیل کریں"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ہمیشہ"</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>
@@ -2569,7 +2659,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> اجازتیں دی گئیں</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> اجازت دی گئی</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> از <xliff:g id="COUNT_3">%d</xliff:g> اجازتیں منظور کی گئیں</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> از <xliff:g id="COUNT_1">%d</xliff:g> اجازت منظور کی گئی</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"کچھ ڈیفالٹس سیٹ ہیں"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"کوئی ڈیفالٹس سیٹ نہیں ہیں"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"سبھی ایپس"</string>
@@ -2580,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ترجیحی"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"حساس"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"‏ڈومین URLs کے ساتھ"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"سبھی ایپس پر ترجیحات کو ڈیفالٹس پر دوبارہ ترتیب دیں"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"سسٹم اور ڈاؤن لوڈ کردہ ایپس سمیت <xliff:g id="COUNT">%d</xliff:g> ایپس انسٹال ہوگئیں"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"منتظم نے غیر فعال کر دیا"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"جدید ترین"</string>
     <string name="unknown_app" msgid="5275921288718717656">"نامعلوم ایپ"</string>
     <string name="choose_profile" msgid="8229363046053568878">"پروفائل منتخب کریں"</string>
@@ -2596,4 +2688,11 @@
       <item quantity="other">‏<xliff:g id="COUNT">%d</xliff:g> ایپس اپنے ڈومین URLs کھول سکتی ہیں</item>
       <item quantity="one">‏ایک ایپ اپنے ڈومین URLs کھول سکتی ہے</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"تسلیم شدہ نہیں ہے"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"ڈیفالٹ ایپس"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"براؤزر ایپ"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"کوئی ڈیفالٹ براؤزر نہیں ہے"</string>
+    <string name="default_app" msgid="6864503001385843060">"(ڈیفالٹ)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-uz-rUZ/arrays.xml b/res/values-uz-rUZ/arrays.xml
index b5b49e5..7c2707e 100644
--- a/res/values-uz-rUZ/arrays.xml
+++ b/res/values-uz-rUZ/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Bog‘lash tugmasi"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"Multimedia"</item>
     <item msgid="7924928667052300589">"Qurilma"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"taxminiy joylashuv"</item>
+    <item msgid="5789673140227507995">"aniq joylashuv"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"tebranish"</item>
+    <item msgid="3434165993711230924">"kontaktlarni ko‘rib chiqish"</item>
+    <item msgid="616161687718081936">"kontaktlarni o‘zgartirish"</item>
+    <item msgid="7638002295329050091">"qo‘ng‘iroqlar jurnalini ko‘rib chiqish"</item>
+    <item msgid="6546959730920410907">"qo‘ng‘iroqlar jurnalini o‘zgartirish"</item>
+    <item msgid="446877710771379667">"taqvimni ko‘rib chiqish"</item>
+    <item msgid="7674458294386319722">"taqvimni o‘zgartirish"</item>
+    <item msgid="8281201165558093009">"wi-fi tarmog‘ini qidirish"</item>
+    <item msgid="8694611243479480497">"xabarnoma"</item>
+    <item msgid="7776439107987345446">"uyali tarmoqni qidirish"</item>
+    <item msgid="514615766544675057">"telefonga qo‘ng‘iroq qilish"</item>
+    <item msgid="8181415497109310680">"SMS\'ni o‘qish"</item>
+    <item msgid="6816551144382117307">"SMS yozish"</item>
+    <item msgid="4600463921908905030">"SMS qabul qilish"</item>
+    <item msgid="5958926493289432745">"Favqulodda SMS qabul qilish"</item>
+    <item msgid="4945269495221089540">"MMS qabul qilish"</item>
+    <item msgid="5570472453573929087">"WAP push xabarlarini qabul qilish"</item>
+    <item msgid="7125408150230860501">"SMS yuborish"</item>
+    <item msgid="7080337936612188061">"ICC SMS‘ni o‘qish"</item>
+    <item msgid="587124103118495063">"ICC SMS yozish"</item>
+    <item msgid="2320577158869025503">"sozlamalarni o‘zgartirish"</item>
+    <item msgid="1545733463471924009">"ustiga chizish"</item>
+    <item msgid="3609046903962454582">"xabarnomalarga kirish"</item>
+    <item msgid="4671646036128214513">"kamera"</item>
+    <item msgid="1097324338692486211">"audioqayd yozish"</item>
+    <item msgid="5031552983987798163">"audioqaydni ijro etish"</item>
+    <item msgid="8374996688066472414">"vaqtinchalik xotira ma‘lumotini o‘qish"</item>
+    <item msgid="3045529469061083747">"vaqtinchalik xotira ma‘lumotini o‘zgartirish"</item>
+    <item msgid="5124443975763747838">"multimedia tugmalari"</item>
+    <item msgid="4547883971364273343">"audio fokus"</item>
+    <item msgid="2603878814882344450">"umumiy tovush balandligi"</item>
+    <item msgid="7136963238377062018">"ovoz balandligi"</item>
+    <item msgid="4270236897655923007">"jiringlash tovush balandligi"</item>
+    <item msgid="6325739889222559394">"multimedia tovush balandligi"</item>
+    <item msgid="5762123934816216821">"signal tovush balandligi"</item>
+    <item msgid="785049718065337473">"xabarnoma tovush balandligi"</item>
+    <item msgid="6700305533746877052">"bluetooth tovush balandligi"</item>
+    <item msgid="2029227495214047094">"uyg‘oq turish"</item>
+    <item msgid="26109888160231211">"joylashuvni kuzatish"</item>
+    <item msgid="5753382310468855812">"yuqori elektr kuchlanishga ega joylashuvlarni kuzatish"</item>
+    <item msgid="3356591542543137332">"foydalanish statistikasini ko‘rish"</item>
+    <item msgid="3073734345226842233">"mikrofonni o‘chirish/yoqish"</item>
+    <item msgid="1148142988678569310">"kontentni translatsiya qilish"</item>
+    <item msgid="9130014005474445273">"VPN tarmog‘ini faollashtirish"</item>
+    <item msgid="1165192162975045562">"orqa fon rasmiga yozish"</item>
+    <item msgid="7129487923652967258">"yordam tuzilishi"</item>
+    <item msgid="1069023208100114540">"yordam ekran rasmi"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Joylashuv"</item>
+    <item msgid="8677040780775113033">"Joylashuv"</item>
+    <item msgid="1660743989948992916">"Joylashuv"</item>
+    <item msgid="8791172739860195290">"Tebranish"</item>
+    <item msgid="383413555642128046">"Aloqalarni ko‘rib chiqish"</item>
+    <item msgid="3654594895269697313">"Kontaktlarni o‘zgartirish"</item>
+    <item msgid="7928393476362362538">"Qo‘ng‘iroqlar jurnalini ko‘rib chiqish"</item>
+    <item msgid="6248591205254641116">"Qo‘ng‘iroqlar jurnalini o‘zgartirish"</item>
+    <item msgid="6093344633066170692">"Taqvimni ko‘rib chiqish"</item>
+    <item msgid="1334886368750347692">"Taqvimni o‘zgartirish"</item>
+    <item msgid="1638204101698708656">"Joylashuv"</item>
+    <item msgid="2154671955760380322">"Post qoldirish"</item>
+    <item msgid="4282477730595931828">"Joylashuv"</item>
+    <item msgid="4891423912898525905">"Telefonga qo‘ng‘iroq qilish"</item>
+    <item msgid="2623604824935968113">"SMS/MMS xabarlarini o‘qish"</item>
+    <item msgid="4420177125221176306">"SMS/MMS yozish"</item>
+    <item msgid="3986142739951490025">"SMS/MMS xabarlarini qabul qilish"</item>
+    <item msgid="3984213795861739778">"SMS/MMS xabarlarini qabul qilish"</item>
+    <item msgid="3656243523752472788">"SMS/MMS qabul qilish"</item>
+    <item msgid="8105802370238551510">"SMS/MMS xabarlarini qabul qilish"</item>
+    <item msgid="1407766984645388488">"SMS/MMS xabarlarini yuborish"</item>
+    <item msgid="3527273606643794973">"SMS/MMS xabarlarini o‘qish"</item>
+    <item msgid="4370895547001583812">"SMS/MMS xabarlarini yozish"</item>
+    <item msgid="4218544235221631789">"Sozlamalarni o‘zgartirish"</item>
+    <item msgid="736541391767350377">"Ustiga chizish"</item>
+    <item msgid="5530815681721654194">"Xabarnomalarga kirish"</item>
+    <item msgid="781213371706962767">"Kamera"</item>
+    <item msgid="1720492593061838172">"Audioqayd yozish"</item>
+    <item msgid="3493046322001257041">"Audioqaydni ijro etish"</item>
+    <item msgid="136815868796597058">"Vaqtinchalik xotira ma‘lumotini o‘qish"</item>
+    <item msgid="5238692940326972503">"Vaqtinchalik xotirani o‘zgartirish"</item>
+    <item msgid="5753789168376302997">"Multimedia tugmalari"</item>
+    <item msgid="3265262911688671938">"Audio fokus"</item>
+    <item msgid="2098976479485046797">"Umumiy tovush balandligi"</item>
+    <item msgid="5660213838861789350">"Ovoz balandligi"</item>
+    <item msgid="7983336752371254444">"Jiringlash tovush balandligi"</item>
+    <item msgid="7878027809189330917">"Multimedia tovush balandligi"</item>
+    <item msgid="7260546305036218513">"Signal tovush balandligi"</item>
+    <item msgid="9103719301075748925">"Xabarnoma tovush balandligi"</item>
+    <item msgid="7025966722295861512">"Bluetooth tovush balandligi"</item>
+    <item msgid="4665183401128289653">"Uyg‘oq turish"</item>
+    <item msgid="8584357129746649222">"Joylashuv"</item>
+    <item msgid="7669257279311110599">"Joylashuv"</item>
+    <item msgid="3459320345690097795">"Foydalanish statistikasini ko‘rish"</item>
+    <item msgid="1312534577834048535">"Mikrofonni o‘chirish/yoqish"</item>
+    <item msgid="5906017727368097853">"Kontentni translatsiya qilish"</item>
+    <item msgid="2486614710846178542">"VPN tarmog‘ini faollashtirish"</item>
+    <item msgid="5586547561693629602">"Orqa fon rasmiga yozish"</item>
+    <item msgid="32794179825485062">"Yordam tuzilishi"</item>
+    <item msgid="7872852746938272552">"Yordam ekran rasmi"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Qisqa"</item>
     <item msgid="2560532955514699713">"O‘rtacha"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"past"</item>
     <item msgid="4212263919458209842">"jiddiy"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"O‘chirilgan"</item>
-    <item msgid="5656544177755411222">"Cheklangan uzilishlar"</item>
-    <item msgid="8735337502532332056">"Uzilishlarsiz"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"O‘rtacha"</item>
     <item msgid="866544120205026771">"Qoniqarli"</item>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 65e1055..6781a82 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD karta"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proksi sozlamalari"</string>
     <string name="cancel" msgid="6859253417269739139">"Bekor qilish"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"BEKOR QILISH"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"DAVOM ETISH"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"HA"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"YO‘Q"</string>
-    <string name="forget" msgid="7267115980248732932">"UNUTISH"</string>
+    <string name="forget" msgid="1400428660472591263">"Unutish"</string>
+    <string name="save" msgid="879993180139353333">"Saqlash"</string>
+    <string name="done" msgid="6942539184162713160">"Tayyor"</string>
     <string name="settings_label" msgid="1626402585530130914">"Sozlamalar"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Sozlamalar"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Sozlamalar yorlig‘i"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Quvvatlagichni ulab yana urinib ko‘ring."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ekran qulfi PIN kodi yoki parol yo‘q"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Shifrlashni boshlashdan oldin, ekran qulfi uchun PIN kod yoki parol o‘rnatish lozim."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Qurilmani shifrlash buyrug‘ini tasdiqlash uchun chizmali kalitingizni kiritishingiz zarur."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Shifrlansinmi?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Boshlangan shifrlash amaliyotini orqaga qaytarib bo‘lmaydi va agar uning jarayoni uzilsa, ma‘lumotlaringiz o‘chirib yuboriladi. Shifrlash jarayoni bir soat yoki ko‘proq vaqtni talab qiladi va uning davomida planshet bir necha marta o‘chib yoqiladi."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Boshlangan shifrlash amaliyotini orqaga qaytarib bo‘lmaydi va agar uning jarayoni uzilsa, ma‘lumotlaringiz o‘chirib yuboriladi. Shifrlash jarayoni bir soat yoki ko‘proq vaqtni talab qiladi va uning davomida telefon bir necha marta o‘chib yoqiladi."</string>
@@ -419,8 +416,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Qulf ochish chizmasi"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN kod"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Parol"</string>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Agar ekranni qulflagan bo‘lsangiz, barmoq izlari yordamida ochishni Sozlamalar &gt; Xavfsizlik bandidan o‘rnatishingiz mumkin."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Ekran qulfini o‘chirib qo‘yish"</string>
     <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>
@@ -522,8 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Qo‘shimcha"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth kengaytmalari"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Yaqin atrofdagi Bluetooth qurilmalarga ulanish uchun Bluetooth funksiyasini yoqing."</string>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Joylashuv aniqligini oshirish uchun Bluetooth tarmoqlari o‘chirilgan bo‘lsa-da, ilova va xizmatlar Bluetooth tarmoqlarni tekshirib chiqadi. Siz bu xususiyatni <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>tekshirish sozlamalari<xliff:g id="LINK_END_1">LINK_END</xliff:g>dan o‘chirib qo‘yishingiz mumkin."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Ulanish..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> media audio’dan uziladi."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> garnituradan uziladi."</string>
@@ -589,8 +584,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Joylashuv aniqligini oshirish uchun Wi-Fi o‘chirilgan bo‘lsa-da, ilova va xizmatlar Wi-Fi tarmoqlarni tekshirib chiqadi. Siz bu xususiyatni <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>tekshirish sozlamalari<xliff:g id="LINK_END_1">LINK_END</xliff:g>dan o‘chirib qo‘yishingiz mumkin."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Boshqa ko‘rsatma"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Uyqu holatda ham Wi‑Fi yoqilgan turishi"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Uyqu rejimida Wi-Fi yoniq tursin"</string>
@@ -607,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Tekshirish"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Kengaytirilgan"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Ilovalarni ko‘r-sh"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"WiFi kuchini ko‘r-sh"</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>
@@ -666,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Tizimga kirib, ulansinmi?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"Tarmoqqa ulanish u-n “<xliff:g id="APP_NAME">%1$s</xliff:g>” tizimga kirishni talab qiladi"</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ULANISH"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Bu tarmoq internetga ulanmagan. Baribir ulanaverilsinmi?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Bu tarmoq qayta taklif qilinmasin"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Ulanish"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Tarmoqqa ulanmadi"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unutish"</string>
@@ -737,12 +731,10 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi afzal ko‘rilsin"</item>
     <item msgid="5267397515594230396">"Mobil tarmoq afzal ko‘rilsin"</item>
-    <item msgid="3132912693346866895">"Faqat Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wi-Fi qo‘ng‘iroqlari xizmati yoniqligida telefoningiz signal quvvatiga asoslanib Wi-Fi tarmoqlari yoki mobil internet orqali qo‘ng‘iroqlarni amalga oshiradi. Ushbu xizmatni yoqib qo‘yishdan oldin o‘z mobil operatoringizdan narxlar va tafsilotlarni surishtirib oling."</string>
     <string name="home_settings" msgid="212375129455718176">"Uyga"</string>
@@ -916,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Mavjud (faqat o‘qish uchun)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Umumiy xotira hajmi"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Hisoblanmoqda…"</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Ilovalar (ilova ma‘lumoti &amp; multimedia kontenti)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Ilovalar va ilova ma’lumotlari"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Yuklab olinganlar"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Rasmlar, videolar"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (musiqa, ringtonlar, podkastlar va boshq.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Boshqa"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Boshqa fayllar"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Keshlangan ma‘lumot"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Bo‘lishilgan xotirani uzish"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD kartani uzish"</string>
@@ -954,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Uzish jarayonida..."</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Xotirada kam joy qoldi"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Tizimning sinxronlash kabi ba‘zi funksiyalari noto‘g‘ri ishlashi mumkin. Ilovalar yoki multimedia kontentlariga o‘xshagan elementlarni o‘chirib yoki olib tashlab, ko‘proq joy bo‘shating."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Qayta nomlash"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Ulash"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Chiqarib olish"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Tozalash va formatlash"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Tozalash va formatlash (IchX)"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB orqali kompyuterga ulanish"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Kompyuter bilan USB ulanish"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Quyidagicha ulanish"</string>
@@ -964,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"MIDI xususiyatli ilovalarga kompyuteringizdagi MIDI dasturiy ta’minotini USB orqali ishlatish imkonini beradi."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Boshqa foydalanuvchilar"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Xotira qurilmasi"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Tashqi xotira"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"(Umumiy <xliff:g id="TOTAL">%2$s</xliff:g>dan) <xliff:g id="FREE">%1$s</xliff:g> bo‘sh"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> ulanildi"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g> ulanilmadi"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> xavfsiz chiqarib olindi"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g> xavfsiz chiqarib olinmadi"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> formatlandi"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> ni formatlab bo‘lmadi"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Xotira qur-masini qayta nomlash"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Formatlashdan so‘ng siz ushbu <xliff:g id="NAME_0">^1</xliff:g> xotirani boshqa qurilmalarda foydalanishingiz mumkin. \n\nUshbu <xliff:g id="NAME_1">^1</xliff:g> xotiradagi barcha ma’lumotlar o‘chiriladi. Zahira nusxalarini saqlab qo‘yishga e’tibor qarating. \n\n"<b>"Rasmlar va boshqa media fayllarning zahira nusxasini saqlab qo‘ying"</b>" \nMedia fayllaringizni ushbu qurilmadagi muqobil xotiraga ko‘chiring yoki USB kabeldan foydalanib ularni kompyuterga o‘tkazing. \n\n"<b>"Ilovalarning zahira nusxasini saqlab qo‘ying"</b>" \nUshbu <xliff:g id="NAME_6">^1</xliff:g> xotirada joylashgan barcha ilovalar o‘chiriladi va ularning ma’lumotlari tozalanadi. Ushbu ilovalarni saqlab qolish uchun ularni joriy qurilmadagi muqobil xotiraga ko‘chiring."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Siz ushbu <xliff:g id="NAME_0">^1</xliff:g> xotirani chiqarsangiz, unda joylashgan ilovalar ishlashdan to‘xtaydi va undagi media fayllar uni kiritmaguningizcha ishlamaydi."</b>" \n\n <xliff:g id="NAME_1">^1</xliff:g> Faqat ushbu qurilmada ishlashi uchun formalanadi. U boshqa hech qanday qurilmada ishlamaydi."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g>ni o‘rnating"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Ko‘chma xotira sifatida foydalanish"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Qurilmalararo rasmlar va boshqa media fayllarni ko‘chirish uchun"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Ichki xotiradan foydalaning"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Ushbu qurilmaga faqat rasmlar va ilovalarni saqlash mumkin. Boshqa qurilmalar bilan ishlashidan to‘sish uchun formatlash talab qilinadi."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Ichki xotira kabi formatlash"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"<xliff:g id="NAME_0">^1</xliff:g>ni xavfsiz qilish uchun uni formatlash talab qilinadi. \n\nFormatlashdan so‘ng ushbu <xliff:g id="NAME_1">^1</xliff:g> xotira faqat joriy qurilmada ishlaydi. \n\n"<b>"Formatlash hozirda <xliff:g id="NAME_2">^1</xliff:g>da joylashgan barcha ma’lumotlarni o‘chiradi."</b>" Ma’lumotlar yo‘qolishining oldini olish uchun ularning zahira nusxasini saqlashga e’tibor qarating."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Tozalash va formatlash"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> formatlanmoqda…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"<xliff:g id="NAME">^1</xliff:g> formatlanayotganda olmang."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Ma’l-tlarni yangi xotiraga ko‘ch"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Rasmlarinngiz, fayllaringiz va ilovalaringiz ma’lumotlarini ushbu yangi <xliff:g id="NAME">^1</xliff:g> xotiraga ko‘chirishingiz mumkin. \n\nKo‘chirish <xliff:g id="TIME">^2</xliff:g> atrofida vaqt oladi va ichki xotirada <xliff:g id="SIZE">^3</xliff:g> joy bo‘shaydi. Bu jarayon davomida ba’zi ilovalar ishlamaydi."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Hozir ko‘chirish"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Keyinroq ko‘chirish"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Ma’lumotlarni hozir ko‘chirish"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Ko‘chirish <xliff:g id="TIME">^1</xliff:g> atrofida vaqt oladi. Buning natijasida ichki xotirada <xliff:g id="SIZE">^2</xliff:g> joy bo‘shaydi."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Ko‘chirish"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Ma’lumotlar ko‘chirilmoqda…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Ko‘chirish davomida: \n• <xliff:g id="NAME">^1</xliff:g>ni olmang. \n• Ba’zi ilovalar to‘g‘ri ishlamasligi mumkin. \n• Qurilmangiz zaryadi tugab qolmasligi kerak."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> tayyor"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Rasmlar va boshqa media fayllardan foydalanish uchun <xliff:g id="NAME">^1</xliff:g>da hammasi moslangan."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Yangi <xliff:g id="NAME">^1</xliff:g> ishlamoqda. \n\nRasmlar, fayllar va ilova ma’lumotlarini ushbu qurilmaga ko‘chirish uchun Sozlamalar &gt; Xotira bo‘limiga o‘ting."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g>ni ko‘chirish"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<xliff:g id="APP">^1</xliff:g> va uning ma’lumotlarini <xliff:g id="NAME_0">^2</xliff:g>ga ko‘chirish biroz vaqt oladi. Ko‘chirish tugamaguncha ilovadan foydalana olmaysiz. \n\nKo‘chirish davomida <xliff:g id="NAME_1">^2</xliff:g>dan foydalanmang."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> ko‘chirilmoqda…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Ko‘chirish davomida <xliff:g id="NAME">^1</xliff:g>ni olmang. \n\n Qurilmadagi <xliff:g id="APP">^2</xliff:g> ilovasi ko‘chirish tugamaguncha ishlamaydi."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Ko‘chirishni bekor qilish"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Batareya ahvoli"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Batareya darajasi"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNlar"</string>
@@ -1008,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"standartdan tiklash"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN sozlamalarni andozadan tiklash bajarildi."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Tarmoq sozlamalarini tiklash"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Bunda, tarmoqqa oid barcha sozlamalar dastlabki holatiga qaytariladi, jumladan:\n\n"<li>"Wi-Fi"</li>\n<li>"Mobil internet"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Bu amal barcha tarmoq sozlamalarini qaytadan tiklaydi, jumladan: \n\n"<li>"Wi-Fi"</li>\n<li>"Mobil internet "</li>\n<li>"Bluetooth"</li>" tarmoqlarini"</string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Sozlamalarni tiklash"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Barcha tarmoq sozlamalari tiklansinmi? Siz bu amalni ortga qaytara olmaysiz!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Barcha tarmoq sozlamalari qayta tiklansinmi? Bu amalni ortga qaytarib bo‘lmaydi!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Sozlamalarni tiklash"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Tarmoq sozlamalarini tiklash buyrug‘ini tasdiqlash uchun chizmali parolni kiritishingiz lozim."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Tiklansinmi?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Tarmoq sozlamalarini tiklash"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Tarmoq sozlamalari qayta tiklandi"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Quril-ni ilk holatga qaytarish"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Ishlab chiqarilgan holatiga qaytarish"</string>
     <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>
@@ -1030,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD kartadagi musiqa va rasmlar kabi barcha ma’lumotlarni o‘chirish"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Planshetni dastlabki sozlamarga qaytarish"</string>
     <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_desc" msgid="1062841478823409667">"Barcha shaxsiy ma\'lumotlaringiz va ko‘chirib olingan ilovalarni o‘chirilishiga rozimisiz? Bu amalni ortga qaytarib bo‘lmaydi!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Hamma narsani o‘chirish"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Ushbu foydalanuvchiga sozlamalarni zavod holatiga qaytarishga ruxsat berilmagan"</string>
@@ -1049,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Ovozli pochta, qo‘ng‘iroqni yo‘naltirish, qo‘ng‘roqni kutish va chaqiruvchi IDsi sozlamalari"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB modem"</string>
@@ -1082,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Yordam"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobil tarmoqlar"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Uyali tarmoq paketlari"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Standart SMS ilovasi"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS ilovasi"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS ilovasi o‘zgartirilsinmi?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"SMS ilovasi sifatida <xliff:g id="NEW_APP">%1$s</xliff:g>dan <xliff:g id="CURRENT_APP">%2$s</xliff:g> o‘rniga foydalanilsinmi?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g>dan SMS ilovasi sifatida foydalanilsinmi?"</string>
@@ -1113,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Joylashuvni GPS yordamida aniqlash"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Tekshirish"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Tekshirilmoqda"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi tarmog‘i tekshirilmoqda"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Joylashuv aniqligini ochirish uchun ilova va xizmatlarga Wi-Fi tarmog‘idagi qurilmalarni Wi-Fi o‘chirilgan bo‘lganda ham tekshirib chiqishga ruxsat berish kerak"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth tarmog‘i tekshirilmoqda"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Joylashuv aniqligini ochirish uchun ilova va xizmatlarga Bluetooth tarmog‘idagi qurilmalarni Bluetooth o‘chirilgan bo‘lganda ham tekshirib chiqishga ruxsat berish kerak"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi va mobil tarmoq"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Joylashuvingizni tezroq aniqlash uchun ilovalarga Google joylashuv xizmatlaridan foydalanishga ruxsat berish. Joylashuv haqida anonim ma‘lumot to‘planib, Google‘ga yuboriladi."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi orqali aniqlangan joylashuv"</string>
@@ -1158,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Parol o‘rnatildi"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN kod o‘rnatildi"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Chizmali parol o‘rnatildi"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Davom etish uchun chizmali parolingizni kiriting."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Davom etish uchun qurilmangiz PIN kodini kiriting."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Davom etish uchun qurilmangiz parolini kiriting."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN kod noto‘g‘ri"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Parol noto‘g‘ri"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Chizmali parol noto‘g‘ri"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Qurilma xavfsizligi"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Qulfni ochish chizmasini o‘zgartirish"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Qulfni ochish PIN kodini o‘zgartirish"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Saqlangan chizmani tasdiqlash"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Qayta urinib ko‘ring:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Qulfdan yechish chizmasini chizing"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Yordam uchun Menyu‘ni bosing."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Chizib bo‘lgandan so‘ng barmog‘ingizni erkandan ajrating"</string>
@@ -1184,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Qulfni ochish chizmasini o‘rnatish"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Qulfni ochish chizmasini o‘zgartirish"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Chizmali parolni ochish uchun chizish"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Juda ko‘p noto‘g‘ri urinishlar!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> soniyadan so‘ng qayta urinib ko‘ring."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Juda ko‘p noto‘g‘ri urinishlar bo‘ldi! <xliff:g id="NUMBER">%d</xliff:g> soniyadan so‘ng qayta urinib ko‘ring."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Ilova telefoningizga o‘rnatilmagan."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Ilovalar boshqaruvi"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"O‘rnatilgan ilovlarni boshqarish yoki o‘chirish"</string>
@@ -1236,7 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Xajm bo‘yicha saralash"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Ishlayotgan xizmatlarni ko‘rsatish"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Keshlangan jarayonlarni ko‘rsatish"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"Birlamchi favqulodda holatlar ilovasi"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Favqulodda holatlar ilovasi"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Ilova afzalliklarini dastlabki sozlamalariga qaytarish"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Ilova afzalliklari dastlabki sozlamalariga qaytarilsinmi?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Bu quyidagilar uchun barcha afzalliklarni dastlabki sozlamalariga qaytaradi:\n\n "<li>"O‘chirib qo‘yilgan ilovalar"</li>\n" "<li>"O‘chirib qo‘yilgan ilova xabarnomalari "</li>\n" "<li>"Standart ish ilovalari"</li>\n" "<li>"Ilovalar uchun fondagi trafik cheklovlari"</li>\n" "<li>"Har qanday ruxsatlar cheklovlari"</li>\n\n" Ilovalarning hech qanday ma‘lumotlari o‘chirib tashlanmaydi."</string>
@@ -1440,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Barcha bluetooth HCI paketlarini bitta faylda jamlash"</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="select_logd_size_title" msgid="7433137108348553508">"Jurnal buferi hajmi"</string>
@@ -1742,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 soat"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 kun"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Tizimni ko‘rsatish"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Tizimni yashirish"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss‘dan foydalanish"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistika turi"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Fon"</string>
@@ -1838,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Joriy parol:"</string>
@@ -2213,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Foydalanuvchi"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Cheklangan profil"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Yangi foyd-chi qo‘shilsinmi?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Siz qo‘shimcha foydalanuvchilarni yaratish orqali ushbu qurilmadan boshqa odamlar bilan o‘rtada foydalanishingiz mumkin. Bunda, har bir foydalanuvchi o‘z hududiga ega bo‘lib, uni o‘z ilovalari, orqa fon rasmi va boshqalar bilan o‘ziga moslashtirib olishi mumkin. Bundan tashqari, foydalanuvchilar Wi-Fi kabi barchaga ta’sir qiluvchi qurilma sozlamalarini ham o‘zgartirishi mumkin.\n\nYangi foydalanuvchi qo‘shilgach, o‘sha shaxs o‘z hududini sozlashi lozim bo‘ladi.\n\nHar qanday foydalanuvchi ilovalarni barcha foydalanuvchilar uchun yangilashi mumkin."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Bu qurilmadan bir necha kishi alohida foydalanuvchilar qo‘shib foydalanishi mumkin. Har bir foydalanuvchiga diskda joy ajratiladi, tayinlangan hajm ilovalar, ekran foni rasmi, va hokazolarga taqsimlanishi mumkin. Foydalanuvchilar Wi-Fi kabi sozlamalarni o‘zgartirsa, qolganlarda ham aks etishi mumkin. \n\nYangi foydalanuvchi qo‘shilganda, unga ajratilgan joy hajmi tayinlanishi kerak.\n\nHar bir foydalanuvchi ilovalarni qolganlarga ham yangilashi mumkin."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Yangi foydalanuvchi qo‘shilgach, o‘sha shaxs o‘z hududini sozlashi lozim bo‘ladi.\n\nHar qanday foydalanuvchi ilovalarni barcha foydalanuvchilar uchun yangilashi mumkin."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Foydalanuvchi hozir yaratilsinmi?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"O‘sha shaxs yoningizda bo‘lib, qurilmani qo‘liga olishi va o‘z hududini sozlashga imkoni bo‘lishi lozim."</string>
@@ -2396,6 +2433,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"favqulodda holatlar muz ilova birlamchi"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"ilovalar yuklab olish tizim"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"ilovalar ruxsatnomalar xavfsizlik"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"ilovalar birlamchi"</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>
@@ -2410,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Uyg‘otkich ovozi"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Rington balandligi"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Bildirishnomalar ovozi"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Bloklash uzilishlari"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Faqat muhimlariga ruxsat ber-n"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Avtomatik qoidalar"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Qo‘ng‘iroq yoki 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_alarms" msgid="7380265858042606857">"Faqat signallarga ruxsat berilsin"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Bezovta qilinmasin"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Faqat muhimlari"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Faqat signallar"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Bezovta qilinishlarsiz"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefon ringtoni"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Bild-lar u-n birlamchi rington"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Qo‘ng‘iroq vaqtida tebranish"</string>
@@ -2450,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Hech qanday xabarnoma qabul qiluvchi ilova o‘rnatilmagan."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> yoqilsinmi?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> aloqa nomlari va sizga yuborilgan xabarlar matni kabi shaxsiy ma‘lumotlardan iborat bo‘lishi mumkin bo‘lgan tizim yoki o‘rnatilgan ilova tomonidan post sifatida qoldirilgan barcha xabarnomalarni o‘qish imkoniyatiga ega bo‘ladi. Shuningdek, u bu xabarnomalarni e‘tiborsiz qoldirish yoki ulardagi vazifalar tugmalarini bosish imkoniyatiga ham ega bo‘ladi."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Shartlarning manbalari"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Hech qaysi ilova shart qo‘ymaydi"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d ta ilova shart qo‘yadi</item>
-      <item quantity="one">%d ta ilova shart qo‘yadi</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Shartlar manbasi o‘rnatilmagan."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> yoqilsinmi?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> “Bezovta qilmaslik” rejimidan chiqish shartlarini qo‘shishi mumkin."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ilovalar yuklanmoqda…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Barchasini bloklash"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ushbu ilovadan keladigan bildirishnomalar hech qachon ko‘rsatilmasin"</string>
@@ -2472,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Muhimlik darajasi"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Maxfiy"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Qoida nomi"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Qoida qo‘shish"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Qoidani o‘chirish"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"“<xliff:g id="RULE">%1$s</xliff:g>\" qoidasi o‘chirilsinmi?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"O‘chirish"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Qoida turi"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Noma’lum"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Qoidani moslash"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Qoidalar tartibi"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Qoida topilmadi"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Kunlar"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Hech qaysi"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Har kuni"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Hech qachon"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="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>
@@ -2492,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Signallar"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Eslatmalar"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Tadbirlar"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Tanlangan chaqiruvchilar"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Qayta chaqiruvchilar"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Birortasi <xliff:g id="MINUTES">%d</xliff:g> daqiqa ichida qayta qo‘ng‘iroq qilayotgan bo‘lsa, unga ruxsat berishingiz kerak."</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Avtomatik yoqish"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Hech qachon"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Har kuni kechasi"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"Ertasiga <xliff:g id="FORMATTED_TIME">%s</xliff:g> da"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Qachon bezovta qilish mumkin?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Qancha muddatga?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Uzluksiz"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> daqiqa</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> daqiqa</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> soat</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> soat</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Faqat muhim bildirishnomalarni noma’lum muddatga yoqish"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Muhim bildirishnomalar <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> gacha faqat <xliff:g id="DURATION">%1$d</xliff:g> daqiqaga o‘rnatilsin</item>
+      <item quantity="one">Muhim bildirishnomalar <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> gacha faqat bir daqiqaga o‘rnatilsin</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Muhim bildirishnomalar (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> gacha) faqat <xliff:g id="DURATION">%1$d</xliff:g> soatga o‘rnatilsin</item>
+      <item quantity="one">Muhim bildirishnomalar <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> gacha faqat bir soatga o‘rnatilsin</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Faqat signallarni noma’lum muddatga yoqish"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Signallar (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> gacha) faqat <xliff:g id="DURATION">%1$d</xliff:g> daqiqaga o‘rnatilsin</item>
+      <item quantity="one">Signallar <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> gacha faqat bir daqiqaga o‘rnatilsin</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Signallar <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> gacha faqat <xliff:g id="DURATION">%1$d</xliff:g> soatga o‘rnatilsin</item>
+      <item quantity="one">Signallar <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> gacha faqat bir soatga o‘rnatilsin</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Noma’lum vaqtda bezovta qilinmasin"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> gacha <xliff:g id="DURATION">%1$d</xliff:g> daqiqa mobaynida bezovta qilinmasin</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> gacha bir daqiqa mobaynida bezovta qilinmasin</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> gacha <xliff:g id="DURATION">%1$d</xliff:g> soat mobaynida bezovta qilinmasin</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> gacha bir soat mobaynida bezovta qilinmasin</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Har doim bezovta qilinaversin"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"har doim"</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>
@@ -2565,7 +2659,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ta ruxsat berildi</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ta ruxsat berildi</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"> <xliff:g id="COUNT_3">%d</xliff:g>dan <xliff:g id="COUNT_2">%d</xliff:g> ta ruxsat berilgan</item>
+      <item quantity="one"> <xliff:g id="COUNT_1">%d</xliff:g>dan <xliff:g id="COUNT_0">%d</xliff:g> ta ruxsat berilgan</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Ba’zi odatiy sozlamalar o‘rnatilgan"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Odatiy sozlamalar o‘rnatilmagan"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Barcha ilovalar"</string>
@@ -2576,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Muhim"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Maxfiy"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Domen havolalari bilan"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Barcha ilovalarning sozlamalarini ilk holatga qaytarish"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> ta ilova o‘rnatilgan, jumladan, tizimga oid va yuklab olingan ilovalar"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Administrator tomonidan o‘chirib qo‘yilgan"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Qo‘shimcha"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Noma’lum ilova"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Profil tanlash"</string>
@@ -2592,4 +2688,11 @@
       <item quantity="other"> <xliff:g id="COUNT">%d</xliff:g> tailova o‘z domeni havolalarini (URL manzillar) ochishi mumkin</item>
       <item quantity="one"> bitta ilova o‘z domeni havolalarini (URL manzillar) ochishi mumkin</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Aniqlanmadi"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Birlamchi ilovalar"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Brauzer ilovasi"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Birlamchi brauzer mavjud emas"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Birlamchi)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 5618cbb..a5acdf4 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Nút bấm"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"Truyền thông"</item>
     <item msgid="7924928667052300589">"Thiết bị"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"vị trí tổng thể"</item>
+    <item msgid="5789673140227507995">"vị trí chính xác"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"rung"</item>
+    <item msgid="3434165993711230924">"đọc danh sách liên hệ"</item>
+    <item msgid="616161687718081936">"sửa đổi danh sách liên hệ"</item>
+    <item msgid="7638002295329050091">"đọc nhật ký cuộc gọi"</item>
+    <item msgid="6546959730920410907">"sửa đổi nhật ký cuộc gọi"</item>
+    <item msgid="446877710771379667">"đọc lịch"</item>
+    <item msgid="7674458294386319722">"sửa đổi lịch"</item>
+    <item msgid="8281201165558093009">"quét wi-fi"</item>
+    <item msgid="8694611243479480497">"thông báo"</item>
+    <item msgid="7776439107987345446">"quét điện thoại di động"</item>
+    <item msgid="514615766544675057">"gọi điện thoại"</item>
+    <item msgid="8181415497109310680">"đọc SMS"</item>
+    <item msgid="6816551144382117307">"soạn SMS"</item>
+    <item msgid="4600463921908905030">"nhận SMS"</item>
+    <item msgid="5958926493289432745">"nhận SMS khẩn cấp"</item>
+    <item msgid="4945269495221089540">"nhận MMS"</item>
+    <item msgid="5570472453573929087">"nhận WAP push"</item>
+    <item msgid="7125408150230860501">"gửi SMS"</item>
+    <item msgid="7080337936612188061">"đọc ICC SMS"</item>
+    <item msgid="587124103118495063">"soạn ICC SMS"</item>
+    <item msgid="2320577158869025503">"sửa đổi cài đặt"</item>
+    <item msgid="1545733463471924009">"vẽ lên trên"</item>
+    <item msgid="3609046903962454582">"truy cập thông báo"</item>
+    <item msgid="4671646036128214513">"máy ảnh"</item>
+    <item msgid="1097324338692486211">"ghi âm"</item>
+    <item msgid="5031552983987798163">"phát âm thanh"</item>
+    <item msgid="8374996688066472414">"đọc khay nhớ tạm"</item>
+    <item msgid="3045529469061083747">"sửa đổi khay nhớ tạm"</item>
+    <item msgid="5124443975763747838">"các nút phương tiện truyền thông"</item>
+    <item msgid="4547883971364273343">"tập trung âm thanh"</item>
+    <item msgid="2603878814882344450">"âm lượng chính"</item>
+    <item msgid="7136963238377062018">"âm lượng thoại"</item>
+    <item msgid="4270236897655923007">"âm lượng chuông"</item>
+    <item msgid="6325739889222559394">"âm lượng phương tiện truyền thông"</item>
+    <item msgid="5762123934816216821">"âm lượng báo thức"</item>
+    <item msgid="785049718065337473">"âm lượng thông báo"</item>
+    <item msgid="6700305533746877052">"âm lượng bluetooth"</item>
+    <item msgid="2029227495214047094">"không khóa màn hình"</item>
+    <item msgid="26109888160231211">"giám sát vị trí"</item>
+    <item msgid="5753382310468855812">"theo dõi vị trí dùng điện năng cao"</item>
+    <item msgid="3356591542543137332">"tải thống kế sử dụng"</item>
+    <item msgid="3073734345226842233">"tắt/bật micrô"</item>
+    <item msgid="1148142988678569310">"chiếu phương tiện"</item>
+    <item msgid="9130014005474445273">"kích hoạt VPN"</item>
+    <item msgid="1165192162975045562">"hình nền ghi"</item>
+    <item msgid="7129487923652967258">"cấu trúc hỗ trợ"</item>
+    <item msgid="1069023208100114540">"ảnh chụp màn hình hỗ trợ"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Vị trí"</item>
+    <item msgid="8677040780775113033">"Vị trí"</item>
+    <item msgid="1660743989948992916">"Vị trí"</item>
+    <item msgid="8791172739860195290">"Rung"</item>
+    <item msgid="383413555642128046">"Đọc danh sách liên hệ"</item>
+    <item msgid="3654594895269697313">"Sửa đổi danh sách liên hệ"</item>
+    <item msgid="7928393476362362538">"Đọc nhật ký cuộc gọi"</item>
+    <item msgid="6248591205254641116">"Sửa đổi nhật ký cuộc gọi"</item>
+    <item msgid="6093344633066170692">"Đọc lịch"</item>
+    <item msgid="1334886368750347692">"Sửa đổi lịch"</item>
+    <item msgid="1638204101698708656">"Vị trí"</item>
+    <item msgid="2154671955760380322">"Đăng thông báo"</item>
+    <item msgid="4282477730595931828">"Vị trí"</item>
+    <item msgid="4891423912898525905">"Gọi điện thoại"</item>
+    <item msgid="2623604824935968113">"Đọc SMS/MMS"</item>
+    <item msgid="4420177125221176306">"Viết SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Nhận SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Nhận SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Nhận SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Nhận SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Gửi SMS/MMS"</item>
+    <item msgid="3527273606643794973">"Đọc SMS/MMS"</item>
+    <item msgid="4370895547001583812">"Viết SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Sửa đổi cài đặt"</item>
+    <item msgid="736541391767350377">"Vẽ lên trên"</item>
+    <item msgid="5530815681721654194">"Truy cập thông báo"</item>
+    <item msgid="781213371706962767">"Máy ảnh"</item>
+    <item msgid="1720492593061838172">"Ghi âm"</item>
+    <item msgid="3493046322001257041">"Phát âm thanh"</item>
+    <item msgid="136815868796597058">"Đọc khay nhớ tạm"</item>
+    <item msgid="5238692940326972503">"Sửa đổi khay nhớ tạm"</item>
+    <item msgid="5753789168376302997">"Các nút phương tiện"</item>
+    <item msgid="3265262911688671938">"Tập trung âm thanh"</item>
+    <item msgid="2098976479485046797">"Âm lượng chính"</item>
+    <item msgid="5660213838861789350">"Âm lượng thoại"</item>
+    <item msgid="7983336752371254444">"Âm lượng chuông"</item>
+    <item msgid="7878027809189330917">"Âm lượng phương tiện"</item>
+    <item msgid="7260546305036218513">"Âm lượng báo thức"</item>
+    <item msgid="9103719301075748925">"Âm lượng thông báo"</item>
+    <item msgid="7025966722295861512">"Âm lượng bluetooth"</item>
+    <item msgid="4665183401128289653">"Không khóa màn hình"</item>
+    <item msgid="8584357129746649222">"Vị trí"</item>
+    <item msgid="7669257279311110599">"Vị trí"</item>
+    <item msgid="3459320345690097795">"Tải thống kê sử dụng"</item>
+    <item msgid="1312534577834048535">"Tắt/bật micrô"</item>
+    <item msgid="5906017727368097853">"Chiếu phương tiện"</item>
+    <item msgid="2486614710846178542">"Kích hoạt VPN"</item>
+    <item msgid="5586547561693629602">"Hình nền ghi"</item>
+    <item msgid="32794179825485062">"Cấu trúc hỗ trợ"</item>
+    <item msgid="7872852746938272552">"Ảnh chụp màn hình hỗ trợ"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Ngắn"</item>
     <item msgid="2560532955514699713">"Trung bình"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"thấp"</item>
     <item msgid="4212263919458209842">"cực thấp"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Tắt"</item>
-    <item msgid="5656544177755411222">"Gián đoạn hạn chế"</item>
-    <item msgid="8735337502532332056">"Gián đoạn bằng 0"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Bình thường"</item>
     <item msgid="866544120205026771">"Trung bình"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index c73bcf8..61909bc 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Thẻ SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Cài đặt proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Hủy"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"HỦY"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"TIẾP TỤC"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"CÓ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"KHÔNG"</string>
-    <string name="forget" msgid="7267115980248732932">"BỎ QUA"</string>
+    <string name="forget" msgid="1400428660472591263">"Bỏ qua"</string>
+    <string name="save" msgid="879993180139353333">"Lưu"</string>
+    <string name="done" msgid="6942539184162713160">"Xong"</string>
     <string name="settings_label" msgid="1626402585530130914">"Cài đặt"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Cài đặt"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Lối tắt cài đặt"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Vui lòng cắm bộ sạc của bạn và thử lại."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Không có mật khẩu hoặc PIN khóa màn hình"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Bạn cần đặt mã PIN hoặc mật khẩu khóa màn hình trước khi có thể bắt đầu quá trình mã hóa."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Bạn phải vẽ hình mở khóa của mình để xác nhận mã hóa thiết bị."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Mã hóa?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Tác vụ mã hóa không thể hoàn nguyên được và nếu bạn làm gián đoạn tác vụ này, bạn sẽ mất dữ liệu. Quá trình mã hóa diễn ra ít nhất một tiếng, trong thời gian này máy tính bảng sẽ khởi động lại nhiều lần."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Tác vụ mã hóa không thể hoàn nguyên được và nếu bạn làm gián đoạn tác vụ này, bạn sẽ mất dữ liệu. Quá trình mã hóa diễn ra ít nhất một tiếng, trong thời gian này điện thoại sẽ khởi động lại nhiều lần."</string>
@@ -419,8 +416,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Hình"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Mã PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Mật khẩu"</string>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Sau khi thiết lập khóa màn hình, bạn cũng có thể thiết lập vân tay của mình trong Cài đặt và bảo mật."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Tắt khóa màn hình"</string>
     <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>
@@ -522,8 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Nâng cao"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth nâng cao"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Khi Bluetooth bật, thiết bị của bạn có thể kết nối với thiết bị Bluetooth khác ở gần."</string>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Để nâng cao độ chính xác về vị trí, các ứng dụng và dịch vụ sẽ quét tìm thiết bị Bluetooth, ngay cả khi Bluetooth tắt. Bạn có thể thay đổi điều này trong <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>cài đặt quét<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Kết nối với…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối khỏi âm thanh phương tiện."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối khỏi âm thanh thiết bị rảnh tay."</string>
@@ -589,8 +584,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Để nâng cao độ chính xác về vị trí, các ứng dụng và dịch vụ sẽ quét tìm mạng Wi‑Fi, ngay cả khi Wi‑Fi tắt. Bạn có thể thay đổi điều này trong <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>cài đặt quét<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Không hiển thị nữa"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Bật Wi-Fi khi ở chế độ ngủ"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Bật Wi-Fi khi ở chế độ ngủ"</string>
@@ -607,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Dò"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Nâng cao"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Hiển thị ứng dụng"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Hiển thị độ mạnh WiFi"</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>
@@ -666,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Đăng nhập để kết nối?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> cần bạn đ.nhập trực tuyến trước khi KN với mạng."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"KẾT NỐI"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Mạng này không có quyền truy cập Internet. Vẫn sử dụng mạng này?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Không hỏi lại cho mạng này"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Kết nối"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Không thể kết nối với mạng"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Quên"</string>
@@ -732,21 +726,17 @@
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Điểm phát sóng Wi‑Fi di động <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="wifi_calling_settings_title" msgid="4102921303993404577">"Gọi qua Wi-Fi"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Tùy chọn cuộc gọi"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Chế độ gọi qua Wi-Fi"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Ưu tiên Wi-Fi"</item>
     <item msgid="5267397515594230396">"Ưu tiên mạng di động"</item>
-    <item msgid="3132912693346866895">"Chỉ Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Khi gọi qua Wi-Fi bật, điện thoại của bạn có thể định tuyến cuộc gọi qua mạng Wi-Fi hoặc mạng của nhà cung cấp dịch vụ, tùy thuộc vào tùy chọn của bạn và tín hiệu nào mạnh hơn. Trước khi bật tính năng này, hãy hỏi nhà cung cấp dịch vụ của bạn về phí và các chi tiết khác."</string>
     <string name="home_settings" msgid="212375129455718176">"Trang chủ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Hiển thị"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Âm thanh"</string>
@@ -918,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Khả dụng (chỉ đọc)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Tổng dung lượng"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Đang tính toán..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Ứng dụng (dữ liệu ứng dụng và nội dung đa phương tiện)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Ứng dụng và dữ liệu ứng dụng"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Phương tiện"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Nội dung tải xuống"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Ảnh, video"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Âm thanh (âm nhạc, nhạc chuông, podcast, v.v)."</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Khác"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Tệp khác"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Dữ liệu đã lưu trong bộ nhớ cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Ngắt kết nối bộ nhớ được chia sẻ"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Tháo thẻ SD"</string>
@@ -956,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Đang tháo thẻ"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Sắp hết dung lượng lưu trữ"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Một số chức năng hệ thống, chẳng hạn như đồng bộ hóa, có thể không hoạt động đúng. Hãy cố gắng giải phóng dung lượng bằng cách xóa hoặc bỏ ghim các mục, chẳng hạn như các ứng dụng hoặc nội dung đa phương tiện."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Đổi tên"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Gắn"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Đẩy ra"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Xóa và định dạng"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Xóa và định dạng thành bộ nhớ trong"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Kết nối máy tính USB"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Kết nối máy tính USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Kết nối dưới dạng"</string>
@@ -966,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Cho phép các ứng dụng hỗ trợ MIDI hoạt động qua USB bằng phần mềm MIDI trên máy tính của bạn."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Người dùng khác"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Bộ nhớ của thiết bị"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Bộ nhớ di động"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> miễn phí (tổng cộng <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> đã được gắn"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Không thể gắn <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> đã được đẩy ra an toàn"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Không thể đẩy <xliff:g id="NAME">%1$s</xliff:g> ra an toàn"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> đã được định dạng"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Không thể định dạng <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Đổi tên bộ nhớ"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Sau khi định dạng, bạn có thể sử dụng <xliff:g id="NAME_0">^1</xliff:g> này trong các thiết bị khác. \n\nTất cả dữ liệu trên <xliff:g id="NAME_1">^1</xliff:g> này sẽ bị xóa. Trước tiên, hãy cân nhắc việc sao lưu. \n\n"<b>"Sao lưu ảnh và các phương tiện khác"</b>" \nDi chuyển tệp phương tiện sang bộ nhớ khác trên thiết bị này hoặc chuyển chúng sang máy tính bằng cáp USB. \n\n"<b>"Sao lưu ứng dụng"</b>" \nTất cả ứng dụng được lưu trữ trên <xliff:g id="NAME_6">^1</xliff:g> này sẽ bị gỡ cài đặt và dữ liệu ứng dụng sẽ bị xóa. Để lưu giữ các ứng dụng này, hãy di chuyển chúng sang bộ nhớ khác trên thiết bị này."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Khi bạn tháo <xliff:g id="NAME_0">^1</xliff:g> này, các ứng dụng được lưu trữ trên đó sẽ ngừng hoạt động, đồng thời các tệp phương tiện được lưu trữ trên đó sẽ không khả dụng cho tới khi lắp lại."</b>" \n\n<xliff:g id="NAME_1">^1</xliff:g> này được định dạng để chỉ hoạt động trên thiết bị này. Nó sẽ không hoạt động trên bất kỳ thiết bị nào khác."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Thiết lập <xliff:g id="NAME">^1</xliff:g> của bạn"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Sử dụng làm bộ nhớ di động"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Để di chuyển ảnh và phương tiện khác giữa các thiết bị."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Sử dụng làm bộ nhớ trong"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Để chỉ lưu trữ nội dung trên thiết bị này, bao gồm cả ứng dụng và ảnh. Yêu cầu định dạng để ngăn bộ nhớ hoạt động với các thiết bị khác."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Định dạng làm bộ nhớ trong"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Việc này yêu cầu phải định dạng <xliff:g id="NAME_0">^1</xliff:g> để đảm bảo an toàn. \n\nSau khi định dạng, <xliff:g id="NAME_1">^1</xliff:g> này sẽ chỉ hoạt động trong thiết bị này. \n\n"<b>"Định dạng sẽ xóa tất cả dữ liệu hiện được lưu trữ trên <xliff:g id="NAME_2">^1</xliff:g>."</b>" Để tránh mất dữ liệu, hãy cân nhắc việc sao lưu."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Xóa và định dạng"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Đang định dạng <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Không tháo <xliff:g id="NAME">^1</xliff:g> khi đang định dạng."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Chuyển dữ liệu sang bộ nhớ mới"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Bạn có thể di chuyển ảnh, tệp và dữ liệu ứng dụng sang <xliff:g id="NAME">^1</xliff:g> mới này. \n\nQuá trình di chuyển mất khoảng <xliff:g id="TIME">^2</xliff:g> và sẽ giải phóng <xliff:g id="SIZE">^3</xliff:g> trên bộ nhớ trong. Một số ứng dụng sẽ không hoạt động khi đang di chuyển."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Di chuyển ngay bây giờ"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Di chuyển sau"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Di chuyển dữ liệu ngay bây giờ"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Quá trình di chuyển mất khoảng <xliff:g id="TIME">^1</xliff:g>. Di chuyển sẽ giải phóng <xliff:g id="SIZE">^2</xliff:g> bộ nhớ trong."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Di chuyển"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Đang di chuyển dữ liệu..."</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Trong khi di chuyển: \n• Không tháo <xliff:g id="NAME">^1</xliff:g>. \n• Một số ứng dụng sẽ không hoạt động chính xác. \n• Luôn sạc thiết bị."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> đã sẵn sàng"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> của bạn đã sẵn sàng để sử dụng với ảnh và các phương tiện khác."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> mới của bạn đang hoạt động. \n\nĐể di chuyển ảnh, tệp và dữ liệu ứng dụng sang thiết bị này, hãy vào Cài đặt &gt; Bộ nhớ."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Di chuyển <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Di chuyển <xliff:g id="APP">^1</xliff:g> và dữ liệu ứng dụng sang <xliff:g id="NAME_0">^2</xliff:g> sẽ chỉ mất vài phút. Bạn sẽ không thể sử dụng ứng dụng cho tới khi hoàn tất di chuyển. \n\nKhông tháo <xliff:g id="NAME_1">^2</xliff:g> trong khi di chuyển."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Đang di chuyển <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Không tháo <xliff:g id="NAME">^1</xliff:g> trong khi di chuyển. \n\nỨng dụng <xliff:g id="APP">^2</xliff:g> trên thiết bị này sẽ không khả dụng cho tới khi hoàn tất di chuyển."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Hủy di chuyển"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Tình trạng pin"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Mức pin"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1010,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Đặt lại về mặc định"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Đặt lại cài đặt APN mặc định đã hoàn tất."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Đã đặt lại cài đặt mạng"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Điều này sẽ đặt lại tất cả các cài đặt liên quan đến mạng về mặc định ban đầu, bao gồm:\n\n"<li>"Wifi"</li>\n<li>"Dữ liệu di động"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Điều này sẽ đặt lại tất cả cài đặt mạng, bao gồm:\n\n"<li>"Wi‑Fi"</li>\n<li>"Dữ liệu di động"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Đặt lại cài đặt"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Đặt lại tất cả cài đặt mạng? Bạn không thể hoàn nguyên tác vụ này!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Đặt lại tất cả cài đặt mạng? Bạn không thể hoàn tác thao tác này!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Đặt lại cài đặt"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Bạn cần phải vẽ hình mở khóa của mình để xác nhận đặt lại cài đặt mạng."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Đặt lại?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Đã đặt lại cài đặt mạng"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Cài đặt mạng đã được đặt lại"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Đặt lại thiết bị"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Đặt lại về dữ liệu gốc"</string>
     <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>
@@ -1032,9 +1065,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Xóa tất cả dữ liệu trên thẻ SD, chẳng hạn như nhạc hoặc ảnh"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Đặt lại máy tính bảng"</string>
     <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_desc" msgid="1062841478823409667">"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 tác thao tác này!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Xóa mọi thứ"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Khôi phục cài đặt gốc không khả dụng cho người dùng này"</string>
@@ -1051,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Thiết lập thư thoại, chuyển tiếp cuộc gọi, chờ cuộc gọi, Số gọi đến"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Dùng làm điểm truy cập Internet qua USB"</string>
@@ -1084,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Trợ giúp"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mạng di động"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Gói dịch vụ di động"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Ứng dụng SMS mặc định"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Ứng dụng SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Thay đổi ứng dụng SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Sử dụng <xliff:g id="NEW_APP">%1$s</xliff:g> thay vì <xliff:g id="CURRENT_APP">%2$s</xliff:g> làm ứng dụng SMS của bạn?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Sử dụng <xliff:g id="NEW_APP">%s</xliff:g> làm ứng dụng SMS của bạn?"</string>
@@ -1115,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Sử dụng GPS để xác định vị trí"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Đang quét"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Đang quét"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Quét Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Cải thiện thông tin vị trí bằng cách cho phép các ứng dụng và dịch vụ quét tìm mạng Wi‑Fi ngay cả khi Wi‑Fi tắt"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Quét Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Cải thiện thông tin vị trí bằng cách cho phép các dịch vụ hệ thống quét tìm thiết bị Bluetooth, ngay cả khi Bluetooth tắt"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Vị trí mạng di động và Wi‑Fi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Cho phép ứng dụng dùng DV vị trí của Google để ước đoán vị trí nhanh hơn. Dữ liệu vị trí ẩn danh sẽ được thu thập và gửi tới Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Vị trí được xác định bằng Wi‑Fi"</string>
@@ -1160,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Mật khẩu đã được đặt"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Mã PIN đã được đặt"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Hình đã được đặt"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Sử dụng hình thiết bị của bạn để tiếp tục."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Nhập mã PIN thiết bị của bạn để tiếp tục."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Nhập mật khẩu thiết bị của bạn để tiếp tục."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Mã PIN sai"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Mật khẩu sai"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Hình sai"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Bảo mật thiết bị"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Thay đổi hình mở khóa"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Thay đổi mã PIN mở khóa"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Xác nhận hình đã lưu"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Thử lại:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Vẽ hình mở khóa"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Nhấn vào Menu để được trợ giúp."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Thả ngón tay khi xong"</string>
@@ -1186,8 +1224,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Đặt hình mở khóa"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Thay đổi hình mở khóa"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Cách vẽ hình mở khóa"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Quá nhiều lần không chính xác!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Hãy thử lại sau <xliff:g id="NUMBER">%d</xliff:g> giây."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Quá nhiều lần thử sai. Hãy thử lại sau <xliff:g id="NUMBER">%d</xliff:g> giây."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Ứng dụng chưa được cài đặt trên điện thoại của bạn."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Quản lý ứng dụng"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Quản lý và xóa ứng dụng đã cài đặt"</string>
@@ -1238,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sắp xếp theo kích thước"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Hiển thị dịch vụ đg.chạy"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Hiển thị quá trình đã được lưu trong bộ nhớ cache"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Ứng dụng khẩn cấp"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Đặt lại tùy chọn ứng dụng"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Đặt lại tùy chọn ứng dụng?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Thao tác này sẽ đặt lại tất cả tùy chọn cho:\n\n "<li>"Ứng dụng bị tắt"</li>\n" "<li>"Thông báo ứng dụng bị tắt"</li>\n" "<li>"Ứng dụng mặc định cho các tác vụ"</li>\n" "<li>"Giới hạn dữ liệu nền cho ứng dụng"</li>\n" "<li>"Bất kỳ giới hạn về quyền nào"</li>\n\n" Bạn sẽ không mất bất kỳ dữ liệu ứng dụng nào."</string>
@@ -1443,8 +1479,6 @@
     <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="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="select_logd_size_title" msgid="7433137108348553508">"Kích cỡ tải trình ghi"</string>
@@ -1745,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 giờ"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 ngày"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Hiển thị hệ thống"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Ẩn hệ thống"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Sử dụng Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Kiểu trạng thái"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Nền"</string>
@@ -1841,7 +1876,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Mật khẩu hiện tại:"</string>
@@ -2216,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Người dùng"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Tiểu sử bị hạn chế"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Thêm người dùng mới?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Bạn có thể chia sẻ thiết bị này với người khác bằng cách tạo thêm người dùng. Mỗi người dùng có không gian riêng của mình. Họ có thể tùy chỉnh không gian đó với ứng dụng, hình nền riêng của mình, v.v.. Người dùng cũng có thể điều chỉnh các cài đặt thiết bị có ảnh hưởng đến tất cả mọi người, chẳng hạn như Wi‑Fi.\n\nKhi bạn thêm người dùng mới, người dùng đó cần thiết lập không gian của mình.\n\nMọi người dùng đều có thể cập nhật ứng dụng cho tất cả người dùng khác."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Bạn có thể chia sẻ thiết bị này với người khác bằng cách tạo thêm người dùng. Mỗi người dùng có không gian riêng của mình. Họ có thể tùy chỉnh không gian đó với ứng dụng, hình nền... riêng của mình. Người dùng cũng có thể điều chỉnh các cài đặt thiết bị có ảnh hưởng đến tất cả mọi người, chẳng hạn như Wi‑Fi.\n\nKhi bạn thêm người dùng mới, người dùng đó cần thiết lập không gian của họ.\n\nMọi người dùng đều có thể cập nhật ứng dụng cho tất cả người dùng khác."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Khi bạn thêm người dùng mới, người dùng đó cần thiết lập không gian của mình.\n\nMọi người dùng đều có thể cập nhật ứng dụng cho tất cả người dùng khác."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Thiết lập người dùng ngay bây giờ?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Đảm bảo người đó có mặt để sử dụng thiết bị và thiết lập không gian của mình"</string>
@@ -2396,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"hạn chế hạn chế bị hạn chế"</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_reset_apps" msgid="6420313678620788457">"đặt lại tùy chọn về mặc định"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"mặc định ứng dụng trong trường hợp khẩn cấp"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"hệ thống ứng dụng tải xuống ứng dụng"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"bảo mật giấy phép ứng dụng"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"ứng dụng mặc định"</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>
@@ -2414,14 +2448,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Âm lượng báo thức"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Âm lượng chuông"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Âm lượng thông báo"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Chặn gián đoạn"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Chỉ cho phép ưu tiên"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Quy tắc tự động"</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_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_alarms" msgid="7380265858042606857">"Chỉ cho phép báo thức"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Không cho phép gián đoạn"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Chỉ ưu tiên"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Chỉ báo thức"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Không có gián đoạn nào"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Nhạc chuông điện thoại"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Nhạc chuông thông báo mặc định"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Đồng thời rung khi có cuộc gọi"</string>
@@ -2454,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Không có trình xử lý thông báo nào được cài đặt."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Bật <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> có thể đọc tất cả thông báo được đăng bởi hệ thống hoặc bất kỳ ứng dụng đã cài đặt nào. Thông báo đó có thể bao gồm thông tin cá nhân như tên liên hệ và văn bản thông báo được gửi tới bạn. Trình xử lý cũng sẽ có thể loại bỏ những thông báo này hoặc chạm vào nút tác vụ trong các thông báo đó."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Trình cung cấp điều kiện"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Không có ứng dụng nào cung cấp điều kiện"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d ứng dụng cung cấp điều kiện</item>
-      <item quantity="one">%d ứng dụng cung cấp điều kiện</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Không có trình cung cấp điều kiện nào được cài đặt."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Bật <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> có thể thêm điều kiện thoát vào chế độ Không làm phiền."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Đang tải ứng dụng..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Chặn tất cả"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Không bao giờ hiển thị thông báo từ ứng dụng này"</string>
@@ -2476,17 +2499,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Mức độ ưu tiên"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Nhạy cảm"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Tên quy tắc"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Thêm quy tắc"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Xóa quy tắc"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Xóa quy tắc \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Xóa"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Loại quy tắc"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Không xác định"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Quy tắc định cấu hình"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Quy tắc lên lịch"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Không tìm thấy quy tắc."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Ngày"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Không có"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Hàng ngày"</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="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> đến <xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2496,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Báo thức"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Lời nhắc"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Sự kiện"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Người gọi được chọn"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Lặp lại người gọi"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Nếu cùng một người gọi hai lần trong vòng <xliff:g id="MINUTES">%d</xliff:g> phút, hãy cho phép chế độ này"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Tự động bật"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Không bao giờ"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Hàng đêm"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ngày tiếp theo"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Bạn muốn bị gián đoạn lúc nào?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Trong bao lâu?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Không xác định"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> phút</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> phút</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> giờ</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> giờ</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Đổi sang chỉ các thông báo ưu tiên không xác định"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Đổi sang chỉ các thông báo ưu tiên trong <xliff:g id="DURATION">%1$d</xliff:g> phút cho đến <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Đổi sang chỉ các thông báo ưu tiên trong một phút cho đến <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Đổi sang chỉ các thông báo ưu tiên trong <xliff:g id="DURATION">%1$d</xliff:g> giờ (cho đến <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Đổi sang chỉ các thông báo ưu tiên trong một giờ cho đến <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Đổi sang chỉ báo thức không giới hạn"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Đổi sang chỉ báo thức trong <xliff:g id="DURATION">%1$d</xliff:g> phút (cho đến <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Đổi sang chỉ báo thức trong một phút cho đến <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Đổi sang chỉ báo thức trong <xliff:g id="DURATION">%1$d</xliff:g> giờ cho đến <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Đổi sang chỉ báo thức trong một giờ cho đến <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Đổi sang không làm gián đoạn không xác định"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Đổi sang không làm gián đoạn trong <xliff:g id="DURATION">%1$d</xliff:g> phút (cho đến <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Đổi sang không làm gián đoạn trong một phút cho đến <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Đổi sang không làm gián đoạn trong <xliff:g id="DURATION">%1$d</xliff:g> giờ cho đến <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Đổi sang không làm gián đoạn trong một giờ cho đến <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Đổi sang luôn làm gián đoạn"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"vĩnh viễn"</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>
@@ -2551,7 +2641,7 @@
     <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Mở URL miền"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Cho phép ứng dụng mở trực tiếp URL miền"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"URL miền được hỗ trợ"</string>
-    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Mặc định khác"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Cài đặt mặc định khác"</string>
     <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> đã được sử dụng trong <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="410824961149037234">"bộ nhớ trong"</string>
     <string name="storage_type_external" msgid="8928374515368986503">"bộ nhớ ngoài"</string>
@@ -2569,7 +2659,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> quyền được cấp</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> quyền được cấp</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other">Đã cấp <xliff:g id="COUNT_2">%d</xliff:g> trong <xliff:g id="COUNT_3">%d</xliff:g> quyền</item>
+      <item quantity="one">Đã cấp <xliff:g id="COUNT_0">%d</xliff:g> trong số <xliff:g id="COUNT_1">%d</xliff:g> quyền</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Đã đặt một số mặc định"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Chưa đặt mặc định"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Tất cả ứng dụng"</string>
@@ -2580,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Mức độ ưu tiên"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Nhạy cảm"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Có URL miền"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Đặt lại tùy chọn trên tất cả các ứng dụng về mặc định"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"Đã cài đặt <xliff:g id="COUNT">%d</xliff:g> ứng dụng, bao gồm các ứng dụng đã tải xuống và ứng dụng hệ thống"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Bị tắt bởi quản trị viên"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Nâng cao"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Ứng dụng không xác định"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Chọn hồ sơ"</string>
@@ -2596,4 +2688,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ứng dụng có thể mở URL miền của mình</item>
       <item quantity="one">Một ứng dụng có thể mở URL miền của mình</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Không nhận dạng được"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Ứng dụng mặc định"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Ứng dụng trình duyệt"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Không có trình duyệt mặc định"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Mặc định)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index faa338e..9d68298 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"按钮"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"媒体"</item>
     <item msgid="7924928667052300589">"设备"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"粗略位置"</item>
+    <item msgid="5789673140227507995">"精准位置"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"振动"</item>
+    <item msgid="3434165993711230924">"读取联系人"</item>
+    <item msgid="616161687718081936">"修改联系人"</item>
+    <item msgid="7638002295329050091">"读取通话记录"</item>
+    <item msgid="6546959730920410907">"修改通话记录"</item>
+    <item msgid="446877710771379667">"读取日历"</item>
+    <item msgid="7674458294386319722">"修改日历"</item>
+    <item msgid="8281201165558093009">"WLAN扫描"</item>
+    <item msgid="8694611243479480497">"通知"</item>
+    <item msgid="7776439107987345446">"手机网络扫描"</item>
+    <item msgid="514615766544675057">"拨打电话"</item>
+    <item msgid="8181415497109310680">"读取短信"</item>
+    <item msgid="6816551144382117307">"编写短信"</item>
+    <item msgid="4600463921908905030">"接收短信"</item>
+    <item msgid="5958926493289432745">"接收紧急短信"</item>
+    <item msgid="4945269495221089540">"接收彩信"</item>
+    <item msgid="5570472453573929087">"接收 WAP PUSH 消息"</item>
+    <item msgid="7125408150230860501">"发送短信"</item>
+    <item msgid="7080337936612188061">"读取 ICC 短信"</item>
+    <item msgid="587124103118495063">"写入 ICC 短信"</item>
+    <item msgid="2320577158869025503">"修改设置"</item>
+    <item msgid="1545733463471924009">"在顶部绘制"</item>
+    <item msgid="3609046903962454582">"访问通知"</item>
+    <item msgid="4671646036128214513">"相机"</item>
+    <item msgid="1097324338692486211">"录制音频"</item>
+    <item msgid="5031552983987798163">"播放音频"</item>
+    <item msgid="8374996688066472414">"读取剪贴板内容"</item>
+    <item msgid="3045529469061083747">"修改剪贴板内容"</item>
+    <item msgid="5124443975763747838">"媒体按钮"</item>
+    <item msgid="4547883971364273343">"音频焦点"</item>
+    <item msgid="2603878814882344450">"主音量"</item>
+    <item msgid="7136963238377062018">"语音音量"</item>
+    <item msgid="4270236897655923007">"铃声音量"</item>
+    <item msgid="6325739889222559394">"媒体音量"</item>
+    <item msgid="5762123934816216821">"闹钟音量"</item>
+    <item msgid="785049718065337473">"通知音量"</item>
+    <item msgid="6700305533746877052">"蓝牙音量"</item>
+    <item msgid="2029227495214047094">"保持唤醒状态"</item>
+    <item msgid="26109888160231211">"监测位置"</item>
+    <item msgid="5753382310468855812">"监控高电耗位置信息服务"</item>
+    <item msgid="3356591542543137332">"获取使用情况统计信息"</item>
+    <item msgid="3073734345226842233">"将麦克风静音或取消静音"</item>
+    <item msgid="1148142988678569310">"投影媒体"</item>
+    <item msgid="9130014005474445273">"激活VPN"</item>
+    <item msgid="1165192162975045562">"写入壁纸"</item>
+    <item msgid="7129487923652967258">"辅助结构"</item>
+    <item msgid="1069023208100114540">"辅助屏幕截图"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"位置"</item>
+    <item msgid="8677040780775113033">"位置"</item>
+    <item msgid="1660743989948992916">"位置"</item>
+    <item msgid="8791172739860195290">"振动"</item>
+    <item msgid="383413555642128046">"读取联系人"</item>
+    <item msgid="3654594895269697313">"修改联系人"</item>
+    <item msgid="7928393476362362538">"读取通话记录"</item>
+    <item msgid="6248591205254641116">"修改通话记录"</item>
+    <item msgid="6093344633066170692">"读取日历"</item>
+    <item msgid="1334886368750347692">"修改日历"</item>
+    <item msgid="1638204101698708656">"位置"</item>
+    <item msgid="2154671955760380322">"发布通知"</item>
+    <item msgid="4282477730595931828">"位置"</item>
+    <item msgid="4891423912898525905">"拨打电话"</item>
+    <item msgid="2623604824935968113">"读取短信/彩信"</item>
+    <item msgid="4420177125221176306">"编写短信/彩信"</item>
+    <item msgid="3986142739951490025">"接收短信/彩信"</item>
+    <item msgid="3984213795861739778">"接收短信/彩信"</item>
+    <item msgid="3656243523752472788">"接收短信/彩信"</item>
+    <item msgid="8105802370238551510">"接收短信/彩信"</item>
+    <item msgid="1407766984645388488">"发送短信/彩信"</item>
+    <item msgid="3527273606643794973">"读取短信/彩信"</item>
+    <item msgid="4370895547001583812">"编写短信/彩信"</item>
+    <item msgid="4218544235221631789">"修改设置"</item>
+    <item msgid="736541391767350377">"在顶部绘制"</item>
+    <item msgid="5530815681721654194">"访问通知"</item>
+    <item msgid="781213371706962767">"相机"</item>
+    <item msgid="1720492593061838172">"录制音频"</item>
+    <item msgid="3493046322001257041">"播放音频"</item>
+    <item msgid="136815868796597058">"读取剪贴板内容"</item>
+    <item msgid="5238692940326972503">"修改剪贴板内容"</item>
+    <item msgid="5753789168376302997">"媒体按钮"</item>
+    <item msgid="3265262911688671938">"音频焦点"</item>
+    <item msgid="2098976479485046797">"主音量"</item>
+    <item msgid="5660213838861789350">"语音音量"</item>
+    <item msgid="7983336752371254444">"铃声音量"</item>
+    <item msgid="7878027809189330917">"媒体音量"</item>
+    <item msgid="7260546305036218513">"闹钟音量"</item>
+    <item msgid="9103719301075748925">"通知音量"</item>
+    <item msgid="7025966722295861512">"蓝牙音量"</item>
+    <item msgid="4665183401128289653">"保持唤醒状态"</item>
+    <item msgid="8584357129746649222">"位置"</item>
+    <item msgid="7669257279311110599">"位置信息"</item>
+    <item msgid="3459320345690097795">"获取使用情况统计信息"</item>
+    <item msgid="1312534577834048535">"将麦克风静音或取消静音"</item>
+    <item msgid="5906017727368097853">"投影媒体"</item>
+    <item msgid="2486614710846178542">"激活VPN"</item>
+    <item msgid="5586547561693629602">"写入壁纸"</item>
+    <item msgid="32794179825485062">"辅助结构"</item>
+    <item msgid="7872852746938272552">"辅助屏幕截图"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短"</item>
     <item msgid="2560532955514699713">"中"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"低"</item>
     <item msgid="4212263919458209842">"严重不足"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"关闭"</item>
-    <item msgid="5656544177755411222">"有限打扰"</item>
-    <item msgid="8735337502532332056">"零打扰"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"正常"</item>
     <item msgid="866544120205026771">"中等"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index d3811ad..728f198 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD卡"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"代理设置"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"是"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"否"</string>
-    <string name="forget" msgid="7267115980248732932">"取消保存"</string>
+    <string name="forget" msgid="1400428660472591263">"取消保存"</string>
+    <string name="save" msgid="879993180139353333">"保存"</string>
+    <string name="done" msgid="6942539184162713160">"完成"</string>
     <string name="settings_label" msgid="1626402585530130914">"设置"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"设置"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"设置快捷方式"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"请插上充电器，然后重试。"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"没有锁屏PIN码或密码"</string>
     <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">"加密操作无法撤消，如果您中断该过程，则会丢失数据。加密过程需要1小时或更长时间，在此期间，平板电脑会重新启动数次。"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"加密操作无法撤消，如果您中断该过程，则会丢失数据。加密过程需要1小时或更长时间，在此期间，手机会重新启动数次。"</string>
@@ -419,8 +416,7 @@
     <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>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"设置了屏幕锁定后，您还可以在“设置”&gt;“安全”中设置指纹。"</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>
@@ -522,8 +518,7 @@
     <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>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"为了提高位置信息的精确度，应用和服务会扫描蓝牙设备（即使蓝牙功能已关闭）。您可以在<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>扫描设置<xliff:g id="LINK_END_1">LINK_END</xliff:g>中更改此设置。"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"连接到..."</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>
@@ -589,8 +584,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"为了提高位置信息的精确度，应用和服务会扫描 WLAN 网络（即使 WLAN 已关闭）。您可以在<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>扫描设置<xliff:g id="LINK_END_1">LINK_END</xliff:g>中更改此设置。"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"不再显示"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"在休眠状态下保持WLAN网络连接"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"在休眠状态下保持WLAN连接"</string>
@@ -607,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"WLAN直连"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"扫描"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"高级"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"显示应用"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"显示WLAN网络信号强度"</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>
@@ -666,6 +658,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"连接"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"使用此网络将无法访问互联网。仍要使用此网络吗？"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"对于此网络不再询问"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"连接"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"无法连接网络"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"取消保存"</string>
@@ -732,21 +726,17 @@
     <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>便携式WLAN热点"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android热点"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"WLAN 通话"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"通话偏好设置"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"WLAN 通话模式"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"首选 WLAN"</item>
     <item msgid="5267397515594230396">"首选移动网络"</item>
-    <item msgid="3132912693346866895">"仅限 WLAN"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"开启“WLAN 通话”功能后，您的手机可根据您的偏好设置，通过 WLAN 网络或您的运营商网络通话（具体取决于哪个网络信号较强）。开启此功能之前，请先向您的运营商咨询收费情况及其他详情。"</string>
     <string name="home_settings" msgid="212375129455718176">"主屏幕"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"显示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"声音"</string>
@@ -918,12 +908,12 @@
     <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="5128673488173839077">"应用和应用数据"</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_media_misc_usage" msgid="235452944021647124">"其他"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"其他文件"</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>
@@ -956,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"正在卸载"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"存储空间不足"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"某些系统功能（如同步）可能无法正常使用。请尝试删除或取消在本地保存某些内容（如应用数据或媒体内容），以便释放存储空间。"</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"重命名"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"装载"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"弹出"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"清空并格式化"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"清空并格式化内部存储设备"</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>
@@ -966,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"让支持 MIDI 的应用通过 USB 与您计算机上的 MIDI 软件搭配使用。"</string>
     <string name="storage_other_users" msgid="808708845102611856">"其他用户"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"内部存储设备"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"移动存储设备"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> 可用空间（共 <xliff:g id="TOTAL">%2$s</xliff:g>）"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g>已装载"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"无法装载<xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g>已安全弹出"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"无法安全弹出<xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"已将<xliff:g id="NAME">%1$s</xliff:g>格式化"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"无法格式化<xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"重命名存储设备"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"格式化之后，您就可以在其他设备上使用此<xliff:g id="NAME_0">^1</xliff:g>了。\n\n此<xliff:g id="NAME_1">^1</xliff:g>上的所有数据都将被清空，建议您先将数据备份。\n\n"<b>"备份照片和其他媒体文件"</b>\n"将您的媒体文件移动到此设备上的备用存储设备，或使用 USB 线传输到计算机上。\n\n"<b>"备份应用"</b>\n"存储在此<xliff:g id="NAME_6">^1</xliff:g>上的所有应用都将被卸载，且这些应用的数据也将一并被清空。要保留这些应用，请将它们移到此设备上的备用存储设备。"</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"当您弹出此<xliff:g id="NAME_0">^1</xliff:g>后，存储在其中的应用将会停止运行，而且存储在其中的媒体文件也将无法使用，除非您重新插入。"</b>\n\n"此<xliff:g id="NAME_1">^1</xliff:g>已格式化为只能在这台设备上使用，因此在任何其他设备上将无法使用。"</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"设置您的<xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"用作便携式存储设备"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"用于在设备之间移动照片和其他媒体文件。"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"用作内部存储设备"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"仅用于存储这台设备上的内容，包括应用和照片。为了防止此存储设备在其他设备上使用，您需要先对其进行格式化。"</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"格式化为内部存储设备"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"<xliff:g id="NAME_0">^1</xliff:g>必须进行格式化，以确保安全。\n\n格式化之后，此<xliff:g id="NAME_1">^1</xliff:g>将只能在这台设备上使用。\n\n"<b>"格式化操作会清空当前存储在<xliff:g id="NAME_2">^1</xliff:g>上的所有数据。"</b>"为避免丢失数据，建议您先将数据备份。"</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"清空并格式化"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"正在格式化<xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"请勿在格式化过程中移除该<xliff:g id="NAME">^1</xliff:g>。"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"将数据移动到新的存储设备"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"您可以将自己的照片、文件和应用数据移动到这个新<xliff:g id="NAME">^1</xliff:g>上。\n\n该移动操作需要花费大约 <xliff:g id="TIME">^2</xliff:g>，完成后将腾出 <xliff:g id="SIZE">^3</xliff:g> 的内部存储空间。在移动过程中，某些应用将无法正常运行。"</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"立即移动"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"稍后移动"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"立即移动数据"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"该移动操作需要花费大约 <xliff:g id="TIME">^1</xliff:g>，完成后将腾出 <xliff:g id="SIZE">^2</xliff:g> 的内部存储空间。"</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"移动"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"正在移动数据…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"在移动数据的过程中：\n• 请勿移除相应的<xliff:g id="NAME">^1</xliff:g>。\n• 某些应用将无法正常运行。\n• 需确保设备电量充足。"</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g>可以使用了"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"您的<xliff:g id="NAME">^1</xliff:g>已设置完毕，可用于存储照片和其他媒体文件了。"</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"新的<xliff:g id="NAME">^1</xliff:g>可以使用了。\n\n要将照片、文件和应用数据移动到此设备，请转到“设置”&gt;“存储”。"</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"移动<xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"将<xliff:g id="APP">^1</xliff:g>及其相关数据移动到<xliff:g id="NAME_0">^2</xliff:g>仅需几分钟时间。在移动操作完成前，您将无法使用该应用。\n\n请勿在移动过程中移除该<xliff:g id="NAME_1">^2</xliff:g>。"</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"正在移动<xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"请勿在移动过程中移除该<xliff:g id="NAME">^1</xliff:g>。\n\n在移动操作完成前，您将无法使用此设备上的<xliff:g id="APP">^2</xliff:g>应用。"</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"取消移动"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"电池状态"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"电池电量"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1010,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"重置为默认设置"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"已重置默认APN设置。"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"重置网络设置"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"此操作会将与网络相关的所有设置重置为出厂默认设置，包括：\n\n"<li>"WLAN"</li>\n<li>"移动数据网络"</li>\n<li>"蓝牙"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"此操作会重置所有网络设置，包括：\n\n"<li>"WLAN"</li>\n<li>"移动数据网络"</li>\n<li>"蓝牙"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"重置设置"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"要重置所有网络设置吗？重置后将无法撤消！"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"要重置所有网络设置吗？此操作无法撤消！"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"重置设置"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"您需要绘制解锁图案以确认要重置网络设置。"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"要重置网络设置吗？"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"网络设置已重置"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"网络设置已重置"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"恢复设备出厂设置"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"恢复出厂设置"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"此操作会清除您平板电脑"<b>"内部存储设备"</b>"中的所有数据，包括：\n\n"<li>"您的Google帐户"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"下载的应用"</li></string>
@@ -1032,9 +1065,8 @@
     <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="1062841478823409667">"要清空您的所有个人信息和下载的应用吗？此操作无法撤消！"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"清除全部内容"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"此用户无权恢复出厂设置"</string>
@@ -1051,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"设置语音信箱、来电转接、来电等待和本机号码显示"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB网络共享"</string>
@@ -1084,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"帮助"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"移动网络"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"手机套餐"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"默认短信应用"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"短信应用"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"要更改短信应用吗？"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"要使用“<xliff:g id="NEW_APP">%1$s</xliff:g>”取代“<xliff:g id="CURRENT_APP">%2$s</xliff:g>”作为您的短信应用吗？"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"要使用“<xliff:g id="NEW_APP">%s</xliff:g>”作为您的短信应用吗？"</string>
@@ -1115,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"使用 GPS 确定位置"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"扫描"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"扫描"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"WLAN 扫描"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"允许应用和服务扫描 WLAN 网络（即使 WLAN 已关闭），以便提高位置信息的精确度"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"蓝牙扫描"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"允许系统服务扫描蓝牙设备（即使蓝牙功能已关闭），以便提高位置信息的精确度"</string>
     <string name="location_network_based" msgid="6010456018401296590">"WLAN和移动网络位置信息"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"允许应用使用Google位置信息服务更快地大致了解您所在的位置。系统将收集匿名位置数据并将其发送给Google。"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"通过WLAN确定位置"</string>
@@ -1160,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"密码已设置"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"已设置PIN码"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"图案已设置"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"请绘制您的设备解锁图案，然后再继续。"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"请输入您的设备 PIN 码，然后再继续。"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"请输入您的设备密码，然后再继续。"</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN 码错误"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"密码错误"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"图案错误"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"设备安全性"</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_wrong" msgid="4694973540770105678">"请重试："</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"绘制解锁图案"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"按 MENU 获得帮助。"</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"完成后松开手指"</string>
@@ -1186,8 +1224,7 @@
     <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" msgid="6909161623701848863">"尝试解锁失败次数过多。请在 <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>
@@ -1238,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"按大小排序"</string>
     <string name="show_running_services" msgid="5736278767975544570">"显示当前运行的服务"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"显示缓存进程"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"紧急警报应用"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"重置应用偏好设置"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"要重置应用偏好设置吗？"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"这将重置以下所有偏好设置：\n\n "<li>"停用的应用"</li>\n" "<li>"停用的应用通知"</li>\n" "<li>"执行操作的默认应用"</li>\n" "<li>"应用的后台流量限制"</li>\n" "<li>"权限限制"</li>\n\n" 您将不会丢失任何应用数据。"</string>
@@ -1443,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"捕获单个文件中的所有蓝牙 HCI 包"</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="select_logd_size_title" msgid="7433137108348553508">"日志记录器缓冲区大小"</string>
@@ -1745,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12小时"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1天"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"显示系统"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"隐藏系统进程"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"使用 USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"统计信息类型"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"后台"</string>
@@ -1841,7 +1876,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_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>
@@ -2216,7 +2250,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"用户"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"受限个人资料"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"要添加新用户吗？"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"创建新用户之后，您将可以与其他人共享此设备。每位用户都会有自己的空间，其中可用来存储用户自己的应用、壁纸等内容。每位用户都可以调整WLAN等会影响到其他用户的设备设置。\n\n您添加新用户后，该用户必须设置自己的空间。\n\n任何用户均可为其他所有用户更新应用。"</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"创建新用户之后，您将可以与其他人共享此设备。每位用户都会有自己的空间，可用来存储用户自己的应用、壁纸等内容。每位用户都可以调整 WLAN 等会影响到其他用户的设备设置。\n\n您添加新用户后，该用户需要设置自己的空间。\n\n任何用户均可为其他所有用户更新应用。"</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"您添加新用户后，该用户必须设置自己的空间。\n\n任何用户均可为其他所有用户更新应用。"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"要现在设置该用户吗？"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"请让相应用户操作设备并设置他们自己的空间。"</string>
@@ -2396,10 +2430,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"限制 受限"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"文字 文本 更正 声音 提示音 振动 自动 语言 手势 推荐 建议 主题 主题背景 令人反感的字词 输入 表情符号 国际 打字"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"重置 偏好设置 默认"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"紧急 在紧急情况下使用 应用 默认"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"应用 下载 应用程序 系统"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"应用 权限 安全"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"应用 默认"</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>
@@ -2414,14 +2448,12 @@
     <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="6948120138640252732">"屏蔽打扰内容"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"仅允许优先打扰内容"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"自动规则"</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_alarms" msgid="7380265858042606857">"仅允许闹钟"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"禁止打扰"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"仅限优先打扰"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"仅限闹钟"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"勿扰"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>：<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"手机铃声"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"默认通知铃声"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"有来电时响铃并振动"</string>
@@ -2454,15 +2486,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"未安装任何通知侦听器。"</string>
     <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">"没有任何应用可提供条件"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d 个应用可提供条件</item>
-      <item quantity="one">%d 个应用可提供条件</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="loading_notification_apps" msgid="5031818677010335895">"正在加载应用…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"全部阻止"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"一律不显示来自此应用的通知"</string>
@@ -2476,17 +2499,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"规则名称"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"添加规则"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"删除规则"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"要删除“<xliff:g id="RULE">%1$s</xliff:g>”规则吗？"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"删除"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"规则类型"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"未知"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"配置规则"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"时间安排规则"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"找不到规则。"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"星期几"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"无"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"每天"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">"， "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"一律不"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>到<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"通话"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"消息"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"来电者/消息发送者"</string>
@@ -2496,15 +2525,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"闹钟"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"提醒"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"活动"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"所选的来电者"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"重复来电者"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"如果同一个人在 <xliff:g id="MINUTES">%d</xliff:g> 分钟内第二次来电，则允许显示通知"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"次日 <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"您允许设备在哪些情况下显示通知？"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"持续多久？"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"无限期"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 分钟</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 分钟</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 小时</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 小时</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"更改为无限期仅限优先通知"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">更改为仅限优先通知，持续 <xliff:g id="DURATION">%1$d</xliff:g> 分钟（到<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>）</item>
+      <item quantity="one">更改为仅限优先通知，持续 1 分钟（到<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>）</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">更改为仅限优先通知，持续 <xliff:g id="DURATION">%1$d</xliff:g> 小时（到<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>）</item>
+      <item quantity="one">更改为仅限优先通知，持续 1 小时（到<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>）</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"更改为无限期仅限闹钟"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">更改为仅限闹钟，持续 <xliff:g id="DURATION">%1$d</xliff:g> 分钟（到<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>）</item>
+      <item quantity="one">更改为仅限闹钟，持续 1 分钟（到<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>）</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">更改为仅限闹钟，持续 <xliff:g id="DURATION">%1$d</xliff:g> 小时（到<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>）</item>
+      <item quantity="one">更改为仅限闹钟，持续 1 小时（到<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>）</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"更改为无限期禁止打扰"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">更改为禁止打扰，持续 <xliff:g id="DURATION">%1$d</xliff:g> 分钟（到<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>）</item>
+      <item quantity="one">更改为禁止打扰，持续 1 分钟（到<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>）</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">更改为禁止打扰，持续 <xliff:g id="DURATION">%1$d</xliff:g> 小时（到<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>）</item>
+      <item quantity="one">更改为禁止打扰，持续 1 小时（到<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>）</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"更改为一律允许打扰"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"不限时间"</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>
@@ -2569,7 +2659,10 @@
       <item quantity="other">已授予 <xliff:g id="COUNT_1">%d</xliff:g> 项权限</item>
       <item quantity="one">已授予 <xliff:g id="COUNT_0">%d</xliff:g> 项权限</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other">已授予 <xliff:g id="COUNT_2">%d</xliff:g> 项权限（共 <xliff:g id="COUNT_3">%d</xliff:g> 项）</item>
+      <item quantity="one">已授予 <xliff:g id="COUNT_0">%d</xliff:g> 项权限（共 <xliff:g id="COUNT_1">%d</xliff:g> 项）</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"已设置部分默认选项"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"未设置任何默认选项"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"所有应用"</string>
@@ -2580,8 +2673,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"优先"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"含敏感信息"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"包含网域网址"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"将所有应用的偏好设置重置为默认设置"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"已安装 <xliff:g id="COUNT">%d</xliff:g> 个应用（包括系统和下载的应用）"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"已被管理员停用"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"高级"</string>
     <string name="unknown_app" msgid="5275921288718717656">"未知应用"</string>
     <string name="choose_profile" msgid="8229363046053568878">"选择个人资料"</string>
@@ -2596,4 +2688,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> 个应用可以打开其网域网址</item>
       <item quantity="one">1 个应用可以打开其网域网址</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"无法识别"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"默认应用"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"浏览器应用"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"没有默认浏览器"</string>
+    <string name="default_app" msgid="6864503001385843060">"（默认）"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index 66cdade..52602b8 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM 卡"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"按鈕"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"低"</item>
     <item msgid="4212263919458209842">"嚴重不足"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"關閉"</item>
-    <item msgid="5656544177755411222">"有限度干擾"</item>
-    <item msgid="8735337502532332056">"零干擾"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"正常"</item>
     <item msgid="866544120205026771">"中"</item>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index b5e4f32..e257646 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD 卡"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"代理設定"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"是"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"否"</string>
-    <string name="forget" msgid="7267115980248732932">"刪除"</string>
+    <string name="forget" msgid="1400428660472591263">"刪除"</string>
+    <string name="save" msgid="879993180139353333">"儲存"</string>
+    <string name="done" msgid="6942539184162713160">"完成"</string>
     <string name="settings_label" msgid="1626402585530130914">"設定"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"設定"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"設定捷徑"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"請插上充電器，然後再試一次。"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"沒有鎖定螢幕的 PIN 或密碼"</string>
     <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">"您無法取消加密操作，如果過程中斷，將會失去資料。加密程序需時 1 個小時或以上，您的平板電腦會在過程中重新啟動數次。"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"您無法取消加密操作，如果過程中斷，將會失去資料。加密程序需時 1 個小時或以上，您的手機會在過程中重新啟動數次。"</string>
@@ -419,7 +416,7 @@
     <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_setup_wizard_fingerprint_details" msgid="7579210814842056547">"您設定螢幕鎖定之後，還可以前往 [設定] &gt; [安全性] 設定您的指紋。"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"設定螢幕鎖定後，您還可以前往 [設定] &gt; [安全性] 設定您的指紋。"</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>
@@ -521,7 +518,7 @@
     <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="ble_scan_notify_text" msgid="9019985398053764737">"為了提高位置精確度，即使藍牙已關閉，Google 服務仍會掃瞄藍牙裝置。您可以前往 LINK_BEGIN[掃瞄設定]LINK_END 更改設定。"</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"為了提高位置精確度，即使藍牙已關閉，應用程式和服務仍會掃瞄藍牙裝置。您可以前往 <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>[掃瞄設定]<xliff:g id="LINK_END_1">LINK_END</xliff:g> 更改設定。"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"連線至..."</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>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"為了提高位置精確度，即使 Wi-Fi 已關閉，Google 服務仍會掃瞄 Wi-Fi 網絡。您可以前往 LINK_BEGIN[掃瞄設定]LINK_END 更改設定。"</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"為了提高位置精確度，即使 Wi-Fi 已關閉，應用程式和服務仍會掃瞄 Wi-Fi 網絡。您可以前往 <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>[掃瞄設定]<xliff:g id="LINK_END_1">LINK_END</xliff:g> 更改設定。"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"不用再顯示"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"休眠時繼續連接 Wi-Fi 網絡"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"休眠狀態仍保持 Wi-Fi 連線"</string>
@@ -604,8 +601,6 @@
     <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_apps" msgid="6003687912727859577">"顯示應用程式"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"顯示 WiFi 強度"</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>
@@ -663,6 +658,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"連線"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"此網絡並未連接互聯網，您仍要使用嗎？"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"不要再詢問我是否使用此網絡"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"連線"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"無法連接網絡"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"刪除"</string>
@@ -734,14 +731,12 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"首選 Wi-Fi"</item>
     <item msgid="5267397515594230396">"首選流動數據"</item>
-    <item msgid="3132912693346866895">"只限 Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"當開啟 Wi-Fi 通話時，您的手機可根據偏好設定及訊號強弱，使用 Wi-Fi 網絡或流動網絡供應商的網絡進行來電轉接。開啟此功能前，請向您的流動網絡供應商查詢收費及其他詳情。"</string>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"當開啟 Wi-Fi 通話時，您的手機可根據偏好設定及訊號強弱，選擇使用 Wi-Fi 網絡或流動網絡供應商的網絡安排來電轉接。開啟此功能前，請向您的流動網絡供應商查詢收費及其他詳情。"</string>
     <string name="home_settings" msgid="212375129455718176">"主畫面"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音效"</string>
@@ -913,12 +908,12 @@
     <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="5128673488173839077">"應用程式和應用程式數據"</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">"音頻 (音樂、鈴聲、Podcast 等)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"其他"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"其他檔案"</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>
@@ -951,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"卸載中"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"儲存空間即將用盡"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"部分系統功能 (例如同步) 可能無法正常運作。請刪除或取消固定一些項目 (例如應用程式或媒體內容)，嘗試騰出空間。"</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"重新命名"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"安裝"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"移除"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"清除和格式化"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"清除和格式化為內部儲存空間"</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>
@@ -961,6 +961,46 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"讓已啟用 MIDI 的應用程式透過 USB 與電腦上的 MIDI 軟件運作。"</string>
     <string name="storage_other_users" msgid="808708845102611856">"其他使用者"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"儲存裝置"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"可攜式儲存裝置"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"尚餘空間為 <xliff:g id="FREE">%1$s</xliff:g>（可用空間共 <xliff:g id="TOTAL">%2$s</xliff:g>）"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"已連接 <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"無法連接 <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"已安全移除 <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"無法安全移除 <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"已格式化<xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"無法格式化<xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"重新命名儲存裝置"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"格式化後您可以於其他裝置使用此<xliff:g id="NAME_0">^1</xliff:g>。\n\n <xliff:g id="NAME_1">^1</xliff:g>的所有資料將被刪除，請先備份。\n\n"<b>"備份相片和其他媒體"</b>" \n將您的媒體檔案移動至這部裝罝的其他儲存空間，或使用USB連接線 將它們傳送到電腦。\n\n"<b>"備份應用程式s"</b>" \n儲存於此<xliff:g id="NAME_6">^1</xliff:g>的所有應用程式將解除安裝，資料將被刪除。如要保留這些應用程式，您可以將其移動至這部裝置的其他儲存空間。"</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"當你移除此<xliff:g id="NAME_0">^1</xliff:g>時，已儲存的應用程式將停止運作，媒體檔案將不能播放，直到裝置被重新插入。"</b>" \n\n此<xliff:g id="NAME_1">^1</xliff:g>經格式化後只能用於這部裝置。其他裝置將不能存取。"</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"設定您的<xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"作為可攜式儲存裝置使用"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"在裝置之間移動相片和其他媒體。"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"作為內部儲存空間使用"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"只限儲存於這部裝置，包括應用程式和相片。此操作需要格式化，以防止其他裝置存取。"</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"格式化為內部儲存空間"</string>
+    <!-- syntax error in translation for storage_wizard_format_confirm_body (4401758710076806509) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:86 in     <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509"></b>"<xliff:g id="NAME_0">^1</xliff:g>NAME_0需要格式化，以策安全。\n\n<xliff:g id="NAME_1">^1</xliff:g>經格式化後只能用於這部裝置。\n\n"<b>"格式化將清除目前儲存在<xliff:g id="NAME_2">^1</xliff:g>的所有資料。請將資料 備份，以免遺失。"</string>
+)  -->
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"清除和格式化"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"正在格式化<xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"格式化過程中不要移除<xliff:g id="NAME">^1</xliff:g>。"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"將資料移動至新的儲存空間"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"您可以將相片、檔案和應用程式資料移動至這個新<xliff:g id="NAME">^1</xliff:g>。\n\n此操作大約需時<xliff:g id="TIME">^2</xliff:g>，並能釋放<xliff:g id="SIZE">^3</xliff:g>的內部儲存空間。過程中部分應用程式將無法正常運作。"</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"立即移動"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"稍後移動"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"立即移動資料"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"此操作大約需時<xliff:g id="TIME">^1</xliff:g>，並能釋放<xliff:g id="SIZE">^2</xliff:g>的內部儲存空間。"</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"移動"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"正在移動資料…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"移動過程中：\n• 不要刪除<xliff:g id="NAME">^1</xliff:g>。\n•部分應用程式將無法正常運作。\n• 確定裝置有足夠電量。"</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g>已準備就緒"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"您的<xliff:g id="NAME">^1</xliff:g>已全部設定為可用於相片和其他媒體。"</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"您的新<xliff:g id="NAME">^1</xliff:g>正在運作。\n\n如要移動相片、檔案和應用程式資料至這部裝置，請前往 [設定及儲存空間]。"</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"移動<xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"移動<xliff:g id="APP">^1</xliff:g>和其資料至 <xliff:g id="NAME_0">^2</xliff:g>只需要幾分鐘。你將無法使用該應用程式，直到移動完成。\n\n過程中請勿移除<xliff:g id="NAME_1">^2</xliff:g>。"</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"正在移動<xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"移動過程中請勿移除<xliff:g id="NAME">^1</xliff:g>。\n\n您將無法使用這部裝置上的<xliff:g id="APP">^2</xliff:g>應用程式，直到移動完成。"</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"取消移動"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"電池狀態"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"電量"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1005,13 +1045,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"重設回預設值"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"重設預設 APN 設定已完成。"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"重設網絡設定"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"這樣做會將所有與網絡相關的設定重設至出廠預設值，包括：\n\n"<li>"Wi-Fi"</li>\n<li>"流動數據"</li>\n<li>"藍牙"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"這將重設所有網絡設定，包括：\n\n"<li>" Wi‑Fi "</li>\n<li>"流動數據"</li>\n<li>"藍牙"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"重設設定"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"要重設所有網絡設定嗎？這個操作不能復原！"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"您要重設所有的網絡設定嗎？您無法復原這項操作！"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"重設設定"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"您必須畫出解鎖圖案，確認重設網絡設定。"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"重設？"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"重設網絡設定"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"網絡設定已重設"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"重設裝置"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"恢復原廠設定"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"這會清除您平板電腦"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
@@ -1027,9 +1066,8 @@
     <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="1062841478823409667">"您要清除所有個人資訊和已下載的應用程式嗎？您無法復原這項操作！"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"全部清除"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"這位使用者無法將裝置恢復原廠設定"</string>
@@ -1046,8 +1084,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"設定留言信箱、來電轉接、來電待接和來電顯示"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB 網絡共享"</string>
@@ -1079,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"說明"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"流動網絡"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"流動數據計劃"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"預設短訊應用程式"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"短訊應用程式"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"變更短訊應用程式？"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"將 <xliff:g id="NEW_APP">%1$s</xliff:g> 設為您的短訊應用程式，而不使用 <xliff:g id="CURRENT_APP">%2$s</xliff:g>？"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"將 <xliff:g id="NEW_APP">%s</xliff:g> 設為您的短訊應用程式？"</string>
@@ -1110,6 +1146,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"使用 GPS 確定位置"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"正在掃瞄"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"正在掃瞄"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi 掃瞄"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"允許應用程式和服務掃瞄 Wi‑Fi 網絡，以提高位置資訊服務的精確度 (即使 Wi-Fi 已關閉)"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"藍牙掃瞄"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"允許應用程式和服務掃瞄藍牙裝置，以提高位置資訊服務的精確度 (即使藍牙已關閉)"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi 和流動網絡位置資料"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"允許應用程式使用 Google 的位置資訊服務，藉此更快確定您的約略位置。系統會收集匿名的位置資料傳送給 Google。"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"根據 Wi-Fi 確定位置"</string>
@@ -1155,11 +1195,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"已設定密碼"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"已設定 PIN"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"已設定圖形"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"畫出您的裝置圖形以繼續操作。"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"輸入您的裝置 PIN 碼以繼續操作。"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"輸入您的裝置密碼以繼續操作。"</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN 碼錯誤"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"密碼錯誤"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"圖形錯誤"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"裝置安全"</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_wrong" msgid="4694973540770105678">"請再試一次："</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>
@@ -1181,8 +1225,7 @@
     <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" msgid="6909161623701848863">"太多錯誤嘗試。請於 <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>
@@ -1233,7 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"按大小排序"</string>
     <string name="show_running_services" msgid="5736278767975544570">"顯示執行中的服務"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"顯示快取處理程序"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"預設緊急應用程式"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"緊急應用程式"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"重設應用程式喜好設定"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"重設應用程式喜好設定？"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"這會重設以下各項的所有喜好設定：\n\n "<li>"已停用的應用程式"</li>\n" "<li>"已停用的應用程式通知"</li>\n" "<li>"執行操作的預設應用程式"</li>\n" "<li>"應用程式的背景資料限制"</li>\n" "<li>"任何權限限制"</li>\n\n"您不會失去任何應用程式資料。"</string>
@@ -1437,8 +1480,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"擷取單一檔案內的所有藍牙 HCI 封包"</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="select_logd_size_title" msgid="7433137108348553508">"記錄器緩衝區空間"</string>
@@ -1739,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 小時"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 天"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"顯示系統"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"隱藏系統"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"使用 Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"統計資料類型"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"背景"</string>
@@ -1839,7 +1881,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_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>
@@ -2214,7 +2255,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"使用者"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"限制存取的個人檔案"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"新增使用者？"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"您可以建立額外的使用者，與他人分享這部裝置。每位使用者都有各自的個人空間，可使用自己的應用程式和桌布等自訂。此外，他們可以調整影響所有使用者的裝置設定 (例如 Wi-Fi 設定)。\n\n新增的使用者需要自行設定個人空間。\n\n任何使用者都可以為其他所有使用者更新應用程式。"</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"您可以建立額外的使用者，與他人分享這部裝置。每位使用者都有各自的個人空間，可使用自己的應用程式和桌布等自訂。此外，他們可以調整影響所有使用者的裝置設定 (例如 Wi-Fi 設定)。\n\n新增的使用者需要自行設定個人空間。\n\n任何使用者都可以為其他所有使用者更新應用程式。"</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"新增的使用者需要自行設定個人空間。\n\n任何使用者均可為其他所有使用者更新應用程式。"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"立即設定使用者？"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"請確定對方現在可以使用裝置設定自己的空間"</string>
@@ -2394,9 +2435,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"限制 限制 受限"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"文字 更正 修正 聲音 震動 自動 語言 手勢 建議 字詞建議 主題背景 令人反感的文字 輸入 表情圖案 國際"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"重設偏好設定預設值"</string>
-    <string name="keywords_emergency_app" msgid="6542122071127391103">"緊急 冰 應用程式 預設"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"緊急 應用程式 預設"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"應用程式 下載應用程式 系統"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"應用程式權限安全性"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"應用程式預設"</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>
@@ -2411,14 +2453,12 @@
     <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="6948120138640252732">"封鎖干擾"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"優先設定只允許："</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"自動規則"</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_alarms" msgid="7380265858042606857">"只允許鬧鐘"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"不允許干擾"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"僅限優先"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"僅限鬧鐘"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"不允許干擾"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>：<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"電話鈴聲"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"預設通知鈴聲"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"來電時同時震動"</string>
@@ -2451,15 +2491,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"沒有安裝任何通知接聽器。"</string>
     <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">"沒有應用程式提供條件"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d 個應用程式提供條件</item>
-      <item quantity="one">%d 個應用程式提供條件</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="loading_notification_apps" msgid="5031818677010335895">"正在載入應用程式…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"全部封鎖"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"永不顯示這個應用程式的通知"</string>
@@ -2473,17 +2504,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"規則名稱"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"加入規則"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"刪除規則"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"要刪除規則「<xliff:g id="RULE">%1$s</xliff:g>」嗎？"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"刪除"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"規則類型"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"未知"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"設定規則"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"計劃規則"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"找不到規則"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> ／ <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"星期幾"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"無"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"每天"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">"、 "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"永不"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>至<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"通話"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"訊息"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"來電者/訊息傳送者"</string>
@@ -2493,15 +2530,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"鬧鐘"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"提醒"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"活動"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"已選取的來電者"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"重複來電"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"如果同一人在 <xliff:g id="MINUTES">%d</xliff:g> 分鐘內再次來電，則允許"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"下一天 <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"您想何時接受干擾？"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"須運作多久？"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"無限期"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 分鐘</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 分鐘</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 小時</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 小時</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"變更為永遠只允許優先通知"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">變更為<xliff:g id="DURATION">%1$d</xliff:g>分鐘內只限優先通知，直至<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">變更為一分鐘內只限優先通知，直至<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">變更為 <xliff:g id="DURATION">%1$d</xliff:g> 小時內只限優先通知（直至 <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>）</item>
+      <item quantity="one">變更為一小時內只限優先通知，直至 <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"變更為永遠只允許鬧鐘"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">變更為 <xliff:g id="DURATION">%1$d</xliff:g> 分鐘內只限鬧鐘（直至 <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>）</item>
+      <item quantity="one">變更為一分鐘內只限鬧鐘，直至 <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">變更為 <xliff:g id="DURATION">%1$d</xliff:g> 小時內只限鬧鐘，直至 <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">變更為一小時內只限鬧鐘，直至 <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"變更為永遠不允許干擾"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">變更為<xliff:g id="DURATION">%1$d</xliff:g>分鐘內不受干擾（直至<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>）</item>
+      <item quantity="one">變更為一分鐘內不受干擾，直至 <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">變更為<xliff:g id="DURATION">%1$d</xliff:g>小時內不受干擾，直至<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">變更為一小時內不受干擾，直至 <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"變更為永遠允許干擾"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"不限時間"</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>
@@ -2566,7 +2664,10 @@
       <item quantity="other">已授予 <xliff:g id="COUNT_1">%d</xliff:g> 項權限</item>
       <item quantity="one">已授予 <xliff:g id="COUNT_0">%d</xliff:g> 項權限</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other">已授權 <xliff:g id="COUNT_2">%d</xliff:g> 個 (共 <xliff:g id="COUNT_3">%d</xliff:g> 個) 權限</item>
+      <item quantity="one">已授權 <xliff:g id="COUNT_0">%d</xliff:g> 個 (共 <xliff:g id="COUNT_1">%d</xliff:g> 個) 權限</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"已設定部分預設值"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"未設定預設值"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"所有應用程式"</string>
@@ -2577,8 +2678,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"重要"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"敏感"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"使用網域網址"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"重設所有應用程式的偏好設定至預設值"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"已安裝 <xliff:g id="COUNT">%d</xliff:g> 個應用程式，包括系統和已下載應用程式"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"已由管理員停用"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"進階"</string>
     <string name="unknown_app" msgid="5275921288718717656">"不明應用程式"</string>
     <string name="choose_profile" msgid="8229363046053568878">"選擇設定檔"</string>
@@ -2593,4 +2693,11 @@
       <item quantity="other">有 <xliff:g id="COUNT">%d</xliff:g> 個應用程式可開啟其網域網址</item>
       <item quantity="one">有 1 個應用程式可開啟其網域網址</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"未能識別"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"預設應用程式"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"瀏覽器應用程式"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"沒有預設瀏覽器"</string>
+    <string name="default_app" msgid="6864503001385843060">"(預設)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index d665624..17cb870 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"按鈕"</item>
@@ -235,12 +238,110 @@
     <item msgid="886742181977884584">"媒體"</item>
     <item msgid="7924928667052300589">"裝置"</item>
   </string-array>
-    <!-- no translation found for app_ops_summaries:47 (1165192162975045562) -->
-    <!-- no translation found for app_ops_summaries:48 (7129487923652967258) -->
-    <!-- no translation found for app_ops_summaries:49 (1069023208100114540) -->
-    <!-- no translation found for app_ops_labels:47 (5586547561693629602) -->
-    <!-- no translation found for app_ops_labels:48 (32794179825485062) -->
-    <!-- no translation found for app_ops_labels:49 (7872852746938272552) -->
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"約略位置"</item>
+    <item msgid="5789673140227507995">"精確位置"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"震動"</item>
+    <item msgid="3434165993711230924">"讀取聯絡人資料"</item>
+    <item msgid="616161687718081936">"修改聯絡人資料"</item>
+    <item msgid="7638002295329050091">"讀取通話紀錄"</item>
+    <item msgid="6546959730920410907">"修改通話紀錄"</item>
+    <item msgid="446877710771379667">"讀取日曆"</item>
+    <item msgid="7674458294386319722">"修改日曆"</item>
+    <item msgid="8281201165558093009">"Wi-Fi 掃描"</item>
+    <item msgid="8694611243479480497">"通知"</item>
+    <item msgid="7776439107987345446">"手機掃描"</item>
+    <item msgid="514615766544675057">"撥打電話"</item>
+    <item msgid="8181415497109310680">"讀取 SMS"</item>
+    <item msgid="6816551144382117307">"撰寫 SMS"</item>
+    <item msgid="4600463921908905030">"接收 SMS"</item>
+    <item msgid="5958926493289432745">"接收緊急 SMS"</item>
+    <item msgid="4945269495221089540">"接收 MMS"</item>
+    <item msgid="5570472453573929087">"接收 WAP PUSH 簡訊"</item>
+    <item msgid="7125408150230860501">"傳送 SMS"</item>
+    <item msgid="7080337936612188061">"讀取 ICC SMS"</item>
+    <item msgid="587124103118495063">"撰寫 ICC SMS"</item>
+    <item msgid="2320577158869025503">"修改設定"</item>
+    <item msgid="1545733463471924009">"在最上層繪圖"</item>
+    <item msgid="3609046903962454582">"存取通知"</item>
+    <item msgid="4671646036128214513">"相機"</item>
+    <item msgid="1097324338692486211">"錄音"</item>
+    <item msgid="5031552983987798163">"播放音訊"</item>
+    <item msgid="8374996688066472414">"讀取剪貼簿"</item>
+    <item msgid="3045529469061083747">"修改剪貼簿"</item>
+    <item msgid="5124443975763747838">"媒體按鈕"</item>
+    <item msgid="4547883971364273343">"音訊焦點"</item>
+    <item msgid="2603878814882344450">"主音量"</item>
+    <item msgid="7136963238377062018">"語音音量"</item>
+    <item msgid="4270236897655923007">"鈴聲音量"</item>
+    <item msgid="6325739889222559394">"媒體音量"</item>
+    <item msgid="5762123934816216821">"鬧鐘音量"</item>
+    <item msgid="785049718065337473">"通知音量"</item>
+    <item msgid="6700305533746877052">"藍牙音量"</item>
+    <item msgid="2029227495214047094">"停用休眠"</item>
+    <item msgid="26109888160231211">"監控位置"</item>
+    <item msgid="5753382310468855812">"監控高耗電定位功能"</item>
+    <item msgid="3356591542543137332">"取得使用統計資料"</item>
+    <item msgid="3073734345226842233">"關閉/開啟麥克風"</item>
+    <item msgid="1148142988678569310">"投影媒體"</item>
+    <item msgid="9130014005474445273">"啟用 VPN"</item>
+    <item msgid="1165192162975045562">"寫入桌布"</item>
+    <item msgid="7129487923652967258">"輔助結構"</item>
+    <item msgid="1069023208100114540">"輔助螢幕擷取畫面"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"位置"</item>
+    <item msgid="8677040780775113033">"位置"</item>
+    <item msgid="1660743989948992916">"位置"</item>
+    <item msgid="8791172739860195290">"震動"</item>
+    <item msgid="383413555642128046">"讀取聯絡人資料"</item>
+    <item msgid="3654594895269697313">"修改聯絡人資料"</item>
+    <item msgid="7928393476362362538">"讀取通話紀錄"</item>
+    <item msgid="6248591205254641116">"修改通話紀錄"</item>
+    <item msgid="6093344633066170692">"讀取日曆"</item>
+    <item msgid="1334886368750347692">"修改日曆"</item>
+    <item msgid="1638204101698708656">"位置"</item>
+    <item msgid="2154671955760380322">"發佈通知"</item>
+    <item msgid="4282477730595931828">"位置"</item>
+    <item msgid="4891423912898525905">"撥打電話"</item>
+    <item msgid="2623604824935968113">"讀取簡訊/MMS"</item>
+    <item msgid="4420177125221176306">"寫入簡訊/MMS"</item>
+    <item msgid="3986142739951490025">"接收 SMS/MMS"</item>
+    <item msgid="3984213795861739778">"接收 SMS/MMS"</item>
+    <item msgid="3656243523752472788">"接收 SMS/MMS"</item>
+    <item msgid="8105802370238551510">"接收 SMS/MMS"</item>
+    <item msgid="1407766984645388488">"傳送文字/多媒體訊息"</item>
+    <item msgid="3527273606643794973">"讀取簡訊/MMS"</item>
+    <item msgid="4370895547001583812">"寫入簡訊/MMS"</item>
+    <item msgid="4218544235221631789">"修改設定"</item>
+    <item msgid="736541391767350377">"在最上層繪圖"</item>
+    <item msgid="5530815681721654194">"存取通知"</item>
+    <item msgid="781213371706962767">"相機"</item>
+    <item msgid="1720492593061838172">"錄音"</item>
+    <item msgid="3493046322001257041">"播放音訊"</item>
+    <item msgid="136815868796597058">"讀取剪貼簿"</item>
+    <item msgid="5238692940326972503">"修改剪貼簿"</item>
+    <item msgid="5753789168376302997">"媒體按鈕"</item>
+    <item msgid="3265262911688671938">"音訊焦點"</item>
+    <item msgid="2098976479485046797">"主音量"</item>
+    <item msgid="5660213838861789350">"語音音量"</item>
+    <item msgid="7983336752371254444">"鈴聲音量"</item>
+    <item msgid="7878027809189330917">"媒體音量"</item>
+    <item msgid="7260546305036218513">"鬧鐘音量"</item>
+    <item msgid="9103719301075748925">"通知音量"</item>
+    <item msgid="7025966722295861512">"藍牙音量"</item>
+    <item msgid="4665183401128289653">"停用休眠"</item>
+    <item msgid="8584357129746649222">"定位"</item>
+    <item msgid="7669257279311110599">"定位"</item>
+    <item msgid="3459320345690097795">"取得使用統計資料"</item>
+    <item msgid="1312534577834048535">"關閉/開啟麥克風"</item>
+    <item msgid="5906017727368097853">"投影媒體"</item>
+    <item msgid="2486614710846178542">"啟用 VPN"</item>
+    <item msgid="5586547561693629602">"寫入桌布"</item>
+    <item msgid="32794179825485062">"輔助結構"</item>
+    <item msgid="7872852746938272552">"輔助螢幕擷取畫面"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短"</item>
     <item msgid="2560532955514699713">"中"</item>
@@ -408,11 +509,6 @@
     <item msgid="406385694840950802">"低"</item>
     <item msgid="4212263919458209842">"嚴重不足"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"關閉"</item>
-    <item msgid="5656544177755411222">"有限干擾"</item>
-    <item msgid="8735337502532332056">"零干擾"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"正常"</item>
     <item msgid="866544120205026771">"中"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e09ed91..87c2f42 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD 卡"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy 設定"</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>
-    <string name="yes_all_caps" msgid="5454685069075197457">"是"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"否"</string>
-    <string name="forget" msgid="7267115980248732932">"清除"</string>
+    <string name="forget" msgid="1400428660472591263">"清除"</string>
+    <string name="save" msgid="879993180139353333">"儲存"</string>
+    <string name="done" msgid="6942539184162713160">"完成"</string>
     <string name="settings_label" msgid="1626402585530130914">"設定"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"設定"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"設定捷徑"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"連接充電器，再試一次。"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"沒有鎖定螢幕的 PIN 或密碼"</string>
     <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">"您無法取消加密操作，如果過程中斷，資料將會遺失。加密過程可能需要 1 個小時以上的時間，您的平板電腦會在過程中重新啟動數次。"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"您無法取消加密操作，如果過程中斷，資料將會遺失。加密過程可能需要 1 個小時以上的時間，您的手機會在過程中重新啟動數次。"</string>
@@ -419,8 +416,7 @@
     <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>
-    <!-- no translation found for unlock_setup_wizard_fingerprint_details (7579210814842056547) -->
-    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"設定螢幕鎖定之後，您還可以前往 [設定] &gt; [安全性] 設定指紋。"</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>
@@ -522,8 +518,7 @@
     <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>
-    <!-- no translation found for ble_scan_notify_text (9019985398053764737) -->
-    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"為了提升定位精確度，應用程式和服務會進行掃描，看看附近是否有藍牙裝置 (即使藍牙連線功能處於關閉狀態)。您可以前往<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>掃描設定<xliff:g id="LINK_END_1">LINK_END</xliff:g>變更這項設定。"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"連線到…"</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>
@@ -589,8 +584,7 @@
     <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>
-    <!-- no translation found for wifi_scan_notify_text (8382526568324164356) -->
-    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"為了提升定位精確度，應用程式和服務會進行掃描，看看附近是否有 Wi-Fi 網路 (即使 Wi-Fi 連線功能處於關閉狀態)。您可以前往<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>掃描設定<xliff:g id="LINK_END_1">LINK_END</xliff:g>變更這項設定。"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"不要再顯示"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"休眠狀態仍保持 Wi-Fi 連線"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"休眠時仍保持 Wi-Fi 連線"</string>
@@ -607,8 +601,6 @@
     <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_apps" msgid="6003687912727859577">"顯示應用程式"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"顯示 WiFi 強度"</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>
@@ -666,6 +658,8 @@
     <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>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"連線"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"這個網路沒有網際網路連線。您仍要使用這個網路嗎？"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"不要再詢問我是否使用這個網路"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"連線"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"無法連線至網路"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"清除"</string>
@@ -732,21 +726,17 @@
     <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> 可攜式 Wi-Fi 無線基地台"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android 無線基地台"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi 通話"</string>
-    <!-- no translation found for wifi_calling_mode_title (2164073796253284289) -->
-    <skip />
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"撥號偏好"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi 通話模式"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Wi-Fi 優先"</item>
     <item msgid="5267397515594230396">"行動通訊優先"</item>
-    <item msgid="3132912693346866895">"只限 Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_off_explanation (4124926334215228094) -->
-    <skip />
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"開啟 Wi-Fi 通話功能之後，您的手機可依據您的偏好設定，透過 Wi-Fi 網路或您的行動通訊網路通話 (選擇訊號較強者)。開啟這項功能前，請先與您的行動通訊業者詢問費用與其他細節。"</string>
     <string name="home_settings" msgid="212375129455718176">"主螢幕"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音效"</string>
@@ -918,12 +908,12 @@
     <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="5128673488173839077">"應用程式和應用程式資料"</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">"音訊 (音樂、鈴聲、Podcast 等)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"其他"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"其他檔案"</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>
@@ -956,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"正在取出"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"儲存空間即將用盡"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"部分系統功能 (例如同步處理) 可能無法正常運作。請刪除或取消固定一些項目 (例如應用程式或媒體內容)，嘗試釋出空間。"</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"重新命名"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"掛載"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"退出"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"清除並格式化"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"清除並格式化為內部儲存空間"</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>
@@ -966,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"讓支援 MIDI 的應用程式透過 USB 連接埠與電腦上的 MIDI 軟體搭配運作。"</string>
     <string name="storage_other_users" msgid="808708845102611856">"其他使用者"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"裝置儲存空間"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"外接儲存裝置"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> 可用空間 (共 <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"已掛載「<xliff:g id="NAME">%1$s</xliff:g>」"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"無法掛載「<xliff:g id="NAME">%1$s</xliff:g>」"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"已安全退出「<xliff:g id="NAME">%1$s</xliff:g>」"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"無法安全退出「<xliff:g id="NAME">%1$s</xliff:g>」"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"已將「<xliff:g id="NAME">%1$s</xliff:g>」格式化"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"無法將「<xliff:g id="NAME">%1$s</xliff:g>」格式化"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"重新命名儲存空間"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"經過格式化後，您即可在其他裝置中使用此「<xliff:g id="NAME_0">^1</xliff:g>」。\n\n此「<xliff:g id="NAME_1">^1</xliff:g>」中的所有資料都將清除，建議您先備份資料。\n\n"<b>"備份相片和其他媒體"</b>" \n將您的媒體檔案移到這台裝置上的替代儲存空間，或使用 USB 傳輸線將資料傳輸到電腦。\n\n"<b>"備份應用程式"</b>" \n儲存在此「<xliff:g id="NAME_6">^1</xliff:g>」的所有應用程式都將解除安裝，相關資料也會一併刪除。如要保留，請將這些應用程式移到這台裝置上的替代儲存空間。"</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"當您退出此「<xliff:g id="NAME_0">^1</xliff:g>」時，儲存在其中的應用程式將停止運作，而儲存在其中的媒體檔案也無法供您使用，直到重新插上裝置為止。"</b>" \n\n此「<xliff:g id="NAME_1">^1</xliff:g>」經過格式化，僅能在這台裝置上運作，無法與其他裝置通用。"</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"設定您的「<xliff:g id="NAME">^1</xliff:g>」"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"使用可攜式儲存空間"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"可用於在裝置之間移動相片和其他媒體。"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"做為內部儲存空間使用"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"僅可用於儲存這台裝置上的任何項目，包括應用程式和相片。使用前必須先經過格式化，以免與其他裝置通用。"</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"格式化為內部儲存空間"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"「<xliff:g id="NAME_0">^1</xliff:g>」必須經過格式化，確保安全無虞。\n\n格式化後，此「<xliff:g id="NAME_1">^1</xliff:g>」僅能在這台裝置運作。\n\n"<b>"格式化作業會清除目前儲存在「<xliff:g id="NAME_2">^1</xliff:g>」的所有資料。"</b>"為避免資料遺失，建議您先進行備份。"</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"清除並格式化"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"正在格式化「<xliff:g id="NAME">^1</xliff:g>」…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"請勿在進行格式化程序時移除「<xliff:g id="NAME">^1</xliff:g>」。"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"將資料移動到新的儲存空間"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"您可以將相片、檔案和應用程式資料移動到新的「<xliff:g id="NAME">^1</xliff:g>」。\n\n移動作業大約需要 <xliff:g id="TIME">^2</xliff:g>。完成後，將可釋放 <xliff:g id="SIZE">^3</xliff:g> 內部儲存空間。在執行移動作業的過程中，部分應用程式可能無法正常運作。"</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"立即移動"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"稍後移動"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"立即移動資料"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"移動作業大約需要 <xliff:g id="TIME">^1</xliff:g>。完成後，將可釋放 <xliff:g id="SIZE">^2</xliff:g> 內部儲存空間。"</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"移動"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"移動資料…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"執行移動作業時：\n• 請勿移除「<xliff:g id="NAME">^1</xliff:g>」。\n• 部分應用程式可能無法正常運作。\n• 讓裝置持續充電。"</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"「<xliff:g id="NAME">^1</xliff:g>」準備就緒"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"您的「<xliff:g id="NAME">^1</xliff:g>」已就緒，可用於儲存相片和其他媒體。"</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"新的「<xliff:g id="NAME">^1</xliff:g>」運作中。\n\n如要將相片、檔案和應用程式資料移動到這台裝置上，請前往 [設定] &gt; [儲存空間]。"</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"移動「<xliff:g id="APP">^1</xliff:g>」"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"將「<xliff:g id="APP">^1</xliff:g>」和相關資料移動到「<xliff:g id="NAME_0">^2</xliff:g>」只需要幾分鐘。移動作業完成後，您才可以使用該應用程式。\n\n請勿在執行移動作業時移除「<xliff:g id="NAME_1">^2</xliff:g>」。"</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"正在移動「<xliff:g id="APP">^1</xliff:g>」…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"請勿在執行移動作業時移除「<xliff:g id="NAME">^1</xliff:g>」。\n\n移動作業完成後，這台裝置上的「<xliff:g id="APP">^2</xliff:g>」應用程式才可供使用。"</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"取消移動"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"電池狀態"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"電池存量"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1010,13 +1044,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"還原為預設狀態"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"重設預設 APN 設定已完成。"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"重設網路設定"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"這會將所有與網路相關的設定恢復成原廠預設值，包括：\n\n"<li>"Wi-fi"</li>\n<li>"行動數據"</li>\n<li>"藍牙"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"這個動作會重設所有網路設定，包括：\n\n"<li>"Wi‑Fi"</li>\n<li>"行動數據"</li>\n<li>"藍牙"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"重設設定"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"您要重設所有的網路設定嗎？這個動作無法復原！"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"您要重設所有網路設定嗎？這個動作無法復原！"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"重設設定"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"畫出解鎖圖形，確認要重設網路設定。"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"您要重設嗎？"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"網路設定重設完成"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"已重設網路設定"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"重設裝置"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"恢復原廠設定"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"這會清除您平板電腦"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
@@ -1032,9 +1065,8 @@
     <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="1062841478823409667">"您要清除所有個人資訊和已下載的應用程式嗎？這個動作無法復原！"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"全部清除"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"這位使用者無法將裝置恢復原廠設定"</string>
@@ -1051,8 +1083,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"設定語音信箱、來電轉接、來電待接及來電顯示"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB 網路共用"</string>
@@ -1084,7 +1114,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"說明"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"行動網路"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"行動數據傳輸資費方案"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"預設簡訊應用程式"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"簡訊應用程式"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"變更簡訊應用程式？"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"您要改用 <xliff:g id="NEW_APP">%1$s</xliff:g> 而不再使用 <xliff:g id="CURRENT_APP">%2$s</xliff:g> 做為簡訊應用程式嗎？"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"使用 <xliff:g id="NEW_APP">%s</xliff:g> 做為簡訊應用程式嗎？"</string>
@@ -1115,6 +1145,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"使用 GPS 判斷您的所在位置"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"掃描"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"掃描"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi 掃描"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"允許應用程式和服務執行 Wi‑Fi 網路掃描作業 (即使 Wi-Fi 連線功能處於關閉狀態)，以提升定位精確度"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"藍牙掃描"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"允許系統服務執行藍牙裝置掃描作業 (即使藍牙連線功能處於關閉狀態)，以提升定位精確度"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi 和行動網路位置資訊"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"允許應用程式使用 Google 的定位服務加速判斷您的約略位置。系統會收集匿名的位置資料並傳送給 Google。"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"根據 Wi-Fi 判定位置"</string>
@@ -1160,11 +1194,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"已設定密碼"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"已設定 PIN"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"已設定圖形"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"請畫出您的裝置解鎖圖形以繼續作業。"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"請輸入您的裝置 PIN 以繼續作業。"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"請輸入您的裝置密碼以繼續作業。"</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN 錯誤"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"密碼錯誤"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"圖形錯誤"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"裝置安全性"</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_wrong" msgid="4694973540770105678">"請再試一次："</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"畫出解鎖圖形"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"請按 [Menu] 以取得說明。"</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"完成時請移開手指"</string>
@@ -1186,8 +1224,7 @@
     <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" msgid="6909161623701848863">"錯誤次數過多，請於 <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>
@@ -1238,8 +1275,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"依大小排序"</string>
     <string name="show_running_services" msgid="5736278767975544570">"顯示執行中的服務"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"顯示快取處理程序"</string>
-    <!-- no translation found for default_emergency_app (4066437376478173872) -->
-    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"緊急應用程式"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"重設應用程式偏好設定"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"重設應用程式偏好設定？"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"這會重設下列項目的所有偏好設定：\n\n "<li>"已停用的應用程式"</li>\n" "<li>"已停用的應用程式通知"</li>\n" "<li>"執行動作的預設應用程式"</li>\n" "<li>"應用程式的背景資料限制"</li>\n" "<li>"任何權限限制"</li>\n\n" 您不會遺失任何應用程式資料。"</string>
@@ -1443,8 +1479,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"擷取單一檔案內的所有藍牙 HCI 封包"</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="select_logd_size_title" msgid="7433137108348553508">"紀錄器緩衝區空間"</string>
@@ -1745,6 +1779,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 小時"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 天"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"顯示系統"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"隱藏系統"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"使用 Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"統計資料類型"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"背景"</string>
@@ -1845,7 +1880,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_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>
@@ -2220,7 +2254,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"使用者"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"設有限制的個人資料"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"新增使用者？"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"您可以建立其他使用者，藉此與他人共用這個裝置。每位使用者都有自己的專屬空間，並可使用應用程式、桌布等項目自訂這個個人空間。此外，使用者也可以調整會影響所有人的裝置設定，例如 Wi‑Fi 設定。\n\n新增的使用者需要自行設定個人空間。\n\n任何使用者皆可為其他所有使用者更新應用程式。"</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"您可以建立其他使用者，藉此與他人共用這個裝置。每位使用者都有自己的專屬空間，並可使用應用程式、桌布等項目自訂這個個人空間。此外，使用者也可以調整 Wi‑Fi 這類會影響所有人的裝置設定。\n\n新增的使用者需要自行設定個人空間。\n\n任何使用者皆可為所有其他使用者更新應用程式。"</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"新增的使用者需要自行設定個人空間。\n\n任何使用者皆可為其他所有使用者更新應用程式。"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"立即設定使用者？"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"請確保對方可以使用裝置並設定自己的空間"</string>
@@ -2400,10 +2434,10 @@
     <string name="keywords_users" msgid="4673901601478559100">"限制 限制 受限"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"文字 更正 修正 音效 震動 自動 語言 手勢 建議 字詞建議 主題 令人反感 字詞 輸入 表情符號 國際"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"重設 偏好設定 預設值"</string>
-    <!-- no translation found for keywords_emergency_app (6542122071127391103) -->
-    <skip />
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"預設緊急狀況應用程式"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"app 下載 應用程式 系統"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"應用程式權限安全性"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"應用程式 預設"</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>
@@ -2418,14 +2452,12 @@
     <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="6948120138640252732">"封鎖干擾"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"優先通知僅允許"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"自動規則"</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_alarms" msgid="7380265858042606857">"僅允許鬧鐘"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"不允許干擾"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"僅顯示優先通知"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"僅允許鬧鐘"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"無干擾"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>：<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"電話鈴聲"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"預設通知鈴聲"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"來電時同時震動"</string>
@@ -2458,15 +2490,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"沒有安裝任何通知接聽器。"</string>
     <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">"沒有任何應用程式提供條件"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="other">%d 個應用程式提供了條件</item>
-      <item quantity="one">%d 個應用程式提供了條件</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="loading_notification_apps" msgid="5031818677010335895">"正在載入應用程式..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"全部封鎖"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"永不顯示這個應用程式的通知"</string>
@@ -2480,17 +2503,23 @@
     <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_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_rule_name" msgid="5149068059383837549">"規則名稱"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"新增規則"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"刪除規則"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"要刪除「<xliff:g id="RULE">%1$s</xliff:g>」規則嗎？"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"刪除"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"規則類型"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"不明"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"設定規則"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"時間表規則"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"找不到規則。"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"星期幾"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"無"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"每天"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">"、 "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"永遠不要"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>到<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"來電"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"訊息"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"來電者/訊息傳送者"</string>
@@ -2500,15 +2529,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"鬧鐘"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"提醒"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"活動"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"所選來電者"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"重複來電者"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"如果同一個人在 <xliff:g id="MINUTES">%d</xliff:g> 分鐘的時間內第二次來電，即顯示通知"</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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"隔天 <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"您想接收哪些干擾通知？"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"要持續多久？"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"無限期"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 分鐘</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 分鐘</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 小時</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 小時</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"無限期變更為僅顯示優先通知模式"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">變更為僅顯示優先通知模式：持續 <xliff:g id="DURATION">%1$d</xliff:g> 分鐘，結束時間為<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">變更為僅顯示優先通知模式：持續 1 分鐘，結束時間為<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">變更為僅顯示優先通知模式：持續 <xliff:g id="DURATION">%1$d</xliff:g> 小時，結束時間為<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">變更為僅顯示優先通知模式：持續 1 小時，結束時間為<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"無限期變更為僅允許鬧鐘模式"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">變更為僅允許鬧鐘模式：持續 <xliff:g id="DURATION">%1$d</xliff:g> 分鐘，結束時間為<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">變更為僅允許鬧鐘模式：持續 1 分鐘，結束時間為<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">變更為僅允許鬧鐘模式：持續 <xliff:g id="DURATION">%1$d</xliff:g> 小時，結束時間為<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">變更為僅允許鬧鐘模式：持續 1 小時，結束時間為<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"無限期變更為無干擾模式"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">變更為無干擾模式：持續 <xliff:g id="DURATION">%1$d</xliff:g> 分鐘，結束時間為<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">變更為無干擾模式：持續 1 分鐘，結束時間為<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">變更為無干擾模式：持續 <xliff:g id="DURATION">%1$d</xliff:g> 小時，結束時間為<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">變更為無干擾模式：持續 1 小時，結束時間為<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"變更為一律允許干擾模式"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"不限時間"</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>
@@ -2573,7 +2663,10 @@
       <item quantity="other">已取得 <xliff:g id="COUNT_1">%d</xliff:g> 項權限</item>
       <item quantity="one">已取得 <xliff:g id="COUNT_0">%d</xliff:g> 項權限</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other">已授予 <xliff:g id="COUNT_2">%d</xliff:g> 項權限 (共 <xliff:g id="COUNT_3">%d</xliff:g> 項)</item>
+      <item quantity="one">已授予 <xliff:g id="COUNT_0">%d</xliff:g> 項權限 (共 <xliff:g id="COUNT_1">%d</xliff:g> 項)</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"已設定部分預設值"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"未設定預設值"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"所有應用程式"</string>
@@ -2584,8 +2677,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"優先"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"敏感"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"包含網域網址"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"將所有應用程式的偏好設定重設為預設值"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"已安裝 <xliff:g id="COUNT">%d</xliff:g> 個應用程式，包括系統和下載的應用程式"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"已由管理員停用"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"進階"</string>
     <string name="unknown_app" msgid="5275921288718717656">"不明的應用程式"</string>
     <string name="choose_profile" msgid="8229363046053568878">"選擇設定檔"</string>
@@ -2600,4 +2692,11 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> 個應用程式可以開啟自身的網域網址</item>
       <item quantity="one">1 個應用程式可以開啟自身的網域網址</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"無法識別"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"預設應用程式"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"瀏覽器應用程式"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"沒有預設瀏覽器"</string>
+    <string name="default_app" msgid="6864503001385843060">"(預設)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index e01f7ac..219a3c1 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"i-TLS"</item>
     <item msgid="2892994535305020162">"i-TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Cindezela inkinobho"</item>
@@ -506,11 +509,6 @@
     <item msgid="406385694840950802">"phansi"</item>
     <item msgid="4212263919458209842">"bucayi"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Valiwe"</item>
-    <item msgid="5656544177755411222">"Iziphazamiso ezinomkhawulo"</item>
-    <item msgid="8735337502532332056">"Iziphazamiso ezingekho"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Okujwayelekile"</item>
     <item msgid="866544120205026771">"Maphakathi"</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index c5c03de..4279d6c 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -268,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Ikhadi le-SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Izilungiselelo zommeleli"</string>
     <string name="cancel" msgid="6859253417269739139">"Khansela"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"KHANSELA"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"QHUBEKA"</string>
     <string name="okay" msgid="1997666393121016642">"KULUNGILE"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"YEBO"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"CHA"</string>
-    <string name="forget" msgid="7267115980248732932">"KHOHLWA"</string>
+    <string name="forget" msgid="1400428660472591263">"Khohlwa"</string>
+    <string name="save" msgid="879993180139353333">"Londoloza"</string>
+    <string name="done" msgid="6942539184162713160">"Kwenziwe"</string>
     <string name="settings_label" msgid="1626402585530130914">"Izilungiselelo"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Izilungiselelo"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Isinqamuleli sezilungiselelo"</string>
@@ -374,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Sicela uxhume ishaja yakho bese uzama futhi."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ayikho i-PIN yokuvala isikrini noma iphasiwedi"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Udinga ukusetha i-PIN yokukhiya isikrini noma iphasiwedi ngaphambi kokuqala ukubhala ngakhodi."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Udinga ukudweba iphethini yakho yokuvula ukuze uqinisekise ukubethelwa idivayisi yakho."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Bhala ngekhodi?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Umsebenzi wokubhala ngekhodi awubuyiseleki emuva futhi uma uwuphazamisa, uzolahlekelwa idatha. Ukubhala ngekhodi kuthatha ihora noma ngaphezulu, phakathi kwesikhathi lapho ikhomyutha izoqala kabusha kambalwa."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Umsebenzi wokubhala ngekhodi awubuyiseleki emuva futhi uma uwuphazamisa, uzolahlekelwa idatha. Ukubhala ngekhodi kuthatha ihora noma ngaphezulu, phakathi kwesikhathi lapho ucingo lizoqala kabusha kambalwa."</string>
@@ -521,7 +518,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Okuthuthukisiwe"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"i-Bluetooth ephambili"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Uma i-Bluetooth ivuliwe, idivayisi yakho ingakwazi ukuxhumana namanye amadivayisi aseduze we-Bluetooth."</string>
-    <string name="ble_scan_notify_text" msgid="9019985398053764737">"Ukuze kuthuthukiswe ukunemba kwendawo, amasevisi we-Google azoskenela amadivayisi we-Bluetooth, noma ngabe i-Bluetooth ivaliwe. Ungaguqula lokhu ku-LINK_BEGINizilungiselelo zokuskenaLINK_END."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Ukuze uthuthukise ukunemba kwendawo, izinhlelo zokusebenza namasevisi azoskenela amadivayisi we-Bluetooth, noma ngabe i-Bluetooth ivaliwe. Ungaguqula lokhu <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>kuzilungiselelo zokuskena<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Xhuma kwi..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ingeke ixhumeke kumsindo wemidiya."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ngeke ixhumeke kumsindo wehendsfri."</string>
@@ -587,7 +584,7 @@
     <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" msgid="8382526568324164356">"Ukuze kuthuthukiswe ukunemba kwendawo, amasevisi we-Google azoskenela amanethiwekhi we-Wi-Fi, noma ngabe i-Wi-Fi ivaliwe. Ungaguqula lokhu ku-LINK_BEGINizilungiselelo zokuskenaLINK_END."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Ukuze uthuthukise ukunemba kwendawo, izinhlelo zokusebenza namasevisi azoskenela amanethiwekhi wendawo, noma ngabe i-Wi-Fi ivaliwe. Ungaguqula lokhu ku-<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>izilungiselelo zokuskena<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ungabonisi futhi"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Gcina i-Wi-Fi isebenza ngesikhathi sokulala"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"I-Wi‑Fi ivulekile phakathi kokulala"</string>
@@ -604,8 +601,6 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"I-Wi-Fi eqondile"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skena"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Thuthukisiwe"</string>
-    <string name="wifi_menu_apps" msgid="6003687912727859577">"Bonisa Izinhlelo Zokusebenza"</string>
-    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Bonisa Amandla we-WiFi"</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>
@@ -663,6 +658,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Ngena ngemvume ukuze uxhume?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"I-<xliff:g id="APP_NAME">%1$s</xliff:g> idinga ukuthi ungene ngemvume ngaphambi kokuxhuma kunethiwekhi."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"XHUMA"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Le nethiwekhi ayinakho ukufinyelela kwe-inthanethi. Sebenzisa le nethiwekhi noma kunjalo?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Ungaphindi ubuze ngale nethiwekhi"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Xhuma kwi-inthanethi"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Yehlulekile ukuxhuma kunethiwekhi"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Khohlwa"</string>
@@ -734,12 +731,10 @@
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Kuncanyelwa i-Wi-Fi"</item>
     <item msgid="5267397515594230396">"Kuncanyelwa iselula"</item>
-    <item msgid="3132912693346866895">"I-Wi-Fi kuphela"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
     <item msgid="1171822231056612021">"1"</item>
-    <item msgid="3194458950573886239">"0"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Uma ukushaya kwe-Wi-Fi kuvuliwe, ifoni yakho ingarutha amakholi ngamanethiwekhi we-Wi-Fi noma kunethiwekhi yenkampani yakho yenethiwekhi, ngokuya ngokuncamelayo nokuthi iyiphi isiginali enamandla. Ngaphambi kokuvula lesi sici, hlola nenkampani yakho yenethiwekhi ngokuphathelene nezinkokhelo neminye imininingwane."</string>
     <string name="home_settings" msgid="212375129455718176">"Ikhaya"</string>
@@ -913,12 +908,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Kuyatholakala (ukufunda-kuphela)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Inani lesikhala"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Iyabala..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Izinhlelo zokusebenza (idatha yohlelo lokusebenza &amp; okuqukethwe kwabezindaba)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Izinhlelo zokusebenza nedatha yohlelo lokusebenza"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Imidiya"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Okulandiwe"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Izithombe, Amavidiyo"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Umsindo (umculo, ithoni yokukhala, ama-podcasts nokunye)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Okungaziwa"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Amanye amafayela"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Idatha yenqolobane"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Yehlisa isitoreji sokwabelene"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Khipha ikhadi le-SD"</string>
@@ -951,6 +946,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Ukwehlisa kuyaqhubeka"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Isikhala sokulondoloza siyaphela"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Eminye imisebenzi yohlelo, njengokuvumelanisa, kungahle kungasebenzi kahle. Zama ukukhulula isikhala ngokususa noma ukususa ukuphina izinto, njengezinhlelo zokusebenza noma okuqukethwe kwabezindaba."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Qamba kabusha"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Khweza"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Khipha"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Sula futhi ufomethe"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Sula futhi ufomethe njengesitoreji sangaphakathi"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Uxhumano lwekhompyutha ye-USB"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Uxhumano lwekhompyutha ye-USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Xhuma njenge"</string>
@@ -961,6 +961,45 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Ivumela izinhlelo zokusebenza ezinike amandla i-MIDI ngesofthiwe le-MIDI kukhompyutha yakho."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Abanye abasebenzisi"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Isitoreji sedivayisi"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Isitoreji esikhiphekayo"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> ikhululekile (Inani <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"I-<xliff:g id="NAME">%1$s</xliff:g> ikhweziwe"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Ayikwazanga ukukhweza i-<xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"I-<xliff:g id="NAME">%1$s</xliff:g> ikhishwe ngokuphephile"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Ayikwazanga ukukhipha ngokuphephile i-<xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"I-<xliff:g id="NAME">%1$s</xliff:g> ifomethiwe"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Ayikwazanga ukufometha i-<xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Qamba kabusha isitoreji"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Ngemuva kokufometha, ungasebenzisa le-<xliff:g id="NAME_0">^1</xliff:g> kwamanye amadivayisi. \n\nYonke idatha kule-<xliff:g id="NAME_1">^1</xliff:g> izosuswa. Cabanga ukwenza isipele kuqala. \n\n"<b>"Yenza isipele izithombe nenye imidiya"</b>" \nHambisa amafayela wakho wemidiya kwesinye isitoreji kule divayisi, noma uwadlulisele kukhompuyutha usebenzisa intambo ye-USB. \n\n"<b>"Yenza isipele izinhlelo zokusebenza"</b>" \nZonke izinhlelo zokusebenza ezigcinwe kule-<xliff:g id="NAME_6">^1</xliff:g> zizokhishwa futhi idatha yazo izosulwa. Ukuze ugcine lezi zinhlelo zokusebenza, zihambise kwesinye isitoreji kule divayisi."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Uma ukhipha le-<xliff:g id="NAME_0">^1</xliff:g>, izinhlelo zokusebenza ezigcinwe kuyo zizoma ukusebenza, futhi amafayela wemidiya agcine kuyo ngeke aze atholakale ize iphinde ifakwe."</b>" \n\nLe-<xliff:g id="NAME_1">^1</xliff:g> ifomethwe ukuze isebenze kule divayisi kuphela. Angeke ize isebenze kwamanye."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Setha i-<xliff:g id="NAME">^1</xliff:g> yakho"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Sebenzisa njengesitoreji esiphathekayo"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Ngokuhambisa izithombe nenye imidiya ngaphakathi kwamadivayisi."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Sebenzisa njengesitoreji sangaphakathi"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Ukuze ugcine noma yini kule divayisi kuphela, okufaka izinhlelo zokusebenza nezithombe. Idinga ukufometha okuyivimbela kusukela ekusebenzeni namanye amadivayisi."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Fometha njengesitoreji sangaphakathi"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Lokhu kudinga i-<xliff:g id="NAME_0">^1</xliff:g> ukuthi ifomethwe ukuze yenziwe ivikeleke. \n\nNgemuva kokufometha, le-<xliff:g id="NAME_1">^1</xliff:g> izosebenza kuphela kule divayisi. \n\n"<b>"Ukufometha kususa yonke idatha manje egcinwe ku-<xliff:g id="NAME_2">^1</xliff:g>."</b>" Ukuze ugweme ukulahlekelwa yidatha, cabanga ukuyenza isipele."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Sula uphinde ufomethe"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Ifometha i-<xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Ungasusi i-<xliff:g id="NAME">^1</xliff:g> ngenkathi ifometha."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Hambisa idatha kusitoreji esisha"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Ungahambisa izithombe zakho, amafayela, nedatha yohlelo lokusebenza kule-<xliff:g id="NAME">^1</xliff:g> entsha. \n\nUkuhanjiswa kuthatha cishe okungu-<xliff:g id="TIME">^2</xliff:g> futhi kuzokhulula okungu-<xliff:g id="SIZE">^3</xliff:g> kusitoreji sangaphakathi. Ezinye izinhlelo zokusebenza ngeke zize zisebenze ngenkathi kusasebenza."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Hambisa manje"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Hambisa ngemuva kwesikhathi"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Hambisa idatha manje"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Ukuhanjiswa kuthatha okungenani okungu-<xliff:g id="TIME">^1</xliff:g>. Kuzokhulula okungu-<xliff:g id="SIZE">^2</xliff:g> kwesitoreji sangaphakathi."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Hambisa"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Ihambisa idatha…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Ngesikhathi sokuhambisa: \n• Ungasusi i-<xliff:g id="NAME">^1</xliff:g>. \n• Ezinye izinhlelo zokusebenza ngeke zisebenze kahle. \n• Gcina idivayisi ishajiwe."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"I-<xliff:g id="NAME">^1</xliff:g> ilungile"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"I-<xliff:g id="NAME">^1</xliff:g> yakho isilungele ukusetshenziswa ngezithombe nenye imidiya."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"I-<xliff:g id="NAME">^1</xliff:g> yakho entsha iyasebenza. \n\nUkuze uhambise izithombe, amafayela, nedatha yohlelo lokusebenza kule divayisi, hamba ku-Izilungiselelo &gt; Isitoreji."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Hambisa i-<xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Ukuhambisa i-<xliff:g id="APP">^1</xliff:g> kanye nedatha yayo ku-<xliff:g id="NAME_0">^2</xliff:g> kuzothatha izikhathi ezimbalwa kuphela. Ngeke uze ukwazi ukusebenzisa uhlelo lokusebenza kuze kube ukuhanjiswa kuqedile. \n\nUngasusi i-<xliff:g id="NAME_1">^2</xliff:g> ngesikhathi sokuhambisa."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Ihambisa i-<xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Ungasusi i-<xliff:g id="NAME">^1</xliff:g> ngesikhathi sokuhambisa. \n\nUhlelo lokusebenza lwe-<xliff:g id="APP">^2</xliff:g> kule divayisi ngeke luze lutholakale kuze kuqedwe ukuhambisa."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Khansela ukuhambisa"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Umumo webhetri"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Izinga lebhetri"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1006,13 +1045,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Setha kabusha kube okumisiwe"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Ukuhlela okumisiwe izilungiselelo ze-APN kuqedile."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Ukusetha kabusha kwezilungiselelo zenethiwekhi"</string>
-    <string name="reset_network_desc" msgid="5805796658276223307">"Lokhu kuzosetha kabusha izilungiselelo ezihlobene nokunethiwekha kokuzenzakalelayo kwasekuqaleni, okufaka:\n\n"<li>"i-Wifi"</li>\n<li>"idatha yeselula"</li>\n<li>"i-Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Lokhu kuzosetha kabusha zonke izilungiselelo zenethiwekhi ezifaka:\n\n"<li>"i-Wi‑Fi"</li>\n<li>"idatha yeselula"</li>\n<li>"i-Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Setha kabusha izilungiselelo"</string>
-    <string name="reset_network_final_desc" msgid="1745138973574945389">"Setha kabusha zonke izilungiselelo zenethiwekhi? Awukwazi ukuguqula lesi senzo!"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Setha kabusha zonke izilungiselelo zenethiwekhi? Awukwazi ukuhlehlisa lesi senzo!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Setha kabusha izilungiselelo"</string>
-    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Udinga ukudweba iphethini yakho yokuvula ukuze uqinisekise ukusetha kabusha kwezilungiselelo zenethiwekhi."</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Setha kabusha?"</string>
-    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Ukusetha kabusha kwezilungiselelo zenethiwekhi"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Izilungiselelo zenethiwekhi zisethwe kabusha"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Setha kabusha idivayisi"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Ukuhlela kabusha idatha yasembonini"</string>
     <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>
@@ -1028,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Sula yonke idatha ekhadini le-SD, njengomculo noma izithombe"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Setha kabusha ithebhulethi"</string>
     <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_desc" msgid="1062841478823409667">"Sula lonke ulwazi lakho lomuntu siqu kanye nezinhlelo zokusebenza ezilandiwe? Awukwazi ukuhlehlisa lesi senzo!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Sula yonke into"</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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Ukusetha kabusha kwasekuqaleni akutholakaleli lo msebenzisi"</string>
@@ -1047,8 +1084,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_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>
     <string name="call_settings_summary" msgid="7291195704801002886">"Hlela ivoyisimeyili, ukudlulisa ikholi, ikholi elindile, i-ID yomshayeli"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Imodemu nge-USB"</string>
@@ -1080,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Usizo"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Amanethiwekhi weselula"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Uhlelo lweselula"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Uhlelo lokusebenza oluzenzakalelayo le-SMS"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Uhlelo lokusebenza lwe-SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Shintsha uhlelo lokusebenza le-SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Sebenzisa i-<xliff:g id="NEW_APP">%1$s</xliff:g> kunokusebenzisa i-<xliff:g id="CURRENT_APP">%2$s</xliff:g> njengohlelo lwakho lokusebenza le-SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Sebenzisa i-<xliff:g id="NEW_APP">%s</xliff:g> njengohlelo lwakho lokusebenza le-SMS?"</string>
@@ -1111,6 +1146,10 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Sebenzisa i-GPS ukuze unqume indawo"</string>
     <string name="location_menu_scanning" msgid="8536245838478802959">"Iyaskena"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Iyaskena"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Ukuskena kwe-Wi-Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Thuthukisa indawo ngokuvumela izinhlelo zokusebenza namasevisi ukuthi askenele amanethiwekhi we-Wi-Fi noma ngabe i-Wi-Fi ivaliwe"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Ukuskena kwe-Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Thuthukisa indawo ngokuvumela amasevisi wesistimu ukuthi askenele amadivayisi we-Bluetooth, noma ngabe i-Bluetooth ivaliwe"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Indawo ye-Wi‑Fi nenethiwekhi yeselula"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Vumela izinhlelo zokusebenza zisebenzise isevisi yendawo yakwa-Google ukucabangela indawo yakho ngokushesha. Idatha yendawo engaziwa izoqoqwa futhi ithunyelwe kwa-Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Indawo etholwe i-Wi-Fi"</string>
@@ -1156,11 +1195,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Iphasiwedi imisiwe"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"i-PIN imisiwe"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Iphathini imisiwe"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Sebenzisa iphethini yedivayisi yakho ukuze uqhubeke."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Faka iphinikhodi yedivayisi yakho ukuze uqhubeke."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Faka iphasiwedi yedivayisi yakho ukuze uqhubeke."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Iphinikhodi engalungile"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Iphasiwedi engalungile"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Iphethini engalungile"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Ukuphepha kwedivaysi"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Shintsha iphathini yokuvula"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Shintsha ukuvula i-PIN"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Qinisekisa iphathini egciniwe"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Zama futhi:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Dweba iphathini yokuvula"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Chofoza Imenyu ukuthola usizo."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Dedela umunwe uma usuqedile"</string>
@@ -1182,8 +1225,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Setha iphathini yokuvula"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Shintsha iphathini yokuvula"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Udweba kanjani phathini yokuvula"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Kunemizamo engalungile eminingi kakhulu!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Zama futhi emasekhondini angu-<xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Imizamo eminingi engalungile. Zama futhi kumasekhondi angu-<xliff:g id="NUMBER">%d</xliff:g>."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Uhlelo lokusebenza alufakiwe efonini yakho."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Phatha izinhlelo zokusebenza"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Phatha futhi ukhiphe izinhlelo zokusebenza ezifakiwe"</string>
@@ -1234,7 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Hlunga ngosayizi"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Bonisa amasevisi asebenzayo"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Bonisa izinqubo zokulondoloza kwesikhashana"</string>
-    <string name="default_emergency_app" msgid="4066437376478173872">"Uhlelo lokusebenza lwesimo esiphuthumayo elizenzakalelayo"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Uhlelo lokusebenza lwesimo esiphuthumayo"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Setha kabusha izintandokazi zezinhlelo zokusebenza"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Setha kabusha izintandokazi zohlelo lokusebenza?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Lokhu kuzosetha kabusha konke okuncamelayo kwe-:\n\n "<li>"Izinhlelo zokusebenza ezikhutshaziwe"</li>\n" "<li>"Izaziso zezinhlelo zokusebenza ezikhutshaziwe"</li>\n" "<li>"Izinhlelo zokusebenza ezizenzakalelayo zezenzo"</li>\n" "<li>"Imikhawulo yedatha yangemuva yezinhlelo zokusebenza"</li>\n" "<li>"Noma yimiphi imikhawulo yemvume"</li>\n\n" Ngeke uze ulahlekelwe noma iyiphi idatha yohlelo lokusebenza."</string>
@@ -1444,8 +1486,6 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Shutha wonke amaphakethe we-bluetooth HCI kufayela"</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="select_logd_size_title" msgid="7433137108348553508">"Amasayizi weloga ngebhafa"</string>
@@ -1746,6 +1786,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 amahora"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 usuku"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Bonisa isistimu"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Fihla isistimu"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Sebenzisa i-Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Uhlobo lwezibalo"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Ingemuva"</string>
@@ -1842,7 +1883,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_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>
     <string name="credentials_old_password" msgid="7553393815538684028">"Iphasiwedi yamanje:"</string>
@@ -2217,7 +2257,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Umsebenzisi"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Iphrofayela evinjelwe"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Engeza umsebenzisi omusha?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Ungabelana ngale divayisi nabanye abantu ngokudala abasebenzisi abangeziwe. Umsebenzisi ngamunye unesikhala sakhe, angasenza ngezifiso ngezinhlelo zakhe zokusebenza, uphephadonga, najalo njalo. Abasebenzisi futhi bangashintsha izilungiselelo zedivayisi njenge-Wi‑Fi ethinta wonke umuntu.\n\nUma ungeza umsebenzisi omusha, loyo muntu udinga ukusetha isikhala sakhe.\n\nNoma yimuphi umsebenzisi angabuyekeza izinhlelo zokusebenza zabo bonke abasebenzisi."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Ungabelana ngale divayisi nabanye abantu ngokudala abasebenzisi abangeziwe. Umsebenzisi ngamunye unesikhala sakhe, angasenza ngokwezifiso ngezinhlelo zokusebenza, isithombe esingemuva, njalo njalo. Abasebenzisi bangaphinda balungise izilungiselelo zedivayisi ezifana ne-Wi-Fi ezithinta wonke umuntu.\n\nUma ungeza umsebenzisi omusha, loyo muntu udinga ukusetha isikhala sakhe.\n\nNoma yimuphi umsebenzisi angabuyekeza izinhlelo zokusebenza kubo bonke abanye abasebenzisi."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Uma ungeza umsebenzisi omusha, loyo muntu udinga ukusetha isikhala sakhe.\n\nNoma yimuphi umsebenzisi angabuyekeza izinhlelo zokusebenza kubo bonke abasebenzisi."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Setha umsebenzisi manje?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Qinisekisa ukuthi umuntu uyatholakala ukuze athathe idivayisi futhi asethe isikhala sakhe"</string>
@@ -2400,6 +2440,7 @@
     <string name="keywords_emergency_app" msgid="6542122071127391103">"okuzenzakalelayo kohlelo lokusebenza lwe-ice lesimo esiphuthumayo"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"izinhlelo zokusebenza zilanda isistimu yezinhleloz kusebenza"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"ukuvikeleka kwezimvume zezinhlelo zokusebenza"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"okuzenzakalelayo kwezinhlelo zokusebenza"</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>
@@ -2414,14 +2455,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Ivolumu ye-alamu"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Ivolumu yokukhala"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Ivolumu yesaziso"</string>
-    <string name="zen_mode_settings_title" msgid="6948120138640252732">"Vimba iziphazamiso"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Okubalulekile kuvumela kuphela"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Izimiso ezizenzakalelayo"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Uma kufika amakholi nezaziso"</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_alarms" msgid="7380265858042606857">"Vumela ama-alamu kuphela"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ungaphazamisi"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Okubalulekile kuphela"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Ama-alamu kuphela"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Azikho iziphazamiso"</string>
+    <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Iringithoni yefoni"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Ithoni yokukhala yezaziso ezenzakalelayo"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Iyadlidliza uma kungena amakholi"</string>
@@ -2454,15 +2493,6 @@
     <string name="no_notification_listeners" msgid="2767405417723149879">"Abekho abalaleli besaziso abafakiwe."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Nika amandla i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"I-<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> izokwazi ukufunda zonke izaziso eziposwe isistimu noma yinoma yiluphi uhlelo lokusebenza olufakiwe, olungase lufake ulwazi lomuntu siqu njengamagama oxhumana nabo nemilayezo yombhalo ethunyelwe kuwe. Izokwazi futhi ukucashisa lezi zaziso noma ukuthinta amabhathini esenzo aphakathi kwawo."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Izihlinzeki zesimo"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Azikho izinhlelo zokusebenza ezinikeza ngezimo"</string>
-    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
-      <item quantity="one">%d izinhlelo zokusebenza zinikeza ngezimo</item>
-      <item quantity="other">%d izinhlelo zokusebenza zinikeza ngezimo</item>
-    </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Azikho izihlinzeki zesimo ezifakiwe."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Nika amandla i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"I-<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> izokwazi ukungeza izimo zokuphuma kumodi yokungaphazamisi."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ilayisha izinhlelo zokusebenza..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Vimbela konke"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ungalokothi ubonise izaziso kusuka kulolu hlelo lokusebenza"</string>
@@ -2476,17 +2506,23 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Okubalulekile"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Ukuzwela"</string>
     <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_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="zen_mode_rule_name" msgid="5149068059383837549">"Igama lesimiso"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Engeza isimiso"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Susa isimiso"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Susa isimiso se-\"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Susa"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Uhlobo lomyalo"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Akwaziwa"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Lungiselela isimiso"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Shejula umyalo"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Isimiso asitholiwe."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Izinsuku"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Lutho"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Nsuku zonke"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Akusoze"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> ukuya ku-<xliff:g id="END">%2$s</xliff:g>"</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>
@@ -2496,15 +2532,76 @@
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Ama-alamu"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Izikhumbuzi"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Imicimbi"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Khetha abafonayo"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Phinda abafonayo"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Uma umuntu ofanayo ashaya ngesikhathi sesibili ngaphakathi kwesikhathi samaminithi angu-<xliff:g id="MINUTES">%d</xliff:g>, kuvumele"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Vula ngokuzenzakalela"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Akusoze"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Njalo ngobusuku"</string>
     <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_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="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> usuku olulandelayo"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_title (855256211259132964) -->
+    <skip />
+    <!-- no translation found for zen_mode_interruptions_voice_header (2888750427673157270) -->
+    <skip />
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Ungathanda ukuphazanyiswa nini?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Isikhathi esingakanani?"</string>
+    <!-- no translation found for zen_mode_option_voice_all_interruptions (9222054216334506341) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_all_interruptions_synonyms (475880955609403705) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_interruptions (3695277268139705627) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (6120004096615029102) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms (5961982397880688359) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (7463720676061371446) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions (351955012579170932) -->
+    <skip />
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (6196235656198436233) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Unaphakade"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> amaminithi</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> amaminithi</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> amahora</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> amahora</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Guqulela kuzaziso ezibalulekile kuphela unaphakade"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Guqulela kuzaziso ezibalulekile kuphela ngamaminithi angu-<xliff:g id="DURATION">%1$d</xliff:g> kuze kube ngu-<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Guqulela kuzaziso ezibalulekile kuphela ngamaminithi angu-<xliff:g id="DURATION">%1$d</xliff:g> kuze kube ngu-<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Guqulela kuzaziso ezibalulekile kuphela ngamahora angu-<xliff:g id="DURATION">%1$d</xliff:g> (kuze kube ngu-<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Guqulela kuzaziso ezibalulekile kuphela ngamahora angu-<xliff:g id="DURATION">%1$d</xliff:g> (kuze kube ngu-<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Guqulela kuma-alamu kuphela unaphakade"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">Guqulela kuma-alamu ngamaminithi angu-<xliff:g id="DURATION">%1$d</xliff:g> (kuze kube ngu-<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Guqulela kuma-alamu ngamaminithi angu-<xliff:g id="DURATION">%1$d</xliff:g> (kuze kube ngu-<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="one">Guqulela kuma-alamu kuphela ngamahora angu-<xliff:g id="DURATION">%1$d</xliff:g> kuze kube ngu-<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Guqulela kuma-alamu kuphela ngamahora angu-<xliff:g id="DURATION">%1$d</xliff:g> kuze kube ngu-<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Guqulela kukungaphazamisi ngunaphakade"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Guqulela kukungaphazamisi ngamaminithi angu-<xliff:g id="DURATION">%1$d</xliff:g> (kuze kube ngu-<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Guqulela kukungaphazamisi ngamaminithi angu-<xliff:g id="DURATION">%1$d</xliff:g> (kuze kube ngu-<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Guqulela kukungaphazamisi ngamahora angu-<xliff:g id="DURATION">%1$d</xliff:g> kuze kube ngu-<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Guqulela kukungaphazamisi ngamahora angu-<xliff:g id="DURATION">%1$d</xliff:g> kuze kube ngu-<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Guqulela kuhlala uphazamisa"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"phakade"</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>
@@ -2569,7 +2666,10 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> izimvume zinikeziwe</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> izimvume zinikeziwe</item>
     </plurals>
-    <!-- no translation found for runtime_permissions_summary (1564663886246010959) -->
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> yezimvume ezingu-<xliff:g id="COUNT_3">%d</xliff:g> zinikeziwe</item>
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> yezimvume ezingu-<xliff:g id="COUNT_3">%d</xliff:g> zinikeziwe</item>
+    </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Okunye okuzenzakalelayo okusethiwe"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Akukho okuzenzakalelayo okusethiwe"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Zonke izinhlelo zokusebenza"</string>
@@ -2580,8 +2680,7 @@
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Okubalulekile"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Ukuzwela"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Nama-URL wesizinda"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Setha kabusha izintandokazi kuzo zonke izinhlelo zokusebenza kwezizenzakalelayo"</string>
-    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> izinhlelo zokusebenza ezifakiwe, kufaka phakathi isistimu nezinhlelo zokusebenza ezilandekayo"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Ikhutshazwe ngumlawuli"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Okuthuthukisiwe"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Uhlelo lokusebenza olungaziwa"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Khetha iphrofayela"</string>
@@ -2596,4 +2695,11 @@
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> izinhlelo zokusebenza zingavula ama-URL wesizinda sawo</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> izinhlelo zokusebenza zingavula ama-URL wesizinda sawo</item>
     </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Akubonwa"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Izinhlelo zokusebenza ezizenzakalelayo"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Uhlelo lokusebenza lwesiphequluli"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Asikho isiphequluli esizenzakalelayo"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Okuzenzakalelayo)"</string>
+    <!-- no translation found for apps_storage (4353308027210435513) -->
+    <skip />
 </resources>
diff --git a/res/values/aliases.xml b/res/values/aliases.xml
index 97a50c5..248ac71 100644
--- a/res/values/aliases.xml
+++ b/res/values/aliases.xml
@@ -15,7 +15,8 @@
 -->
 
 <resources>
-    <item name="notification_app_section" type="layout">@*android:layout/preference_category_material
-    </item>
+     <item name="notification_app_section" type="layout">@*android:layout/preference_category_material</item>
+     <item name="confirm_lock_pattern" type="layout">@layout/confirm_lock_pattern_base</item>
+     <item name="confirm_lock_password" type="layout">@layout/confirm_lock_password_base</item>
 </resources>
 
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 22c351c..16f1970 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -316,6 +316,12 @@
         <item>TTLS</item>
         <!-- Do not translate. -->
         <item>PWD</item>
+        <!-- Do not translate. -->
+        <item>SIM</item>
+        <!-- Do not translate. -->
+        <item>AKA</item>
+        <!-- Do not translate. -->
+        <item>AKA\'</item>
     </string-array>
 
    <!-- Wi-Fi WPS setup for p2p connections.  -->
@@ -1210,20 +1216,6 @@
         <item>3</item>
     </string-array>
 
-    <!-- Setting display values for zen mode -->
-    <string-array name="entries_zen_mode">
-        <item>Off</item>
-        <item>Limited interruptions</item>
-        <item>Zero interruptions</item>
-    </string-array>
-
-    <!-- Setting values for zen mode, must match the Settings.Global.ZEN_MODE_ constants -->
-    <string-array name="entryvalues_zen_mode" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-    </string-array>
-
     <!-- Battery saver mode: allowable trigger threshold levels. -->
     <integer-array name="battery_saver_trigger_values" translatable="false" >
         <item>0</item>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 1fe36d6..248cf92 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -109,4 +109,8 @@
     <attr name="switchBarMarginEnd" format="dimension" />
 
     <attr name="preferenceBackgroundColor" format="color" />
+
+    <!-- Confirm device credentials screen -->
+    <attr name="confirmDeviceCredentialsSideMargin" format="dimension" />
+    <attr name="confirmDeviceCredentialsTopMargin" format="dimension" />
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 97ba2ed..dd7382f 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -17,6 +17,7 @@
 <resources>
     <color name="black">#000</color>
     <color name="red">#F00</color>
+    <color name="blue">#00F</color>
 
     <color name="material_empty_color_light">#FFCED7DB</color>
 
@@ -43,17 +44,17 @@
     <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_success_color_light">@color/suw_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="lock_pattern_background">#00000000</color>
     <color name="lock_pattern_view_regular_color">#ff37474f</color>
-    <color name="lock_pattern_view_error_color">#fff4511e</color>
+    <color name="lock_pattern_view_error_color">@color/warning</color>
+
+    <color name="lock_pattern_view_regular_color_dark">#ffffff</color>
 
     <color name="unlock_pattern_view_regular_color">@android:color/white</color>
     <color name="unlock_pattern_view_error_color">#fff4511e</color>
@@ -76,4 +77,9 @@
     <color name="wifi_divider">#ffe0e0e0</color>
     <color name="sim_noitification">@*android:color/material_deep_teal_500</color>
 
+    <color name="warning">#ff5621</color>
+    <color name="confirm_device_credential_dark_background">#263238</color>
+    <color name="fab_ripple">#1fffffff</color><!-- 12% white -->
+    <color name="fab_shape">#ff009688</color><!-- Teal 500 -->
+    <color name="voice_interaction_highlight">#33b5e5</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 580ae22..8a58c5c 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -90,8 +90,8 @@
     <dimen name="notification_app_icon_size">64dp</dimen>
     <dimen name="notification_app_icon_badge_size">20dp</dimen>
     <dimen name="notification_app_icon_badge_margin">4dp</dimen>
-    <dimen name="zen_downtime_checkbox_padding">7dp</dimen>
-    <dimen name="zen_downtime_margin">17dp</dimen>
+    <dimen name="zen_schedule_rule_checkbox_padding">7dp</dimen>
+    <dimen name="zen_schedule_day_margin">17dp</dimen>
 
     <!-- Default text size for caption preview samples. Uses dp rather than sp because captions are not scaled. -->
     <dimen name="caption_preview_text_size">48dp</dimen>
@@ -238,4 +238,9 @@
     <dimen name="fingerprint_ring_radius">96dip</dimen>
     <dimen name="fingerprint_ring_thickness">4dip</dimen>
 
+    <dimen name="confirm_credentials_security_method_margin">48dp</dimen>
+    <dimen name="fab_size">56dp</dimen>
+    <dimen name="fab_margin">16dp</dimen>
+    <dimen name="fab_elevation">12dp</dimen>
+    <dimen name="fab_press_translation_z">9dp</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 16925d0..5546cc4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -16,16 +16,12 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Strings for Dialog yes button -->
     <string name="yes">"Yes"</string>
-
     <!-- Strings for Dialog no button -->
     <string name="no">"No"</string>
-
     <!-- Strings for Dialog create button -->
     <string name="create">Create</string>
-
     <!-- Strings for Dialog allow button -->
     <string name="allow">Allow</string>
-
     <!-- Strings for Dialog deny button -->
     <string name="deny">Deny</string>
 
@@ -586,24 +582,14 @@
 
     <!-- Button label for generic cancel action [CHAR LIMIT=20] -->
     <string name="cancel">Cancel</string>
-
-    <!-- Button label for generic cancel action in all caps [CHAR LIMIT=20] -->
-    <string name="cancel_all_caps">CANCEL</string>
-
-    <!-- Button label for generic continue action in all caps [CHAR LIMIT=20] -->
-    <string name="continue_all_caps">CONTINUE</string>
-
     <!-- Button label for generic OK action [CHAR LIMIT=20] -->
     <string name="okay">OK</string>
-
-    <!-- Button label for generic YES action [CHAR LIMIT=20] -->
-    <string name="yes_all_caps">YES</string>
-
-    <!-- Button label for generic NO action [CHAR LIMIT=20] -->
-    <string name="no_all_caps">NO</string>
-
-    <!-- Button label for generic FORGET action [CHAR LIMIT=20] -->
-    <string name="forget">FORGET</string>
+    <!-- Button label for generic forget action [CHAR LIMIT=20] -->
+    <string name="forget">Forget</string>
+    <!-- Button label for generic save action [CHAR LIMIT=20] -->
+    <string name="save">Save</string>
+    <!-- Button label for generic done action [CHAR LIMIT=20] -->
+    <string name="done">Done</string>
 
     <!-- Title of the Settings activity shown within the application itself. -->
     <string name="settings_label">Settings</string>
@@ -844,12 +830,6 @@
     <string name="crypt_keeper_dialog_need_password_message">You need to set a lock screen PIN or
     password before you can start encryption.</string>
 
-    <!-- String at bottom of screen when prompting for pattern.
-         Note: This is only for the pattern case. -->
-    <string name="crypt_keeper_confirm_encrypt">
-    You need to draw your unlock pattern to confirm encrypting your device.
-    </string>
-
     <!-- Title of the final confirmation screen before starting device encryption -->
     <string name="crypt_keeper_confirm_title">Encrypt?</string>
     <!-- Warning text in the final confirmation screen before starting device encryption -->
@@ -1249,9 +1229,11 @@
     <!-- Message to describe "BLE scan always available feature" when Bluetooth is off. The
       place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring
       the user to "scanning settings" screen. -->
-    <string name="ble_scan_notify_text">To improve location accuracy, Google services will scan for
-        Bluetooth devices, even when Bluetooth is off. You can change this in LINK_BEGINscanning
-        settingsLINK_END.</string>
+    <string name="ble_scan_notify_text">To improve location accuracy, apps and
+        services will scan for Bluetooth devices, even when Bluetooth is off.
+        You can change this in
+        <xliff:g id="link_begin">LINK_BEGIN</xliff:g>scanning
+        settings<xliff:g id="link_end">LINK_END</xliff:g>.</string>
 
 
     <!-- Bluetooth settings.  The title of the screen to pick which profiles to connect to on the device.  For example, headphones may have both A2DP and headset, this allows the user to choose which one he wants to connect to. -->
@@ -1425,9 +1407,11 @@
     <!-- Message to describe "Wi-Fi scan always available feature" when Wi-Fi is off. The
       place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring
       the user to "scanning settings" screen. -->
-    <string name="wifi_scan_notify_text">To improve location accuracy, Google services will scan for
-        Wi\u2011Fi networks, even when Wi\u2011Fi is off. You can change this in LINK_BEGINscanning
-        settingsLINK_END.</string>
+    <string name="wifi_scan_notify_text">To improve location accuracy, apps and
+        services will scan for Wi\u2011Fi networks, even when Wi\u2011Fi is off.
+        You can change this in
+        <xliff:g id="link_begin">LINK_BEGIN</xliff:g>scanning
+        settings<xliff:g id="link_end">LINK_END</xliff:g>.</string>
     <!-- Wifi scan always mode checkbox text -->
     <string name="wifi_scan_notify_remember_choice">Don\'t show again</string>
     <!-- Setting title for setting the wifi sleep policy. Do we keep Wi-Fi active when the screen turns off? -->
@@ -1460,10 +1444,6 @@
     <string name="wifi_menu_scan">Scan</string>
     <!-- Menu option to Wi-Fi advanced settings -->
     <string name="wifi_menu_advanced">Advanced</string>
-    <!-- Menu option to show app icons instead of WiFi strength [CHAR LIMIT=20]-->
-    <string name="wifi_menu_apps">Show Apps</string>
-    <!-- Menu option to show WiFi strength icons [CHAR LIMIT=20]-->
-    <string name="wifi_menu_apps_strength">Show WiFi Strength</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 -->
@@ -1486,8 +1466,6 @@
     <string name="wifi_more">More</string>
     <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
     <string name="wifi_setup_wps">Automatic setup (WPS)</string>
-    <!-- Message informing that wifi is required during setup [CHAR LIMIT=NONE] -->
-    <string name="wifi_required_info_text">To complete setup, your tablet needs access to Wi\u2011Fi. After setup, you can switch between cellular data and Wi\u2011Fi.</string>
 
     <!-- Dialog for Access Points --> <skip />
     <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
@@ -1584,6 +1562,10 @@
     <!-- Wifi settings button to connect in to a Hotspot. [CHAR LIMIT=50]-->
     <string name="wifi_hotspot_connect">CONNECT</string>
 
+    <!-- Dialog text to tell the user that the selected network does not have Internet access. -->
+    <string name="no_internet_access_text">This network has no Internet access. Use this network anyway?</string>
+    <string name="no_internet_access_remember">Don\'t ask again for this network</string>
+
     <!-- Button label to connect to a Wi-Fi network -->
     <string name="wifi_connect">Connect</string>
     <!-- Failured notification for connect -->
@@ -1823,12 +1805,10 @@
     <string-array name="wifi_calling_mode_choices">
         <item>Wi-Fi preferred</item>
         <item>Cellular preferred</item>
-        <item>Wi-Fi only</item>
     </string-array>
     <string-array name="wifi_calling_mode_values">
         <item>"2"</item>
         <item>"1"</item>
-        <item>"0"</item>
     </string-array>
     <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
     <string name="wifi_calling_off_explanation">When Wi-Fi calling is on, your phone can route calls via Wi-Fi networks or your carrier\'s network, depending on your preference and which signal is stronger. Before turning on this feature, check with your carrier regarding fees and other details.</string>
@@ -2195,7 +2175,7 @@
     <!-- SD card & phone storage settings summary. Displayed when the total memory usage is being calculated. Will be replaced with a number like "12.3 GB" when finished calucating. [CHAR LIMIT=30] -->
     <string name="memory_calculating_size">Calculating\u2026</string>
     <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of applications installed. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
-    <string name="memory_apps_usage">Apps (app data &amp; media content)</string>
+    <string name="memory_apps_usage">Apps &amp; app data</string>
     <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of media on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
     <string name="memory_media_usage">Media</string>
     <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of /sdcard/Download on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
@@ -2205,7 +2185,7 @@
     <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of audio files in /sdcard on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
     <string name="memory_music_usage">Audio (music, ringtones, podcasts, etc.)</string>
     <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of misc files on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
-    <string name="memory_media_misc_usage">Misc.</string>
+    <string name="memory_media_misc_usage">Other files</string>
     <!-- Storage item representing all cached data on device. [CHAR LIMIT=48] -->
     <string name="memory_media_cache_usage">Cached data</string>
     <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   [CHAR LIMIT=25] -->
@@ -2280,6 +2260,16 @@
     <!-- Settings item summary when storage is running low [CHAR LIMIT=NONE] -->
     <string name="storage_low_summary">Some system functions, such as syncing, may not work correctly. Try to free space by deleting or unpinning items, such as apps or media content.</string>
 
+    <!-- Storage setting.  Menu option for renaming a storage device [CHAR LIMIT=30]-->
+    <string name="storage_menu_rename">Rename</string>
+    <!-- Storage setting.  Menu option for mounting a storage device [CHAR LIMIT=30]-->
+    <string name="storage_menu_mount">Mount</string>
+    <!-- Storage setting.  Menu option for unmounting a storage device [CHAR LIMIT=30]-->
+    <string name="storage_menu_unmount">Eject</string>
+    <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+    <string name="storage_menu_format">Erase &amp; format</string>
+    <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+    <string name="storage_menu_format_internal">Erase &amp; format as internal storage</string>
     <!-- Storage setting.  Menu option for USB transfer settings [CHAR LIMIT=30]-->
     <string name="storage_menu_usb">USB computer connection</string>
 
@@ -2303,6 +2293,125 @@
     <!-- Section header above list of other users storage [CHAR LIMIT=32] -->
     <string name="storage_other_users">Other users</string>
 
+    <!-- Section header above list of internal storage devices [CHAR LIMIT=30]-->
+    <string name="storage_internal_title">Device storage</string>
+    <!-- Section header above list of external storage devices [CHAR LIMIT=30]-->
+    <string name="storage_external_title">Removable storage</string>
+
+    <!-- Summary of a single storage volume, constrasting available and total storage space. [CHAR LIMIT=48]-->
+    <string name="storage_volume_summary"><xliff:g id="free" example="1.2GB">%1$s</xliff:g> free (Total <xliff:g id="total" example="32GB">%2$s</xliff:g>)</string>
+
+    <!-- Toast informing that storage mount operation was successful. [CHAR LIMIT=64]-->
+    <string name="storage_mount_success"><xliff:g id="name" example="SD card">%1$s</xliff:g> is mounted</string>
+    <!-- Toast informing that storage unmount operation failed. [CHAR LIMIT=64]-->
+    <string name="storage_mount_failure">Couldn\'t mount <xliff:g id="name" example="SD card">%1$s</xliff:g></string>
+
+    <!-- Toast informing that storage unmount operation was successful. [CHAR LIMIT=64]-->
+    <string name="storage_unmount_success"><xliff:g id="name" example="SD card">%1$s</xliff:g> is safely ejected</string>
+    <!-- Toast informing that storage unmount operation failed. [CHAR LIMIT=64]-->
+    <string name="storage_unmount_failure">Couldn\'t safely eject <xliff:g id="name" example="SD card">%1$s</xliff:g></string>
+
+    <!-- Toast informing that storage format operation was successful. [CHAR LIMIT=64]-->
+    <string name="storage_format_success"><xliff:g id="name" example="SD card">%1$s</xliff:g> is formatted</string>
+    <!-- Toast informing that storage format operation failed. [CHAR LIMIT=64]-->
+    <string name="storage_format_failure">Couldn\'t format <xliff:g id="name" example="SD card">%1$s</xliff:g></string>
+
+    <!-- Title of dialog prompting user to rename a storage volume [CHAR LIMIT=32]-->
+    <string name="storage_rename_title">Rename storage</string>
+
+    <!-- Body of dialog informing user about consequences of formatting an internal storage device [CHAR LIMIT=NONE]-->
+    <string name="storage_internal_format_details">After formatting, you can use this <xliff:g id="name" example="SD card">^1</xliff:g> in other devices.
+\n\nAll data on this <xliff:g id="name" example="SD card">^1</xliff:g> will be erased. Consider backing up first.
+\n\n<b>Back up photos &amp; other media</b>
+\nMove your media files to alternative storage on this device, or transfer them to a computer using a USB cable.
+\n\n<b>Back up apps</b>
+\nAll apps stored on this <xliff:g id="name" example="SD card">^1</xliff:g> will be uninstalled and their data will be erased. To keep these apps, move them to alternative storage on this device.</string>
+
+    <!-- Body of dialog informing user about consequences of ejecting an internal storage device [CHAR LIMIT=NONE]-->
+    <string name="storage_internal_unmount_details"><b>When you eject this <xliff:g id="name" example="SD card">^1</xliff:g>, apps stored on it will stop working, and media files stored on it will not be available until it is reinserted.</b>
+\n\nThis <xliff:g id="name" example="SD card">^1</xliff:g> is formatted to work on this device only.  It won\'t work on any others.</string>
+
+    <!-- Title of wizard step prompting user to setup a storage device [CHAR LIMIT=32] -->
+    <string name="storage_wizard_init_title">Set up your <xliff:g id="name" example="SD card">^1</xliff:g></string>
+    <!-- Title of wizard choice to use storage device as external storage [CHAR LIMIT=64] -->
+    <string name="storage_wizard_init_external_title">Use as portable storage</string>
+    <!-- Summary of wizard choice to use storage device as external storage [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_init_external_summary">For moving photos and other media between devices.</string>
+    <!-- Title of wizard choice to use storage device as internal storage [CHAR LIMIT=64] -->
+    <string name="storage_wizard_init_internal_title">Use as internal storage</string>
+    <!-- Summary of wizard choice to use storage device as internal storage [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_init_internal_summary">For storing anything on this device only, including apps and photos. Requires formatting that prevents it from working with other devices.</string>
+
+    <!-- Title of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+    <string name="storage_wizard_format_confirm_title">Format as internal storage</string>
+    <!-- Body of wizard step prompting user to format a storage device [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_format_confirm_body">This requires the <xliff:g id="name" example="SD card">^1</xliff:g> to be formatted to make it secure.
+\n\nAfter formatting, this <xliff:g id="name" example="SD card">^1</xliff:g> will only work in this device.
+\n\n<b>Formatting erases all data currently stored on the <xliff:g id="name" example="SD card">^1</xliff:g>.</b> To avoid losing the data, consider backing it up.
+    </string>
+    <!-- Next button text of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+    <string name="storage_wizard_format_confirm_next">Erase &amp; format</string>
+
+    <!-- Title of wizard step showing formatting progress [CHAR LIMIT=32] -->
+    <string name="storage_wizard_format_progress_title">Formatting <xliff:g id="name" example="SD card">^1</xliff:g>\u2026</string>
+    <!-- Body of wizard step showing formatting progress [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_format_progress_body">Don\'t remove the <xliff:g id="name" example="SD card">^1</xliff:g> while it\'s formatting.</string>
+
+    <!-- Title of wizard step prompting user to migrate data to new storage [CHAR LIMIT=32] -->
+    <string name="storage_wizard_migrate_title">Move data to new storage</string>
+    <!-- Body of wizard step prompting user to migrate data to new storage [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_migrate_body">You can move your photos, files, and app data to this new <xliff:g id="name" example="SD card">^1</xliff:g>.
+\n\nThe move takes about <xliff:g id="time" example="1 hour">^2</xliff:g> and will free <xliff:g id="size" example="1.2 GB">^3</xliff:g> on internal storage. Some apps won\'t work while it\'s underway.
+    </string>
+    <!-- Title of wizard choice to migrate data right now [CHAR LIMIT=64] -->
+    <string name="storage_wizard_migrate_now">Move now</string>
+    <!-- Title of wizard choice to migrate data at later time [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_migrate_later">Move later</string>
+
+    <!-- Title of wizard step prompting user to start data migration [CHAR LIMIT=32] -->
+    <string name="storage_wizard_migrate_confirm_title">Move data now</string>
+    <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_migrate_confirm_body"><b>The move takes about <xliff:g id="time" example="1 hour">^1</xliff:g>. It will free <xliff:g id="size" example="1.2 GB">^2</xliff:g> of internal storage.</b></string>
+    <!-- Title of wizard button prompting user to start data migration [CHAR LIMIT=32] -->
+    <string name="storage_wizard_migrate_confirm_next">Move</string>
+
+    <!-- Title of wizard step showing migration progress [CHAR LIMIT=32] -->
+    <string name="storage_wizard_migrate_progress_title">Moving data\u2026</string>
+
+    <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_migrate_details">During the move:
+\n\u2022 Don\'t remove the <xliff:g id="name" example="SD card">^1</xliff:g>.
+\n\u2022 Some apps won\'t work correctly.
+\n\u2022 Keep the device charged.
+    </string>
+
+    <!-- Title of wizard step indicating that storage is ready [CHAR LIMIT=32] -->
+    <string name="storage_wizard_ready_title"><xliff:g id="name" example="SD card">^1</xliff:g> is ready</string>
+    <!-- Body of wizard step indicating that external storage is ready [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_ready_external_body">
+        Your <xliff:g id="name" example="SD card">^1</xliff:g> is all set to use with photos and other media.
+    </string>
+    <!-- Body of wizard step indicating that internal storage is ready [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_ready_internal_body">Your new <xliff:g id="name" example="SD card">^1</xliff:g> is working.
+\n\nTo move photos, files, and app data to this device, go to Settings > Storage.
+    </string>
+
+    <!-- Title of wizard step prompting user to move an app [CHAR LIMIT=32] -->
+    <string name="storage_wizard_move_confirm_title">Move <xliff:g id="app" example="Calculator">^1</xliff:g></string>
+    <!-- Body of wizard step prompting user to move an app [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_move_confirm_body">Moving <xliff:g id="app" example="Calculator">^1</xliff:g> and its data to <xliff:g id="name" example="SD card">^2</xliff:g> will take only a few moments. You won\'t be able to use the app until the move is complete.
+\n\nDon\'t remove the <xliff:g id="name" example="SD card">^2</xliff:g> during the move.
+    </string>
+
+    <!-- Title of wizard step showing app move progress [CHAR LIMIT=32] -->
+    <string name="storage_wizard_move_progress_title">Moving <xliff:g id="app" example="Calculator">^1</xliff:g>\u2026</string>
+    <!-- Body of wizard step showing app move progress [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_move_progress_body">Don\'t remove the <xliff:g id="name" example="SD card">^1</xliff:g> during the move.
+\n\nThe <xliff:g id="app" example="Calculator">^2</xliff:g> app on this device won\'t be available until the move is complete.
+    </string>
+    <!-- Title of wizard button offering to cancel move [CHAR LIMIT=32] -->
+    <string name="storage_wizard_move_progress_cancel">Cancel move</string>
+
     <!-- Phone info screen, section titles: -->
     <string name="battery_status_title">Battery status</string>
     <!-- Phone info screen, section titles: -->
@@ -2394,19 +2503,17 @@
     <!-- SD card & phone storage settings screen, setting option name under Backup & Restore heading -->
     <string name="reset_network_title">Network settings reset</string>
     <!-- SD card & phone storage settings screen, message on screen after user selects Reset network settings [CHAR LIMIT=NONE] -->
-    <string name="reset_network_desc">This will reset all settings related to networking to the factory defaults, including:\n\n<li>Wifi</li>\n<li>Mobile data</li>\n<li>Bluetooth</li>"</string>
+    <string name="reset_network_desc">This will reset all network settings, including:\n\n<li>Wi\u2011Fi</li>\n<li>Cellular data</li>\n<li>Bluetooth</li>"</string>
     <!-- SD card & phone storage settings screen, button on screen after user selects Reset network settings -->
     <string name="reset_network_button_text">Reset settings</string>
     <!-- SD card & phone storage settings screen, message on screen after user selects Reset settings button -->
-    <string name="reset_network_final_desc">Reset all network settings? You can\'t reverse this action!</string>
+    <string name="reset_network_final_desc">Reset all network settings? You can\'t undo this action!</string>
     <!-- SD card & phone storage settings screen, button on screen after user selects Reset settings button -->
     <string name="reset_network_final_button_text">Reset settings</string>
-    <!-- Explanation of drawing unlock pattern to reset settings -->
-    <string name="reset_network_gesture_explanation">You need to draw your unlock pattern to confirm a network settings reset.</string>
     <!-- Reset settings confirmation screen title [CHAR LIMIT=30] -->
     <string name="reset_network_confirm_title">Reset?</string>
     <!-- Reset settings complete toast text [CHAR LIMIT=75] -->
-    <string name="reset_network_complete_toast">Network settings reset</string>
+    <string name="reset_network_complete_toast">Network settings have been reset</string>
 
     <!-- Master Clear -->
     <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading [CHAR LIMIT=30] -->
@@ -2440,11 +2547,9 @@
     <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
     <string name="master_clear_button_text" product="default">Reset phone</string>
     <!-- SD card & phone storage settings screen, message on screen after user selects Reset phone button -->
-    <string name="master_clear_final_desc">Erase all your personal information and downloaded apps? You can\'t reverse this action!</string>
+    <string name="master_clear_final_desc">Erase all your personal information and downloaded apps? You can\'t undo 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>
-    <!-- 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 -->
     <string name="master_clear_failed">No reset was performed because the System Clear service isn\'t available.</string>
     <!-- Master clear confirmation screen title [CHAR LIMIT=30] -->
@@ -2479,10 +2584,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>
-    <!-- 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] -->
-    <string name="media_format_gesture_explanation" product="default">You need to draw your unlock pattern to confirm that you want to erase the SD card.</string>
 
     <!-- Main settings screen, Call settings title for item to go into the call settings -->
     <string name="call_settings_title">Call settings</string>
@@ -2555,7 +2656,7 @@
     <string name="manage_mobile_plan_title" translatable="true">Mobile plan</string>
 
     <!-- SMS Application [CHAR LIMIT=35]-->
-    <string name="sms_application_title" translatable="true">Default SMS app</string>
+    <string name="sms_application_title" translatable="true">SMS app</string>
     <string name="sms_change_default_dialog_title" translatable="true">Change SMS app?</string>
     <string name="sms_change_default_dialog_text" translatable="true">Use <xliff:g id="new_app">%1$s</xliff:g> instead of <xliff:g id="current_app">%2$s</xliff:g> as your SMS app?</string>
     <string name="sms_change_default_no_previous_dialog_text" translatable="true">Use <xliff:g id="new_app">%s</xliff:g> as your SMS app?</string>
@@ -2620,16 +2721,18 @@
     <string name="location_menu_scanning">Scanning</string>
     <!-- [CHAR LIMIT=30] Wireless background scanning settings screen, screen title -->
     <string name="location_scanning_screen_title">Scanning</string>
-    <!-- [CHAR LIMIT=130] Preference title for Wi-Fi always scanning [DO NOT TRANSLATE] -->
-    <string name="location_scanning_wifi_always_scanning_title">Wi\u2011Fi scanning always available</string>
-    <!-- Preference description text for Wi-Fi always scanning [DO NOT TRANSLATE] -->
-    <string name="location_scanning_wifi_always_scanning_description">The clear history button in
-        your browser has saved more lives than Superman</string>
-    <!-- [CHAR LIMIT=130] Description text for Bluetooth always scanning [DO NOT TRANSLATE] -->
-    <string name="location_scanning_bluetooth_always_scanning_title">Bluetooth scanning always available</string>
-    <!-- Description text for Bluetooth always scanning [DO NOT TRANSLATE] -->
-    <string name="location_scanning_bluetooth_always_scanning_description">If you want to catch a
-        squirrel just climb a tree and act like a nut</string>
+    <!-- [CHAR LIMIT=130] Preference title for Wi-Fi always scanning -->
+    <string name="location_scanning_wifi_always_scanning_title">Wi\u2011Fi scanning</string>
+    <!-- Preference description text for Wi-Fi always scanning -->
+    <string name="location_scanning_wifi_always_scanning_description">Improve
+        location by allowing apps and services to scan for Wi\u2011Fi networks
+        even when Wi\u2011Fi is off</string>
+    <!-- [CHAR LIMIT=130] Description text for Bluetooth always scanning -->
+    <string name="location_scanning_bluetooth_always_scanning_title">Bluetooth scanning</string>
+    <!-- Description text for Bluetooth always scanning -->
+    <string name="location_scanning_bluetooth_always_scanning_description">
+        Improve location by allowing system services to scan for Bluetooth
+        devices, even when Bluetooth is off</string>
 
     <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for Google location service (cell ID, wifi, etc.) -->
     <string name="location_network_based">Wi\u2011Fi &amp; cellular network location</string>
@@ -2733,6 +2836,26 @@
     <!-- Toast shown if setting pattern was successful -->
     <string name="lockpassword_pattern_set_toast">Pattern has been set</string>
 
+    <!-- Message to be used to explain the user that he needs to enter his pattern to continue a
+         particular operation. [CHAR LIMIT=70]-->
+    <string name="lockpassword_confirm_your_pattern_generic">Use your device pattern to continue.</string>
+    <!-- Message to be used to explain the user that he needs to enter his PIN to continue a
+         particular operation. [CHAR LIMIT=70]-->
+    <string name="lockpassword_confirm_your_pin_generic">Enter your device PIN to continue.</string>
+    <!-- Message to be used to explain the user that he needs to enter his password to continue a
+         particular operation. [CHAR LIMIT=70]-->
+    <string name="lockpassword_confirm_your_password_generic">Enter your device password to continue.</string>
+
+    <!-- Security & location settings screen, change security method screen instruction if user
+         enters incorrect PIN [CHAR LIMIT=30] -->
+    <string name="lockpassword_invalid_pin">Wrong PIN</string>
+    <!-- Security & location settings screen, change security method screen instruction if user
+         enters incorrect password [CHAR LIMIT=30] -->
+    <string name="lockpassword_invalid_password">Wrong password</string>
+    <!-- Security & location settings screen, change unlock pattern screen instruction if user
+         draws incorrect pattern [CHAR LIMIT=30] -->
+    <string name="lockpattern_need_to_unlock_wrong">Wrong pattern</string>
+
     <!-- Lock Pattern settings -->
     <!-- Security & location settings screen, header -->
     <string name="lock_settings_title">Device security</string>
@@ -2740,14 +2863,6 @@
     <string name="lockpattern_change_lock_pattern_label">Change unlock pattern</string>
     <!-- Security & location settings screen, change unlock pattern screen instruction when the user chooses "Change unlock pattern".  We first ask the user toe nter the current pattern, and this is the message seen -->
     <string name="lockpattern_change_lock_pin_label">Change unlock PIN</string>
-    <!-- Security & location settings screen, change unlock pattern screen instruction when the user chooses "Change unlock pattern".  We first ask the user toe nter the current pattern, and this is the message seen -->
-    <string name="lockpattern_need_to_unlock">Confirm saved pattern</string>
-    <!-- Do not translate. -->
-    <string name="lockpattern_need_to_unlock_footer" />
-    <!-- Security & location settings screen, change unlock pattern screen instruction if user draws incorrect pattern -->
-    <string name="lockpattern_need_to_unlock_wrong">Try again:</string>
-    <!-- Do not translate. -->
-    <string name="lockpattern_need_to_unlock_wrong_footer" />
     <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen.  This si when they are supposed to draw a new unlock pattern (for example, if they are changing their unlock patterns)..-->
     <string name="lockpattern_recording_intro_header">Draw an unlock pattern</string>
     <!-- Security & location settings screen, change unlock pattern screen hint on bottom of screen.  We are telling them to press the menu button to see more options or help. -->
@@ -2789,10 +2904,9 @@
     <string name="lockpattern_settings_change_lock_pattern">Change unlock pattern</string>
     <!-- Security & location settings screen, the help instructions (an animation) caption -->
     <string name="lockpattern_settings_help_how_to_record">How to draw an unlock pattern</string>
-    <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen after too many incorrect attempts -->
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header">Too many incorrect attempts!</string>
-    <!-- Security & location settings screen, change unlock pattern screen countdown hint on bottom of screen after too many incorrect attempts -->
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer">Try again in <xliff:g id="number">%d</xliff:g> seconds.</string>
+    <!-- Security & location settings screen, confirm unlock pattern screen hint at the bottom after
+         too many incorrect attempts [CHAR LIMIT=120]-->
+    <string name="lockpattern_too_many_failed_confirmation_attempts">Too many incorrect attempts. Try again in <xliff:g id="number">%d</xliff:g> seconds.</string>
     <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
     <string name="activity_not_found">Application is not installed on your phone.</string>
 
@@ -2903,7 +3017,7 @@
     <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Show background cached processes. -->
     <string name="show_background_processes">Show cached processes</string>
     <!-- [CHAR LIMIT=NONE] Advanced applications screen, preference title.  Choose the emergency application. -->
-    <string name="default_emergency_app">Default emergency app</string>
+    <string name="default_emergency_app">Emergency app</string>
     <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Reset all of user's app preferences. -->
     <string name="reset_app_preferences">Reset app preferences</string>
     <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Title of dialog to confirm resetting user's app preferences. -->
@@ -3379,10 +3493,6 @@
     <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 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 -->
@@ -4122,8 +4232,10 @@
     <string name="menu_duration_12h">12 hours</string>
     <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
     <string name="menu_duration_1d">1 day</string>
-    <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether system processes are shown -->
+    <!-- [CHAR LIMIT=NONE] Menu for manage apps to control whether system processes are shown -->
     <string name="menu_show_system">Show system</string>
+    <!-- [CHAR LIMIT=NONE] Menu for manage apps to control whether system processes are hidden -->
+    <string name="menu_hide_system">Hide system</string>
     <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether computation should be based
         on Uss (Unique Set Size) instead of Pss (Proportional Set Size) -->
     <string name="menu_use_uss">Use Uss</string>
@@ -4357,9 +4469,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>
 
-    <!-- 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>
-
     <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
     <string name="credentials_unlock"></string>
     <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
@@ -5262,7 +5371,7 @@
     <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
     <string name="user_add_user_title">Add new user?</string>
     <!-- Message for add user confirmation dialog - long version. [CHAR LIMIT=none] -->
-    <string name="user_add_user_message_long">You can share this device with other people by creating additional users. Each user has their own space, which they can customize with their own apps, wallpaper, and so on. Users can also adjust device settings like Wi\u2011Fi that affect everyone.\n\nWhen you add a new user, that person needs to set up their space.\n\nAny user can update apps for all other users.</string>
+    <string name="user_add_user_message_long">You can share this device with other people by creating additional users. Each user has their own space, which they can customize with apps, wallpaper, and so on. Users can also adjust device settings like Wi\u2011Fi that affect everyone.\n\nWhen you add a new user, that person needs to set up their space.\n\nAny user can update apps for all other users.</string>
     <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
     <string name="user_add_user_message_short">When you add a new user, that person needs to set up their space.\n\nAny user can update apps for all other users. </string>
     <!-- Title of dialog to setup a new user [CHAR LIMIT=30] -->
@@ -5396,6 +5505,34 @@
     <!--  Help URLs for some screens. Not specified here. Specified in product overlays --><skip/>
     <!-- Help menu label [CHAR LIMIT=20] -->
     <string name="help_label">Help &amp; feedback</string>
+
+    <!-- Help URI, Default [DO NOT TRANSLATE] -->
+    <string name="help_uri_default" translatable="false"></string>
+    <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
+    <string name="help_uri_dashboard" translatable="false"></string>
+    <!-- Help URI, Android beam [DO NOT TRANSLATE] -->
+    <string name="help_uri_beam" translatable="false"></string>
+    <!-- Help URI, Display [DO NOT TRANSLATE] -->
+    <string name="help_uri_display" translatable="false"></string>
+    <!-- Help URI, Wallpaper [DO NOT TRANSLATE] -->
+    <string name="help_uri_wallpaper" translatable="false"></string>
+    <!-- Help URI, Interruptions [DO NOT TRANSLATE] -->
+    <string name="help_uri_interruptions" translatable="false"></string>
+    <!-- Help URI, Other sounds [DO NOT TRANSLATE] -->
+    <string name="help_uri_other_sounds" translatable="false"></string>
+    <!-- Help URI, Notifications [DO NOT TRANSLATE] -->
+    <string name="help_uri_notifications" translatable="false"></string>
+    <!-- Help URI, Apps [DO NOT TRANSLATE] -->
+    <string name="help_uri_apps" translatable="false"></string>
+    <!-- Help URI, Storage [DO NOT TRANSLATE] -->
+    <string name="help_uri_storage" translatable="false"></string>
+    <!-- Help URI, Accessibility [DO NOT TRANSLATE] -->
+    <string name="help_uri_accessibility" translatable="false"></string>
+    <!-- Help URI, Printing [DO NOT TRANSLATE] -->
+    <string name="help_uri_printing" translatable="false"></string>
+    <!-- Help URI, About phone [DO NOT TRANSLATE] -->
+    <string name="help_uri_about" translatable="false"></string>
+
     <!-- Help URL, WiFi [DO NOT TRANSLATE] -->
     <string name="help_url_wifi" translatable="false"></string>
     <!-- Help URL, Bluetooth [DO NOT TRANSLATE] -->
@@ -5657,6 +5794,7 @@
     <string name="keywords_emergency_app">emergency ice app default</string>
     <string name="keywords_all_apps">apps download applications system</string>
     <string name="keywords_app_permissions">apps permissions security</string>
+    <string name="keywords_default_apps">apps default</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>
 
@@ -5699,7 +5837,7 @@
     <string name="notification_volume_option_title">Notification volume</string>
 
     <!-- Sound & notification > Sound section: Title for the Interruptions option and associated settings page. [CHAR LIMIT=30] -->
-    <string name="zen_mode_settings_title">Block interruptions</string>
+    <string name="zen_mode_settings_title" translatable="false">@*android:string/zen_mode_feature_name</string>
 
     <!-- Sound & notification > Sound section: Title for the Priority interruptions option and associated settings page. [CHAR LIMIT=30] -->
     <string name="zen_mode_priority_settings_title">Priority only allows</string>
@@ -5707,20 +5845,17 @@
     <!-- Sound & notification > Sound section: Title for the zen mode automation option and associated settings page. [CHAR LIMIT=30] -->
     <string name="zen_mode_automation_settings_title">Automatic rules</string>
 
-    <!-- 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: Zen mode option: Off [CHAR LIMIT=60] -->
-    <string name="zen_mode_option_off">Always interrupt</string>
-
     <!-- Sound & notification > Sound section: Zen mode option: Important interruptions [CHAR LIMIT=60] -->
-    <string name="zen_mode_option_important_interruptions">Allow only priority interruptions</string>
+    <string name="zen_mode_option_important_interruptions">Priority only</string>
 
     <!-- Sound & notification > Sound section: Zen mode option: Alarms only [CHAR LIMIT=60] -->
-    <string name="zen_mode_option_alarms">Allow only alarms</string>
+    <string name="zen_mode_option_alarms">Alarms only</string>
 
     <!-- Sound & notification > Sound section: Zen mode option: No interruptions [CHAR LIMIT=60] -->
-    <string name="zen_mode_option_no_interruptions">Don\'t interrupt</string>
+    <string name="zen_mode_option_no_interruptions">No interruptions</string>
+
+    <!-- Sound & notification > Sound section: Zen mode combined summary + condition line [CHAR LIMIT=60] -->
+    <string name="zen_mode_summary_combination"><xliff:g id="mode" example="Priority only">%1$s</xliff:g>: <xliff:g id="exit condition" example="Until you turn this off">%2$s</xliff:g></string>
 
     <!-- Sound & notification > Sound section: Title for the option defining the phone ringtone. [CHAR LIMIT=30] -->
     <string name="ringtone_title">Phone ringtone</string>
@@ -5825,32 +5960,6 @@
         to dismiss these notifications or touch action buttons within them.
     </string>
 
-    <!-- Title of preference to manage condition providers -->
-    <string name="manage_condition_providers">Condition providers</string>
-
-    <!-- Summary of preference to manage condition providers, when none are enabled -->
-    <string name="manage_condition_providers_summary_zero">No apps provide conditions</string>
-
-    <!-- Summary of preference to manage condition providers, when one or more are enabled -->
-    <plurals name="manage_condition_providers_summary_nonzero">
-        <item quantity="one">%d app provides conditions</item>
-        <item quantity="other">%d apps provide conditions</item>
-    </plurals>
-
-    <!-- String to show in the list of condition providers, when none is installed -->
-    <string name="no_condition_providers">No condition providers are installed.</string>
-
-    <!-- Title for a warning message about security implications of enabling a condition
-          provider, displayed as a dialog message. [CHAR LIMIT=NONE] -->
-    <string name="condition_provider_security_warning_title">Enable
-         <xliff:g id="service" example="ConditionProvider">%1$s</xliff:g>?</string>
-    <!-- Summary for a warning message about security implications of enabling a condition
-          provider, displayed as a dialog message. [CHAR LIMIT=NONE] -->
-    <string name="condition_provider_security_warning_summary">
-        <xliff:g id="condition_provider_name">%1$s</xliff:g> will be able to
-        add exit conditions to Do not disturb mode.
-    </string>
-
     <!-- [CHAR LIMIT=NONE] Text when loading app list in notification settings -->
     <string name="loading_notification_apps">Loading apps...</string>
 
@@ -5890,38 +5999,56 @@
     <!-- [CHAR LIMIT=20] Notification settings: App notifications dialog dismiss button caption -->
     <string name="app_notifications_dialog_done">Done</string>
 
-    <!-- [CHAR LIMIT=30] Zen mode settings: Exit condition selection dialog, default option -->
-    <string name="zen_mode_default_option">Until you turn this off</string>
+    <!-- [CHAR LIMIT=40] Zen mode settings: Rule name option and edit dialog title -->
+    <string name="zen_mode_rule_name">Rule name</string>
 
-    <!-- [CHAR LIMIT=60] Zen mode settings: Downtime category text -->
-    <string name="zen_mode_downtime_category">Downtime</string>
+    <!-- [CHAR LIMIT=40] Zen mode settings: Add rule menu option name -->
+    <string name="zen_mode_time_add_rule">Add rule</string>
 
-    <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option title -->
-    <string name="zen_mode_downtime_days">Days</string>
+    <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule menu option name -->
+    <string name="zen_mode_delete_rule">Delete rule</string>
+
+    <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule dialog confirmation message -->
+    <string name="zen_mode_delete_rule_confirmation">Delete \"<xliff:g id="rule" example="Weekends">%1$s</xliff:g>\" rule?</string>
+
+    <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule dialog button caption -->
+    <string name="zen_mode_delete_rule_button">Delete</string>
+
+    <!-- [CHAR LIMIT=40] Zen mode settings: External rule type -->
+    <string name="zen_mode_rule_type">Rule type</string>
+
+    <!-- [CHAR LIMIT=40] Zen mode settings: External rule type name if unknown -->
+    <string name="zen_mode_rule_type_unknown">Unknown</string>
+
+    <!-- [CHAR LIMIT=40] Zen mode settings: Configure external rule -->
+    <string name="zen_mode_configure_rule">Configure rule</string>
+
+    <!-- [CHAR LIMIT=40] Zen mode settings: Schedule rule type name -->
+    <string name="zen_schedule_rule_type_name">Schedule rule</string>
+
+    <!-- [CHAR LIMIT=40] Zen mode settings: Text to display if rule isn't found  -->
+    <string name="zen_mode_rule_not_found_text">Rule not found.</string>
+
+    <!-- [CHAR LIMIT=40] Zen mode settings: Rule summary template (when enabled)  -->
+    <string name="zen_mode_rule_summary_combination"><xliff:g id="description" example="Sun - Thu">%1$s</xliff:g> / <xliff:g id="mode" example="Alarms only">%2$s</xliff:g></string>
+
+    <!-- [CHAR LIMIT=40] Zen mode settings: Timebased rule days option title -->
+    <string name="zen_mode_schedule_rule_days">Days</string>
 
     <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, no days set -->
-    <string name="zen_mode_downtime_days_none">None</string>
+    <string name="zen_mode_schedule_rule_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>
-
-    <!-- [CHAR LIMIT=40] Zen mode settings: Entry conditions option: title -->
-    <string name="zen_mode_entry_conditions_title">Automatically turn on</string>
+    <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, all days set -->
+    <string name="zen_mode_schedule_rule_days_all">Every day</string>
 
     <!-- [CHAR LIMIT=40] General divider text when concatenating multiple items in a text summary -->
     <string name="summary_divider_text">,\u0020</string>
 
-    <!-- [CHAR LIMIT=40] Zen mode settings: Entry conditions option: value when blank -->
-    <string name="zen_mode_entry_conditions_summary_none">Never</string>
+    <!-- [CHAR LIMIT=40] General template for a symbolic start - end range in a text summary -->
+    <string name="summary_range_symbol_combination"><xliff:g id="start" example="Sun">%1$s</xliff:g> - <xliff:g id="end" example="Thu">%2$s</xliff:g></string>
+
+    <!-- [CHAR LIMIT=40] General template for a verbal start to end range in a text summary -->
+    <string name="summary_range_verbal_combination"><xliff:g id="start" example="Sun">%1$s</xliff:g> to <xliff:g id="end" example="Thu">%2$s</xliff:g></string>
 
     <!-- [CHAR LIMIT=20] Zen mode settings: Calls option -->
     <string name="zen_mode_calls">Calls</string>
@@ -5950,6 +6077,15 @@
     <!-- [CHAR LIMIT=50] Zen mode settings: Events option -->
     <string name="zen_mode_events">Events</string>
 
+    <!-- [CHAR LIMIT=50] Zen mode settings: Selected callers summary -->
+    <string name="zen_mode_selected_callers">Selected callers</string>
+
+    <!-- [CHAR LIMIT=50] Zen mode settings: Repeat callers option -->
+    <string name="zen_mode_repeat_callers">Repeat callers</string>
+
+    <!-- [CHAR LIMIT=200] Zen mode settings: Repeat callers option summary -->
+    <string name="zen_mode_repeat_callers_summary">If the same person calls a second time within a <xliff:g id="minutes">%d</xliff:g> minute period, allow it</string>
+
     <!-- [CHAR LIMIT=20] Zen mode settings: When option -->
     <string name="zen_mode_when">Automatically turn on</string>
 
@@ -5968,14 +6104,110 @@
     <!-- [CHAR LIMIT=20] Zen mode settings: End time option -->
     <string name="zen_mode_end_time">End time</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 end time = next day -->
+    <string name="zen_mode_end_time_next_day_summary_format"><xliff:g id="formatted_time" example="7:00 AM">%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=NONE] Zen mode voice: Activity title for interruption level  -->
+    <string name="zen_mode_interruptions_voice_title">Interruptions</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=NONE] Zen mode voice: Header for interruption level  -->
+    <string name="zen_mode_interruptions_voice_header">When calls and notifications arrive</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice: Prompt read for interruption type -->
+    <string name="zen_mode_interruptions_voice_prompt">When would you like to be interrupted?</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice: Prompt read for zen mode duration -->
+    <string name="zen_mode_duration_voice_prompt">For how long?</string>
+
+    <!-- [CHAR LIMIT=80] Zen mode voice: All interruptions -->
+    <string name="zen_mode_option_voice_all_interruptions">Always interrupt</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice: Comma delimited synonyms for all interriuptions -->
+    <string name="zen_mode_option_voice_all_interruptions_synonyms">off,all,everything</string>
+
+    <!-- [CHAR LIMIT=80] Zen mode voice: Important interruptions -->
+    <string name="zen_mode_option_voice_important_interruptions">Allow only priority interruptions</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice: Comma delimited synonyms for important interriuptions -->
+    <string name="zen_mode_option_voice_important_synonyms">important,priority,priority only,only priority,priority notifications</string>
+
+    <!-- [CHAR LIMIT=80] Zen mode voice option: Alarms only -->
+    <string name="zen_mode_option_voice_alarms">Allow only alarms</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice: Comma delimited synonyms for alarm interriuptions -->
+    <string name="zen_mode_option_voice_alarms_synonyms">alarms,alarms only,only alarms</string>
+
+    <!-- [CHAR LIMIT=80] Zen mode voice: No interruptions -->
+    <string name="zen_mode_option_voice_no_interruptions">Don\'t interrupt</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice: Comma delimited synonyms for no interriuptions -->
+    <string name="zen_mode_option_voice_no_interruptions_synonyms">none,never,nothing,no interruptions</string>
+
+    <!-- [CHAR LIMIT=40] Zen mode voice: Label for indefinite mode duration -->
+    <string name="zen_mode_duration_indefinte_voice_label">Indefinitely</string>
+
+    <!-- [CHAR LIMIT=40] Zen mode voice: Label for duration in minutes -->
+    <plurals name="zen_mode_duration_minutes_voice_label">
+       <item quantity="one"><xliff:g id="count" example="1">%d</xliff:g> minute</item>
+       <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> minutes</item>
+    </plurals>
+
+    <!-- [CHAR LIMIT=40] Zen mode voice: Label for duration in hours -->
+    <plurals name="zen_mode_duration_hours_voice_label">
+       <item quantity="one"><xliff:g id="count" example="1">%d</xliff:g> hour</item>
+       <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> hours</item>
+    </plurals>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice - spoken summary: important only duration indefinite. -->
+    <string name="zen_mode_summary_priority_indefinitely">Change to priority notifications only indefinitely</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice- spoken summary: important only duration minutes. -->
+    <plurals name="zen_mode_summary_priority_by_minute">
+        <item quantity="one">Change to priority notifications only for one minute until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
+        <item quantity="other">Change to priority notifications only for <xliff:g id="duration" example="2">%1$d</xliff:g> minutes until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
+    </plurals>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice- spoken summary: important only duration hours. -->
+    <plurals name="zen_mode_summary_priority_by_hour">
+        <item quantity="one">Change to priority notifications only for one hour until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
+        <item quantity="other">Change to priority notifications only for <xliff:g id="duration" example="2">%1$d</xliff:g> hours (until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
+    </plurals>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice - spoken summary: alarms only duration indefinite. -->
+    <string name="zen_mode_summary_alarams_only_indefinite">Change to alarms only indefinitely</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice- spoken summary: alarms only duration minutes. -->
+    <plurals name="zen_mode_summary_alarms_only_by_minute">
+        <item quantity="one">Change to alarms only for one minute until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
+        <item quantity="other">Change to alarms only for <xliff:g id="duration" example="2">%1$d</xliff:g> minutes (until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
+    </plurals>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice- spoken summary: alarms only duration hours. -->
+    <plurals name="zen_mode_summary_alarms_only_by_hour">
+        <item quantity="one">Change to alarms only for one hour until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
+        <item quantity="other">Change to alarms only for <xliff:g id="duration" example="2">%1$d</xliff:g> hours until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
+    </plurals>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice - spoken summary: no interruptions duration indefinite. -->
+    <string name="zen_mode_summary_no_interruptions_indefinite">Change to don\'t interrupt indefinitely</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice- spoken summary: alarms only duration minutes. -->
+    <plurals name="zen_mode_summary_no_interruptions_by_minute">
+        <item quantity="one">Change to don\'t interrupt for one minute until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
+        <item quantity="other">Change to don\'t interrupt for <xliff:g id="duration" example="2">%1$d</xliff:g> minutes (until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
+    </plurals>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice- spoken summary: alarms only duration hours. -->
+    <plurals name="zen_mode_summary_no_interruptions_by_hour">
+        <item quantity="one">Change to don\'t interrupt for one hour until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
+        <item quantity="other">Change to don\'t interrupt for <xliff:g id="duration" example="2">%1$d</xliff:g> hours until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
+    </plurals>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice - spoken summary: off. -->
+    <string name="zen_mode_summary_always">Change to always interrupt</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice: Comma delimited synonyms for indefinte duration -->
+    <string name="zen_mode_duration_indefinite_voice_synonyms">forever</string>
 
     <!-- [CHAR LIMIT=20] Notifications settings: Apps section header -->
     <string name="notification_settings_apps_title">App notifications</string>
@@ -6170,11 +6402,8 @@
     <!-- Label for showing apps with domain URLs (data URI with http or https) in list [CHAR LIMIT=30] -->
     <string name="filter_with_domain_urls_apps">With domain URLs</string>
 
-    <!-- Description for advanced menu option to reset app preferences [CHAR LIMIT=NONE] -->
-    <string name="reset_app_preferences_description">Reset preferences across all apps to defaults</string>
-
-    <!-- Description of settings item that leads to list of all apps [CHAR LIMIT=NONE] -->
-    <string name="all_apps_summary"><xliff:g id="count" example="10">%d</xliff:g> apps installed, including system and downloaded apps</string>
+    <!-- Summary for a trust agent that was disabled by the device policy [LIMIT=NONE] -->
+    <string name="trust_agent_disabled_device_admin">Disabled by administrator</string>
 
     <!-- Title for advanced application management settings [CHAR LIMIT=30] -->
     <string name="advanced_apps">Advanced</string>
@@ -6212,4 +6441,22 @@
         <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> apps can open their domain URLs</item>
     </plurals>
 
+    <!-- Fingerprint hint message when finger was not recognized.-->
+    <string name="fingerprint_not_recognized">Not recognized</string>
+
+    <!-- Title for Default Apps settings [CHAR LIMIT=30] -->
+    <string name="default_apps_title">Default Apps</string>
+
+    <!-- Title for Default Browser settings [CHAR LIMIT=30] -->
+    <string name="default_browser_title">Browser app</string>
+
+    <!-- Summary for No Default Browser settings [CHAR LIMIT=45] -->
+    <string name="default_browser_title_none">No default Browser</string>
+
+    <!-- Label of default app for current setting [CHAR LIMIT=40] -->
+    <string name="default_app">(Default)</string>
+
+    <!-- Title of app storage screen [CHAR LIMIT=30] -->
+    <string name="apps_storage">Apps storage</string>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8d0b885..22061e6 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -78,7 +78,6 @@
     <style name="TextAppearance.PasswordEntry" parent="android:TextAppearance.Material">
         <item name="android:gravity">center</item>
         <item name="android:singleLine">true</item>
-        <item name="android:textStyle">bold</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
@@ -350,4 +349,13 @@
         <item name="android:textColor">@color/fingerprint_message_color</item>
     </style>
 
+    <style name="TextAppearance.ConfirmDeviceCredentialsErrorText"
+        parent="android:TextAppearance.Material.Caption">
+        <item name="android:textColor">@color/warning</item>
+    </style>
+
+    <style name="TextAppearance.Small.SwitchBar">
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textStyle">normal</item>
+    </style>
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 48c5457..0d28126 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -29,14 +29,11 @@
         <item name="android:windowBackground">@null</item>
     </style>
 
-    <style name="SetupWizardTheme" parent="android:Theme.Material.NoActionBar">
+    <style name="SetupWizardTheme" parent="SuwThemeMaterial">
         <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>
         <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
@@ -53,14 +50,11 @@
         <item name="@*android:errorColor">@color/setup_lock_pattern_view_error_color_dark</item>
     </style>
 
-    <style name="SetupWizardTheme.Light" parent="android:Theme.Material.Light.NoActionBar">
+    <style name="SetupWizardTheme.Light" parent="SuwThemeMaterial.Light">
         <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>
         <item name="ic_menu_add">@drawable/ic_menu_add_light</item>
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
@@ -77,13 +71,6 @@
         <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">
         <item name="android:windowSoftInputMode">adjustResize</item>
         <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
@@ -211,4 +198,24 @@
         <item name="android:colorAccent">@color/switch_accent_color</item>
     </style>
 
+    <style name="Theme.ConfirmDeviceCredentials" parent="Theme.SubSettings">
+        <item name="confirmDeviceCredentialsSideMargin">16dp</item>
+        <item name="confirmDeviceCredentialsTopMargin">16dp</item>
+    </style>
+
+    <style name="Theme.ConfirmDeviceCredentialsDark" parent="@android:style/Theme.Material">
+        <item name="android:colorPrimary">@*android:color/material_blue_grey_900</item>
+        <item name="android:colorPrimaryDark">@*android:color/material_blue_grey_950</item>
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="preferenceBackgroundColor">@color/confirm_device_credential_dark_background</item>
+
+        <item name="confirmDeviceCredentialsSideMargin">32dp</item>
+        <item name="confirmDeviceCredentialsTopMargin">32dp</item>
+
+        <!-- LockPatternView colors -->
+        <item name="@*android:regularColor">@color/lock_pattern_view_regular_color_dark</item>
+        <item name="@*android:successColor">@color/lock_pattern_view_regular_color_dark</item>
+        <item name="@*android:errorColor">@color/lock_pattern_view_error_color</item>
+    </style>
 </resources>
diff --git a/res/xml/advanced_apps.xml b/res/xml/advanced_apps.xml
index 682ab2d..e808210 100644
--- a/res/xml/advanced_apps.xml
+++ b/res/xml/advanced_apps.xml
@@ -20,6 +20,12 @@
     android:key="applications_settings">
 
     <PreferenceScreen
+        android:key="default_apps"
+        android:fragment="com.android.settings.applications.ManageDefaultApps"
+        android:title="@string/default_apps_title"
+        settings:keywords="@string/keywords_default_apps" />
+
+    <PreferenceScreen
         android:key="manage_perms"
         android:fragment="com.android.settings.applications.ManagePermissions"
         android:title="@string/app_permissions"
@@ -34,25 +40,4 @@
                 android:value="com.android.settings.Settings$DomainsURLsAppListActivity" />
     </PreferenceScreen>
 
-    <PreferenceScreen
-        android:key="all_apps"
-        android:fragment="com.android.settings.applications.ManageApplications"
-        android:title="@string/filter_all_apps"
-        settings:keywords="@string/keywords_all_apps">
-        <extra
-            android:name="classname"
-            android:value="com.android.settings.Settings$AllApplicationsActivity" />
-    </PreferenceScreen>
-
-    <Preference
-        android:key="reset_all"
-        android:title="@string/reset_app_preferences"
-        android:summary="@string/reset_app_preferences_description"
-        settings:keywords="@string/keywords_reset_apps" />
-
-    <com.android.settings.applications.DefaultEmergencyPreference
-        android:key="default_emergency_app"
-        android:title="@string/default_emergency_app"
-        settings:keywords="@string/keywords_emergency_app" />
-
 </PreferenceScreen>
diff --git a/res/xml/dashboard_categories.xml b/res/xml/dashboard_categories.xml
index 0d8c1ac..78fe0e7 100644
--- a/res/xml/dashboard_categories.xml
+++ b/res/xml/dashboard_categories.xml
@@ -106,7 +106,7 @@
         <dashboard-tile
                 android:id="@+id/storage_settings"
                 android:title="@string/storage_settings"
-                android:fragment="com.android.settings.deviceinfo.Memory"
+                android:fragment="com.android.settings.deviceinfo.StorageSettings"
                 android:icon="@drawable/ic_settings_storage"
                 />
 
diff --git a/res/xml/default_apps.xml b/res/xml/default_apps.xml
new file mode 100644
index 0000000..392dd85
--- /dev/null
+++ b/res/xml/default_apps.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:key="default_apps">
+
+    <com.android.settings.applications.DefaultBrowserPreference
+            android:key="default_browser"
+            android:title="@string/default_browser_title"
+            android:summary="@string/default_browser_title_none"
+            />
+
+    <com.android.settings.applications.DefaultEmergencyPreference
+            android:key="default_emergency_app"
+            android:title="@string/default_emergency_app"
+            settings:keywords="@string/keywords_emergency_app"
+            />
+
+    <com.android.settings.applications.DefaultSmsPreference
+            android:key="default_sms_app"
+            android:title="@string/sms_application_title"
+            settings:keywords="@string/keywords_more_default_sms_app"
+            />
+
+</PreferenceScreen>
diff --git a/res/xml/device_info_storage.xml b/res/xml/device_info_storage.xml
new file mode 100644
index 0000000..19c5982
--- /dev/null
+++ b/res/xml/device_info_storage.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:title="@string/storage_settings"
+    settings:keywords="@string/keywords_storage">
+
+    <PreferenceCategory
+        android:key="storage_internal"
+        android:title="@string/storage_internal_title" />
+
+    <PreferenceCategory
+        android:key="storage_external"
+        android:title="@string/storage_external_title" />
+
+</PreferenceScreen>
diff --git a/res/xml/device_info_memory.xml b/res/xml/device_info_storage_volume.xml
similarity index 64%
rename from res/xml/device_info_memory.xml
rename to res/xml/device_info_storage_volume.xml
index 38cc94a..35435d7 100644
--- a/res/xml/device_info_memory.xml
+++ b/res/xml/device_info_storage_volume.xml
@@ -4,9 +4,9 @@
      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.
@@ -14,11 +14,10 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:title="@string/storage_settings"
-        settings:keywords="@string/keywords_storage">
-
-<!-- Preference categories are dynamically created based on the list of available storage volumes -->
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:title="@string/storage_settings"
+    settings:keywords="@string/keywords_storage">
 
 </PreferenceScreen>
diff --git a/res/xml/notification_settings.xml b/res/xml/notification_settings.xml
index f35d248..7956a6d 100644
--- a/res/xml/notification_settings.xml
+++ b/res/xml/notification_settings.xml
@@ -27,7 +27,7 @@
         <!-- Media volume -->
         <com.android.settings.notification.VolumeSeekBarPreference
                 android:key="media_volume"
-                android:icon="@*android:drawable/ic_audio_vol"
+                android:icon="@*android:drawable/ic_audio_media"
                 android:title="@string/media_volume_option_title" />
 
         <!-- Alarm volume -->
diff --git a/res/xml/timezones.xml b/res/xml/timezones.xml
index 440d098..b6f1f1d 100644
--- a/res/xml/timezones.xml
+++ b/res/xml/timezones.xml
@@ -33,6 +33,7 @@
     <timezone id="Europe/Amsterdam"></timezone>
     <timezone id="Europe/Belgrade"></timezone>
     <timezone id="Europe/Brussels"></timezone>
+    <timezone id="Europe/Madrid"></timezone>
     <timezone id="Europe/Sarajevo"></timezone>
     <timezone id="Africa/Windhoek"></timezone>
     <timezone id="Africa/Brazzaville"></timezone>
diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml
index 1fc1cda..ed6cfbd 100644
--- a/res/xml/wifi_advanced_settings.xml
+++ b/res/xml/wifi_advanced_settings.xml
@@ -69,7 +69,7 @@
     <Preference
             android:key="mac_address"
             android:title="@string/wifi_advanced_mac_address_title"
-            android:layout="@layout/mac_preference" />
+            android:layout="@layout/wifi_advance_layout" />
 
     <Preference
             android:key="current_ip_address"
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index b615c9e..f08de5e 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -24,13 +24,6 @@
         android:persistent="false"
         android:disableDependentsState="true" />
 
-    <com.android.settings.AppListPreference
-        android:key="sms_application"
-        android:title="@string/sms_application_title"
-        settings:keywords="@string/keywords_more_default_sms_app"
-        android:summary="%s"
-        android:persistent="false" />
-
     <SwitchPreference
         android:key="toggle_nfc"
         android:title="@string/nfc_quick_toggle_title"
diff --git a/res/xml/zen_mode_automation_settings.xml b/res/xml/zen_mode_automation_settings.xml
index 3098630..7cfffd4 100644
--- a/res/xml/zen_mode_automation_settings.xml
+++ b/res/xml/zen_mode_automation_settings.xml
@@ -19,43 +19,5 @@
     android:key="zen_mode_settings"
     android:title="@string/zen_mode_automation_settings_title" >
 
-    <!-- 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.DropDownPreference
-                android:key="downtime_mode"
-                android:title="@string/zen_mode_downtime_mode_title"
-                android:order="100"
-                android:persistent="false" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="automation"
-        android:title="@string/zen_mode_automation_category" >
-
-        <Preference
-            android:key="entry"
-            android:title="@string/zen_mode_entry_conditions_title"
-            android:persistent="false" />
-
-        <Preference
-                android:key="manage_condition_providers"
-                android:title="@string/manage_condition_providers"
-                android:persistent="false"
-                android:fragment="com.android.settings.notification.ConditionProviderSettings" />
-
-    </PreferenceCategory>
-
+    <!-- Rules added at runtime -->
 </PreferenceScreen>
diff --git a/res/xml/zen_mode_external_rule_settings.xml b/res/xml/zen_mode_external_rule_settings.xml
new file mode 100644
index 0000000..e244dc8
--- /dev/null
+++ b/res/xml/zen_mode_external_rule_settings.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="zen_mode_external_rule_settings" >
+
+    <!-- Rule name -->
+    <Preference
+        android:key="rule_name"
+        android:title="@string/zen_mode_rule_name"
+        android:persistent="false" />
+
+    <!-- Rule type -->
+    <Preference
+        android:key="type"
+        android:title="@string/zen_mode_rule_type"
+        android:persistent="false" />
+
+    <!-- Configure -->
+    <Preference
+        android:key="configure"
+        android:title="@string/zen_mode_configure_rule"
+        android:persistent="false" />
+
+    <!-- Zen mode -->
+    <com.android.settings.DropDownPreference
+        android:key="zen_mode"
+        android:title="@string/zen_mode_settings_title"
+        android:persistent="false" />
+
+</PreferenceScreen>
diff --git a/res/xml/zen_mode_priority_settings.xml b/res/xml/zen_mode_priority_settings.xml
index e8bab66..5b1dbf8 100644
--- a/res/xml/zen_mode_priority_settings.xml
+++ b/res/xml/zen_mode_priority_settings.xml
@@ -16,7 +16,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:key="zen_mode_settings"
+    android:key="zen_mode_priority_settings"
     android:title="@string/zen_mode_priority_settings_title" >
 
     <!-- Alarms -->
@@ -67,4 +67,12 @@
             android:title="@string/zen_mode_from"
             android:persistent="false" />
 
+    <!-- Repeat callers -->
+    <SwitchPreference
+        android:key="repeat_callers"
+        android:title="@string/zen_mode_repeat_callers"
+        android:persistent="false"
+        android:switchTextOff=""
+        android:switchTextOn="" />
+
 </PreferenceScreen>
diff --git a/res/xml/zen_mode_schedule_rule_settings.xml b/res/xml/zen_mode_schedule_rule_settings.xml
new file mode 100644
index 0000000..d808b10
--- /dev/null
+++ b/res/xml/zen_mode_schedule_rule_settings.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="zen_mode_schedule_rule_settings" >
+
+    <!-- Rule name -->
+    <Preference
+        android:key="rule_name"
+        android:title="@string/zen_mode_rule_name"
+        android:persistent="false" />
+
+    <!-- Days -->
+    <Preference
+        android:key="days"
+        android:title="@string/zen_mode_schedule_rule_days"
+        android:persistent="false" />
+
+    <!-- Start time/End time added and removed here! :-) -->
+
+    <!-- Zen mode -->
+    <com.android.settings.DropDownPreference
+            android:key="zen_mode"
+            android:title="@string/zen_mode_settings_title"
+            android:order="100"
+            android:persistent="false" />
+
+</PreferenceScreen>
diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml
index 1194d1b..267727f 100644
--- a/res/xml/zen_mode_settings.xml
+++ b/res/xml/zen_mode_settings.xml
@@ -19,12 +19,6 @@
     android:key="zen_mode_settings"
     android:title="@string/zen_mode_settings_title" >
 
-    <!-- When calls and notifications arrive -->
-    <com.android.settings.DropDownPreference
-            android:key="zen_mode"
-            android:title="@string/zen_mode_option_title"
-            android:persistent="false" />
-
     <!-- Priority only allows -->
     <PreferenceScreen
             android:key="priority_settings"
diff --git a/src/com/android/settings/AirplaneModeVoiceActivity.java b/src/com/android/settings/AirplaneModeVoiceActivity.java
index 3ab0c37..e0649e4 100644
--- a/src/com/android/settings/AirplaneModeVoiceActivity.java
+++ b/src/com/android/settings/AirplaneModeVoiceActivity.java
@@ -20,6 +20,8 @@
 import android.provider.Settings;
 import android.util.Log;
 
+import com.android.settings.utils.VoiceSettingsActivity;
+
 /**
  * Activity for modifying the {@link Settings.Global#AIRPLANE_MODE_ON AIRPLANE_MODE_ON}
  * setting using the Voice Interaction API.
@@ -27,14 +29,14 @@
 public class AirplaneModeVoiceActivity extends VoiceSettingsActivity {
     private static final String TAG = "AirplaneModeVoiceActivity";
 
-    protected void onVoiceSettingInteraction(Intent intent) {
+    protected boolean onVoiceSettingInteraction(Intent intent) {
         if (intent.hasExtra(Settings.EXTRA_AIRPLANE_MODE_ENABLED)) {
-            boolean enabled =
-                    intent.getBooleanExtra(Settings.EXTRA_AIRPLANE_MODE_ENABLED, false);
             Settings.Global.putInt(getContentResolver(),
-                    Settings.Global.AIRPLANE_MODE_ON, enabled ? 1 : 0);
+                    Settings.Global.AIRPLANE_MODE_ON,
+                    intent.getBooleanExtra(Settings.EXTRA_AIRPLANE_MODE_ENABLED, false) ? 1 : 0);
         } else {
             Log.v(TAG, "Missing airplane mode extra");
         }
+        return true;
     }
 }
diff --git a/src/com/android/settings/AppListPreference.java b/src/com/android/settings/AppListPreference.java
index 96897ae..3cc91cd 100644
--- a/src/com/android/settings/AppListPreference.java
+++ b/src/com/android/settings/AppListPreference.java
@@ -23,15 +23,17 @@
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.graphics.drawable.Drawable;
+import android.os.Parcel;
+import android.os.Parcelable;
 import android.preference.ListPreference;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import android.widget.CheckedTextView;
 import android.widget.ImageView;
 import android.widget.ListAdapter;
+import android.widget.TextView;
 
 /**
  * Extends ListPreference to allow us to show the icons for a given list of applications. We do this
@@ -56,10 +58,10 @@
         public View getView(int position, View convertView, ViewGroup parent) {
             LayoutInflater inflater = ((Activity)getContext()).getLayoutInflater();
             View view = inflater.inflate(R.layout.app_preference_item, parent, false);
-            CheckedTextView checkedTextView = (CheckedTextView)view.findViewById(R.id.app_label);
-            checkedTextView.setText(getItem(position));
+            TextView textView = (TextView) view.findViewById(R.id.app_label);
+            textView.setText(getItem(position));
             if (position == mSelectedIndex) {
-                checkedTextView.setChecked(true);
+                view.findViewById(R.id.default_label).setVisibility(View.VISIBLE);
             }
             ImageView imageView = (ImageView)view.findViewById(R.id.app_image);
             imageView.setImageDrawable(mImageDrawables[position]);
@@ -76,14 +78,14 @@
         super(context, attrs);
     }
 
-    public void setPackageNames(String[] packageNames, String defaultPackageName) {
+    public void setPackageNames(CharSequence[] packageNames, CharSequence defaultPackageName) {
         // Look up all package names in PackageManager. Skip ones we can't find.
         int foundPackages = 0;
         PackageManager pm = getContext().getPackageManager();
         ApplicationInfo[] appInfos = new ApplicationInfo[packageNames.length];
         for (int i = 0; i < packageNames.length; i++) {
             try {
-                appInfos[i] = pm.getApplicationInfo(packageNames[i], 0);
+                appInfos[i] = pm.getApplicationInfo(packageNames[i].toString(), 0);
                 foundPackages++;
             } catch (NameNotFoundException e) {
                 // Leave appInfos[i] uninitialized; it will be skipped in the list.
@@ -123,4 +125,61 @@
         builder.setAdapter(adapter, this);
         super.onPrepareDialogBuilder(builder);
     }
+
+    @Override
+    protected Parcelable onSaveInstanceState() {
+        Parcelable superState = super.onSaveInstanceState();
+        return new SavedState(getEntryValues(), getValue(), superState);
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Parcelable state) {
+        if (state instanceof SavedState) {
+            SavedState savedState = (SavedState) state;
+            setPackageNames(savedState.entryValues, savedState.value);
+            super.onRestoreInstanceState(savedState.superState);
+        } else {
+            super.onRestoreInstanceState(state);
+        }
+    }
+
+    private static class SavedState implements Parcelable {
+
+        public final CharSequence[] entryValues;
+        public final CharSequence value;
+        public final Parcelable superState;
+
+        public SavedState(CharSequence[] entryValues, CharSequence value, Parcelable superState) {
+            this.entryValues = entryValues;
+            this.value = value;
+            this.superState = superState;
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeCharSequenceArray(entryValues);
+            dest.writeCharSequence(value);
+            dest.writeParcelable(superState, flags);
+        }
+
+        public static Creator<SavedState> CREATOR = new Creator<SavedState>() {
+            @Override
+            public SavedState createFromParcel(Parcel source) {
+                CharSequence[] entryValues = source.readCharSequenceArray();
+                CharSequence value = source.readCharSequence();
+                Parcelable superState = source.readParcelable(getClass().getClassLoader());
+                return new SavedState(entryValues, value, superState);
+            }
+
+            @Override
+            public SavedState[] newArray(int size) {
+                return new SavedState[size];
+            }
+        };
+    }
 }
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 479baf7..a3bd5a1 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -89,11 +89,14 @@
         private ChooseLockSettingsHelper mChooseLockSettingsHelper;
         private DevicePolicyManager mDPM;
         private KeyStore mKeyStore;
+        private boolean mHasChallenge = false;
+        private long mChallenge;
         private boolean mPasswordConfirmed = false;
         private boolean mWaitingForConfirmation = false;
         private int mEncryptionRequestQuality;
         private boolean mEncryptionRequestDisabled;
         private boolean mRequirePassword;
+        private String mUserPassword;
         private LockPatternUtils mLockPatternUtils;
         private FingerprintManager mFingerprintManager;
         private RemovalCallback mRemovalCallback = new RemovalCallback() {
@@ -132,6 +135,11 @@
                 mPasswordConfirmed = !confirmCredentials;
             }
 
+            mHasChallenge = getActivity().getIntent().getBooleanExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
+            mChallenge = getActivity().getIntent().getLongExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0);
+
             if (savedInstanceState != null) {
                 mPasswordConfirmed = savedInstanceState.getBoolean(PASSWORD_CONFIRMED);
                 mWaitingForConfirmation = savedInstanceState.getBoolean(WAITING_FOR_CONFIRMATION);
@@ -145,7 +153,8 @@
             } else if (!mWaitingForConfirmation) {
                 ChooseLockSettingsHelper helper =
                         new ChooseLockSettingsHelper(this.getActivity(), this);
-                if (!helper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST, null, null)) {
+                if (!helper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST,
+                        getString(R.string.unlock_set_unlock_launch_picker_title), true)) {
                     mPasswordConfirmed = true; // no password set, so no need to confirm
                     updatePreferencesOrFinish();
                 } else {
@@ -176,6 +185,8 @@
          * @param quality
          * @param disabled
          */
+        // TODO: why does this take disabled, its always called with a quality higher than
+        // what makes sense with disabled == true
         private void maybeEnableEncryption(int quality, boolean disabled) {
             if (Process.myUserHandle().isOwner() && LockPatternUtils.isDeviceEncryptionEnabled()) {
                 mEncryptionRequestQuality = quality;
@@ -200,6 +211,7 @@
             mWaitingForConfirmation = false;
             if (requestCode == CONFIRM_EXISTING_REQUEST && resultCode == Activity.RESULT_OK) {
                 mPasswordConfirmed = true;
+                mUserPassword = data.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
                 updatePreferencesOrFinish();
             } else if (requestCode == ENABLE_ENCRYPTION_REQUEST
                     && resultCode == Activity.RESULT_OK) {
@@ -384,12 +396,35 @@
                     maxLength, requirePasswordToDecrypt, confirmCredentials);
         }
 
+        protected Intent getLockPasswordIntent(Context context, int quality,
+                int minLength, final int maxLength,
+                boolean requirePasswordToDecrypt, long challenge) {
+            return ChooseLockPassword.createIntent(context, quality, minLength,
+                    maxLength, requirePasswordToDecrypt, challenge);
+        }
+
+        protected Intent getLockPasswordIntent(Context context, int quality, int minLength,
+                final int maxLength, boolean requirePasswordToDecrypt, String password) {
+            return ChooseLockPassword.createIntent(context, quality, minLength, maxLength,
+                    requirePasswordToDecrypt, password);
+        }
+
         protected Intent getLockPatternIntent(Context context, final boolean requirePassword,
                 final boolean confirmCredentials) {
             return ChooseLockPattern.createIntent(context, requirePassword,
                     confirmCredentials);
         }
 
+        protected Intent getLockPatternIntent(Context context, final boolean requirePassword,
+               long challenge) {
+            return ChooseLockPattern.createIntent(context, requirePassword, challenge);
+        }
+
+        protected Intent getLockPatternIntent(Context context, final boolean requirePassword,
+                final String pattern) {
+            return ChooseLockPattern.createIntent(context, requirePassword, pattern);
+        }
+
         protected Intent getEncryptionInterstitialIntent(Context context, int quality,
                 boolean required) {
             return EncryptionInterstitial.createStartIntent(context, quality, required);
@@ -419,12 +454,24 @@
                     minLength = MIN_PASSWORD_LENGTH;
                 }
                 final int maxLength = mDPM.getPasswordMaximumLength(quality);
-                Intent intent = getLockPasswordIntent(context, quality, minLength,
-                        maxLength, mRequirePassword,  /* confirm credentials */false);
+                Intent intent;
+                if (mHasChallenge) {
+                    intent = getLockPasswordIntent(context, quality, minLength,
+                            maxLength, mRequirePassword, mChallenge);
+                } else {
+                    intent = getLockPasswordIntent(context, quality, minLength,
+                        maxLength, mRequirePassword, mUserPassword);
+                }
                 startActivityForResult(intent, CHOOSE_LOCK_REQUEST);
             } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_SOMETHING) {
-                Intent intent = getLockPatternIntent(context, mRequirePassword,
-                        /* confirm credentials */false);
+                Intent intent;
+                if (mHasChallenge) {
+                    intent = getLockPatternIntent(context, mRequirePassword,
+                        mChallenge);
+                } else {
+                    intent = getLockPatternIntent(context, mRequirePassword,
+                        mUserPassword);
+                }
                 startActivityForResult(intent, CHOOSE_LOCK_REQUEST);
             } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
                 mChooseLockSettingsHelper.utils().clearLock();
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index 6d7b71d..e15d3fc 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -76,6 +76,23 @@
         return intent;
     }
 
+    public static Intent createIntent(Context context, int quality,
+            int minLength, final int maxLength, boolean requirePasswordToDecrypt, String password) {
+        Intent intent = createIntent(context, quality, minLength, maxLength,
+                requirePasswordToDecrypt, false);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, password);
+        return intent;
+    }
+
+    public static Intent createIntent(Context context, int quality,
+            int minLength, final int maxLength, boolean requirePasswordToDecrypt, long challenge) {
+        Intent intent = createIntent(context, quality, minLength, maxLength,
+                requirePasswordToDecrypt, false);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+        return intent;
+    }
+
     @Override
     protected boolean isValidFragment(String fragmentName) {
         if (ChooseLockPasswordFragment.class.getName().equals(fragmentName)) return true;
@@ -101,6 +118,11 @@
             implements OnClickListener, OnEditorActionListener,  TextWatcher {
         private static final String KEY_FIRST_PIN = "first_pin";
         private static final String KEY_UI_STAGE = "ui_stage";
+        private static final String KEY_CURRENT_PASSWORD = "current_password";
+
+        private String mCurrentPassword;
+        private boolean mHasChallenge;
+        private long mChallenge;
         private TextView mPasswordEntry;
         private int mPasswordMinLength = LockPatternUtils.MIN_LOCK_PASSWORD_SIZE;
         private int mPasswordMaxLength = 16;
@@ -238,20 +260,30 @@
                     : (InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD));
 
             Intent intent = getActivity().getIntent();
-            final boolean confirmCredentials = intent.getBooleanExtra("confirm_credentials", true);
+            final boolean confirmCredentials = intent.getBooleanExtra(
+                    ChooseLockGeneric.CONFIRM_CREDENTIALS, true);
+            mCurrentPassword = intent.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
+            mHasChallenge = intent.getBooleanExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
+            mChallenge = intent.getLongExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0);
             if (savedInstanceState == null) {
                 updateStage(Stage.Introduction);
                 if (confirmCredentials) {
                     mChooseLockSettingsHelper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST,
-                            null, null);
+                            getString(R.string.unlock_set_unlock_launch_picker_title), true);
                 }
             } else {
+                // restore from previous state
                 mFirstPin = savedInstanceState.getString(KEY_FIRST_PIN);
                 final String state = savedInstanceState.getString(KEY_UI_STAGE);
                 if (state != null) {
                     mUiStage = Stage.valueOf(state);
                     updateStage(mUiStage);
                 }
+
+                if (mCurrentPassword == null) {
+                    mCurrentPassword = savedInstanceState.getString(KEY_CURRENT_PASSWORD);
+                }
             }
             mDone = false;
             if (activity instanceof SettingsActivity) {
@@ -287,6 +319,7 @@
             super.onSaveInstanceState(outState);
             outState.putString(KEY_UI_STAGE, mUiStage.name());
             outState.putString(KEY_FIRST_PIN, mFirstPin);
+            outState.putString(KEY_CURRENT_PASSWORD, mCurrentPassword);
         }
 
         @Override
@@ -298,6 +331,9 @@
                     if (resultCode != Activity.RESULT_OK) {
                         getActivity().setResult(RESULT_FINISHED);
                         getActivity().finish();
+                    } else {
+                        mCurrentPassword = data.getStringExtra(
+                                ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
                     }
                     break;
             }
@@ -441,8 +477,16 @@
                     final boolean required = getActivity().getIntent().getBooleanExtra(
                             EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true);
                     mLockPatternUtils.setCredentialRequiredToDecrypt(required);
-                    mLockPatternUtils.saveLockPassword(pin, mRequestedQuality);
-                    getActivity().setResult(RESULT_FINISHED);
+                    mLockPatternUtils.saveLockPassword(pin, mCurrentPassword, mRequestedQuality);
+
+                    if (mHasChallenge) {
+                        Intent intent = new Intent();
+                        byte[] token = mLockPatternUtils.verifyPassword(pin, mChallenge);
+                        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
+                        getActivity().setResult(RESULT_FINISHED, intent);
+                    } else {
+                        getActivity().setResult(RESULT_FINISHED);
+                    }
                     getActivity().finish();
                     mDone = true;
                     if (!wasSecureBefore) {
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 1865a6b..e3b7d4b 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -77,6 +77,22 @@
         return intent;
     }
 
+    public static Intent createIntent(Context context,
+            boolean requirePassword, String pattern) {
+        Intent intent = createIntent(context, requirePassword, false);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, pattern);
+        return intent;
+    }
+
+
+    public static Intent createIntent(Context context,
+            boolean requirePassword, long challenge) {
+        Intent intent = createIntent(context, requirePassword, false);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+        return intent;
+    }
+
     @Override
     protected boolean isValidFragment(String fragmentName) {
         if (ChooseLockPatternFragment.class.getName().equals(fragmentName)) return true;
@@ -115,6 +131,9 @@
 
         private static final int ID_EMPTY_MESSAGE = -1;
 
+        private String mCurrentPattern;
+        private boolean mHasChallenge;
+        private long mChallenge;
         protected TextView mHeaderText;
         protected LockPatternView mLockPatternView;
         protected TextView mFooterText;
@@ -142,7 +161,11 @@
                     if (resultCode != Activity.RESULT_OK) {
                         getActivity().setResult(RESULT_FINISHED);
                         getActivity().finish();
+                    } else {
+                        mCurrentPattern = data.getStringExtra(
+                                ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
                     }
+
                     updateStage(Stage.Introduction);
                     break;
             }
@@ -329,6 +352,7 @@
 
         private static final String KEY_UI_STAGE = "uiStage";
         private static final String KEY_PATTERN_CHOICE = "chosenPattern";
+        private static final String KEY_CURRENT_PATTERN = "currentPattern";
 
         @Override
         public void onCreate(Bundle savedInstanceState) {
@@ -371,6 +395,11 @@
 
             final boolean confirmCredentials = getActivity().getIntent()
                     .getBooleanExtra("confirm_credentials", true);
+            Intent intent = getActivity().getIntent();
+            mCurrentPattern = intent.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
+            mHasChallenge = intent.getBooleanExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
+            mChallenge = intent.getLongExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0);
 
             if (savedInstanceState == null) {
                 if (confirmCredentials) {
@@ -379,7 +408,8 @@
                     updateStage(Stage.NeedToConfirm);
                     boolean launchedConfirmationActivity =
                         mChooseLockSettingsHelper.launchConfirmationActivity(
-                                CONFIRM_EXISTING_REQUEST, null, null);
+                                CONFIRM_EXISTING_REQUEST,
+                                getString(R.string.unlock_set_unlock_launch_picker_title), true);
                     if (!launchedConfirmationActivity) {
                         updateStage(Stage.Introduction);
                     }
@@ -392,6 +422,10 @@
                 if (patternString != null) {
                     mChosenPattern = LockPatternUtils.stringToPattern(patternString);
                 }
+
+                if (mCurrentPattern == null) {
+                    mCurrentPattern = savedInstanceState.getString(KEY_CURRENT_PATTERN);
+                }
                 updateStage(Stage.values()[savedInstanceState.getInt(KEY_UI_STAGE)]);
             }
             mDone = false;
@@ -471,6 +505,11 @@
                 outState.putString(KEY_PATTERN_CHOICE,
                         LockPatternUtils.patternToString(mChosenPattern));
             }
+
+            if (mCurrentPattern != null) {
+                outState.putString(KEY_CURRENT_PATTERN,
+                        mCurrentPattern);
+            }
         }
 
         /**
@@ -570,8 +609,9 @@
 
             final boolean required = getActivity().getIntent().getBooleanExtra(
                     EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true);
+
             utils.setCredentialRequiredToDecrypt(required);
-            utils.saveLockPattern(mChosenPattern);
+            utils.saveLockPattern(mChosenPattern, mCurrentPattern);
 
             if (lockVirgin) {
                 utils.setVisiblePatternEnabled(true);
@@ -580,7 +620,16 @@
             if (!wasSecureBefore) {
                 startActivity(getRedactionInterstitialIntent(getActivity()));
             }
-            getActivity().setResult(RESULT_FINISHED);
+
+            if (mHasChallenge) {
+                Intent intent = new Intent();
+                byte[] token = utils.verifyPattern(mChosenPattern, mChallenge);
+                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
+                getActivity().setResult(RESULT_FINISHED, intent);
+            } else {
+                getActivity().setResult(RESULT_FINISHED);
+            }
+
             getActivity().finish();
             mDone = true;
         }
diff --git a/src/com/android/settings/ChooseLockSettingsHelper.java b/src/com/android/settings/ChooseLockSettingsHelper.java
index bba45ce..c113b1d 100644
--- a/src/com/android/settings/ChooseLockSettingsHelper.java
+++ b/src/com/android/settings/ChooseLockSettingsHelper.java
@@ -16,17 +16,22 @@
 
 package com.android.settings;
 
-import com.android.internal.widget.LockPatternUtils;
-
+import android.annotation.Nullable;
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.admin.DevicePolicyManager;
 import android.content.Intent;
 
+import com.android.internal.widget.LockPatternUtils;
+
 public final class ChooseLockSettingsHelper {
 
     static final String EXTRA_KEY_TYPE = "type";
     static final String EXTRA_KEY_PASSWORD = "password";
+    static final String EXTRA_KEY_HAS_CHALLENGE = "has_challenge";
+    static final String EXTRA_KEY_CHALLENGE = "challenge";
+    static final String EXTRA_KEY_CHALLENGE_TOKEN = "hw_auth_token";
+
 
     private LockPatternUtils mLockPatternUtils;
     private Activity mActivity;
@@ -48,64 +53,106 @@
 
     /**
      * If a pattern, password or PIN exists, prompt the user before allowing them to change it.
-     * @param message optional message to display about the action about to be done
-     * @param details optional detail message to display
+     *
+     * @param title title of the confirmation screen; shown in the action bar
      * @return true if one exists and we launched an activity to confirm it
-     * @see #onActivityResult(int, int, android.content.Intent)
+     * @see Activity#onActivityResult(int, int, android.content.Intent)
      */
-    boolean launchConfirmationActivity(int request, CharSequence message, CharSequence details) {
-        return launchConfirmationActivity(request, message, details, false);
+    boolean launchConfirmationActivity(int request, CharSequence title) {
+        return launchConfirmationActivity(request, title, null, null, false, false);
+    }
+
+    /**
+     * If a pattern, password or PIN exists, prompt the user before allowing them to change it.
+     *
+     * @param title title of the confirmation screen; shown in the action bar
+     * @param returnCredentials if true, put credentials into intent. Note that if this is true,
+     *                          this can only be called internally.
+     * @return true if one exists and we launched an activity to confirm it
+     * @see Activity#onActivityResult(int, int, android.content.Intent)
+     */
+    boolean launchConfirmationActivity(int request, CharSequence title, boolean returnCredentials) {
+        return launchConfirmationActivity(request, title, null, null, returnCredentials, false);
+    }
+
+    /**
+     * If a pattern, password or PIN exists, prompt the user before allowing them to change it.
+     *
+     * @param title title of the confirmation screen; shown in the action bar
+     * @param header header of the confirmation screen; shown as large text
+     * @param description description of the confirmation screen
+     * @param returnCredentials if true, put credentials into intent. Note that if this is true,
+     *                          this can only be called internally.
+     * @param external specifies whether this activity is launched externally, meaning that it will
+     *                 get a dark theme and allow fingerprint authentication
+     * @return true if one exists and we launched an activity to confirm it
+     * @see Activity#onActivityResult(int, int, android.content.Intent)
+     */
+    boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
+            @Nullable CharSequence header, @Nullable CharSequence description,
+            boolean returnCredentials, boolean external) {
+        return launchConfirmationActivity(request, title, header, description,
+                returnCredentials, external, false, 0);
     }
 
     /**
      * If a pattern, password or PIN exists, prompt the user before allowing them to change it.
      * @param message optional message to display about the action about to be done
      * @param details optional detail message to display
-     * @param returnCredentials if true, put credentials into intent. Note that if this is true,
-                                this can only be called internally.
+     * @param challenge a challenge to be verified against the device credential.
+     *                  This method can only be called internally.
      * @return true if one exists and we launched an activity to confirm it
      * @see #onActivityResult(int, int, android.content.Intent)
      */
-    boolean launchConfirmationActivity(int request, CharSequence message, CharSequence details,
-                                       boolean returnCredentials) {
+    boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
+            @Nullable CharSequence header, @Nullable CharSequence description,
+            long challenge) {
+        return launchConfirmationActivity(request, title, header, description,
+                false, false, true, challenge);
+    }
+
+    private boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
+            @Nullable CharSequence header, @Nullable CharSequence description,
+            boolean returnCredentials, boolean external, boolean hasChallenge,
+            long challenge) {
         boolean launched = false;
         switch (mLockPatternUtils.getKeyguardStoredPasswordQuality()) {
             case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
-                launched = confirmPattern(request, message, details, returnCredentials);
+                launched = launchConfirmationActivity(request, title, header, description,
+                        returnCredentials || hasChallenge
+                                ? ConfirmLockPattern.InternalActivity.class
+                                : ConfirmLockPattern.class, external,
+                                hasChallenge, challenge);
                 break;
             case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
             case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
             case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
             case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
             case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
-                // TODO: update UI layout for ConfirmPassword to show message and details
-                launched = confirmPassword(request, message, returnCredentials);
+                launched = launchConfirmationActivity(request, title, header, description,
+                        returnCredentials || hasChallenge
+                                ? ConfirmLockPassword.InternalActivity.class
+                                : ConfirmLockPassword.class, external,
+                                hasChallenge, challenge);
                 break;
         }
         return launched;
     }
 
-    /**
-     * Launch screen to confirm the existing lock pattern.
-     * @param message shown in header of ConfirmLockPattern if not null
-     * @param details shown in footer of ConfirmLockPattern if not null
-     * @param returnCredentials if true, put credentials into intent.
-     * @see #onActivityResult(int, int, android.content.Intent)
-     * @return true if we launched an activity to confirm pattern
-     */
-    private boolean confirmPattern(int request, CharSequence message,
-                                   CharSequence details, boolean returnCredentials) {
-        if (!mLockPatternUtils.isLockPatternEnabled()) {
-            return false;
-        }
+    private boolean launchConfirmationActivity(int request, CharSequence title, CharSequence header,
+            CharSequence message, Class<?> activityClass, boolean external, boolean hasChallenge,
+            long challenge) {
         final Intent intent = new Intent();
-        // supply header and footer text in the intent
-        intent.putExtra(ConfirmLockPattern.HEADER_TEXT, message);
-        intent.putExtra(ConfirmLockPattern.FOOTER_TEXT, details);
-        intent.setClassName("com.android.settings",
-                            returnCredentials
-                            ? ConfirmLockPattern.InternalActivity.class.getName()
-                            : ConfirmLockPattern.class.getName());
+        intent.putExtra(ConfirmDeviceCredentialBaseFragment.TITLE_TEXT, title);
+        intent.putExtra(ConfirmDeviceCredentialBaseFragment.HEADER_TEXT, header);
+        intent.putExtra(ConfirmDeviceCredentialBaseFragment.DETAILS_TEXT, message);
+        intent.putExtra(ConfirmDeviceCredentialBaseFragment.ALLOW_FP_AUTHENTICATION, external);
+        intent.putExtra(ConfirmDeviceCredentialBaseFragment.DARK_THEME, external);
+        intent.putExtra(ConfirmDeviceCredentialBaseFragment.SHOW_CANCEL_BUTTON, external);
+        intent.putExtra(ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED, external);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, hasChallenge);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+        intent.setClassName(ConfirmDeviceCredentialBaseFragment.PACKAGE, activityClass.getName());
         if (mFragment != null) {
             mFragment.startActivityForResult(intent, request);
         } else {
@@ -113,31 +160,4 @@
         }
         return true;
     }
-
-    /**
-     * Launch screen to confirm the existing lock password.
-     * @param message shown in header of ConfirmLockPassword if not null
-     * @param returnCredentials if true, put credentials into intent.
-     * @see #onActivityResult(int, int, android.content.Intent)
-     * @return true if we launched an activity to confirm password
-     */
-    private boolean confirmPassword(int request, CharSequence message,
-            boolean returnCredentials) {
-        if (!mLockPatternUtils.isLockPasswordEnabled()) return false;
-        final Intent intent = new Intent();
-        // supply header text in the intent
-        intent.putExtra(ConfirmLockPattern.HEADER_TEXT, message);
-        intent.setClassName("com.android.settings",
-                            returnCredentials
-                            ? ConfirmLockPassword.InternalActivity.class.getName()
-                            : ConfirmLockPassword.class.getName());
-        if (mFragment != null) {
-            mFragment.startActivityForResult(intent, request);
-        } else {
-            mActivity.startActivityForResult(intent, request);
-        }
-        return true;
-    }
-
-
 }
diff --git a/src/com/android/settings/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/ConfirmDeviceCredentialActivity.java
index beb2d97..7653603 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialActivity.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialActivity.java
@@ -39,6 +39,17 @@
         return intent;
     }
 
+    public static Intent createIntent(CharSequence title, CharSequence details, long challenge) {
+        Intent intent = new Intent();
+        intent.setClassName("com.android.settings",
+                ConfirmDeviceCredentialActivity.class.getName());
+        intent.putExtra(KeyguardManager.EXTRA_TITLE, title);
+        intent.putExtra(KeyguardManager.EXTRA_DESCRIPTION, details);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
+        return intent;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -48,7 +59,8 @@
         String details = intent.getStringExtra(KeyguardManager.EXTRA_DESCRIPTION);
 
         ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this);
-        if (!helper.launchConfirmationActivity(0 /* request code */, title, details)) {
+        if (!helper.launchConfirmationActivity(0 /* request code */, null /* title */, title,
+                details, false /* returnCredentials */, true /* isExternal */)) {
             Log.d(TAG, "No pattern, password or PIN set.");
             setResult(Activity.RESULT_OK);
             finish();
diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java b/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
new file mode 100644
index 0000000..fe3de97
--- /dev/null
+++ b/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings;
+
+import android.app.KeyguardManager;
+import android.os.Bundle;
+import android.view.MenuItem;
+import android.view.WindowManager;
+
+public class ConfirmDeviceCredentialBaseActivity extends SettingsActivity {
+
+    @Override
+    protected void onCreate(Bundle savedState) {
+        if (getIntent().getBooleanExtra(ConfirmDeviceCredentialBaseFragment.DARK_THEME, false)) {
+            setTheme(R.style.Theme_ConfirmDeviceCredentialsDark);
+        }
+        super.onCreate(savedState);
+        boolean deviceLocked = getSystemService(KeyguardManager.class).isKeyguardLocked();
+        if (deviceLocked && getIntent().getBooleanExtra(
+                ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED, false)) {
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+        }
+        CharSequence msg = getIntent().getStringExtra(
+                ConfirmDeviceCredentialBaseFragment.TITLE_TEXT);
+        setTitle(msg);
+        if (getActionBar() != null) {
+            getActionBar().setDisplayHomeAsUpEnabled(true);
+            getActionBar().setHomeButtonEnabled(true);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}
diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
new file mode 100644
index 0000000..fc8edf8
--- /dev/null
+++ b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings;
+
+import android.annotation.Nullable;
+import android.app.Fragment;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+/**
+ * Base fragment to be shared for PIN/Pattern/Password confirmation fragments.
+ */
+public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFragment
+        implements FingerprintUiHelper.Callback {
+
+    public static final String PACKAGE = "com.android.settings";
+    public static final String TITLE_TEXT = PACKAGE + ".ConfirmCredentials.title";
+    public static final String HEADER_TEXT = PACKAGE + ".ConfirmCredentials.header";
+    public static final String DETAILS_TEXT = PACKAGE + ".ConfirmCredentials.details";
+    public static final String ALLOW_FP_AUTHENTICATION =
+            PACKAGE + ".ConfirmCredentials.allowFpAuthentication";
+    public static final String DARK_THEME = PACKAGE + ".ConfirmCredentials.darkTheme";
+    public static final String SHOW_CANCEL_BUTTON =
+            PACKAGE + ".ConfirmCredentials.showCancelButton";
+    public static final String SHOW_WHEN_LOCKED =
+            PACKAGE + ".ConfirmCredentials.showWhenLocked";
+
+    private FingerprintUiHelper mFingerprintHelper;
+    private boolean mAllowFpAuthentication;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mAllowFpAuthentication = getActivity().getIntent().getBooleanExtra(
+                ALLOW_FP_AUTHENTICATION, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        mFingerprintHelper = new FingerprintUiHelper(
+                (ImageView) view.findViewById(R.id.fingerprintIcon),
+                (TextView) view.findViewById(R.id.errorText), this);
+        boolean showCancelButton = getActivity().getIntent().getBooleanExtra(
+                SHOW_CANCEL_BUTTON, false);
+        Button cancelButton = (Button) view.findViewById(R.id.cancelButton);
+        cancelButton.setVisibility(showCancelButton ? View.VISIBLE : View.GONE);
+        cancelButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getActivity().finish();
+            }
+        });
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (mAllowFpAuthentication) {
+            mFingerprintHelper.startListening();
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (mAllowFpAuthentication) {
+            mFingerprintHelper.stopListening();
+        }
+    }
+
+    @Override
+    public void onAuthenticated() {
+        // Check whether we are still active.
+        if (getActivity() != null && getActivity().isResumed()) {
+            authenticationSucceeded();
+        }
+    }
+
+    protected abstract void authenticationSucceeded();
+
+    @Override
+    public void onFingerprintIconVisibilityChanged(boolean visible) {
+    }
+}
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index b49dc6e..bec3a45 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -16,14 +16,11 @@
 
 package com.android.settings;
 
+import android.annotation.Nullable;
 import android.text.TextUtils;
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
-import com.android.internal.widget.PasswordEntryKeyboardHelper;
-import com.android.internal.widget.PasswordEntryKeyboardView;
 
-import android.app.Activity;
-import android.app.Fragment;
 import android.app.admin.DevicePolicyManager;
 import android.content.Intent;
 import android.os.Bundle;
@@ -31,23 +28,18 @@
 import android.os.Handler;
 import android.os.SystemClock;
 import android.os.storage.StorageManager;
-import android.text.Editable;
 import android.text.InputType;
-import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
-import android.widget.Button;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
-public class ConfirmLockPassword extends SettingsActivity {
-
-    public static final String PACKAGE = "com.android.settings";
-    public static final String HEADER_TEXT = PACKAGE + ".ConfirmLockPattern.header";
+public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
 
     public static class InternalActivity extends ConfirmLockPassword {
     }
@@ -65,28 +57,17 @@
         return false;
     }
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        // Disable IME on our window since we provide our own keyboard
-        //getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM,
-                //WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
-        super.onCreate(savedInstanceState);
-        CharSequence msg = getText(R.string.lockpassword_confirm_your_password_header);
-        setTitle(msg);
-    }
-
-    public static class ConfirmLockPasswordFragment extends InstrumentedFragment
-            implements OnClickListener, OnEditorActionListener, TextWatcher {
+    public static class ConfirmLockPasswordFragment extends ConfirmDeviceCredentialBaseFragment
+            implements OnClickListener, OnEditorActionListener {
         private static final String KEY_NUM_WRONG_CONFIRM_ATTEMPTS
                 = "confirm_lock_password_fragment.key_num_wrong_confirm_attempts";
         private static final long ERROR_MESSAGE_TIMEOUT = 3000;
         private TextView mPasswordEntry;
         private LockPatternUtils mLockPatternUtils;
-        private TextView mHeaderText;
+        private TextView mHeaderTextView;
+        private TextView mDetailsTextView;
+        private TextView mErrorTextView;
         private Handler mHandler = new Handler();
-        private PasswordEntryKeyboardHelper mKeyboardHelper;
-        private PasswordEntryKeyboardView mKeyboardView;
-        private Button mContinueButton;
         private int mNumWrongConfirmAttempts;
         private CountDownTimer mCountdownTimer;
         private boolean mIsAlpha;
@@ -111,51 +92,35 @@
                 Bundle savedInstanceState) {
             final int storedQuality = mLockPatternUtils.getKeyguardStoredPasswordQuality();
             View view = inflater.inflate(R.layout.confirm_lock_password, null);
-            // Disable IME on our window since we provide our own keyboard
-
-            view.findViewById(R.id.cancel_button).setOnClickListener(this);
-            mContinueButton = (Button) view.findViewById(R.id.next_button);
-            mContinueButton.setOnClickListener(this);
-            mContinueButton.setEnabled(false); // disable until the user enters at least one char
 
             mPasswordEntry = (TextView) view.findViewById(R.id.password_entry);
             mPasswordEntry.setOnEditorActionListener(this);
-            mPasswordEntry.addTextChangedListener(this);
 
-            mKeyboardView = (PasswordEntryKeyboardView) view.findViewById(R.id.keyboard);
-            mHeaderText = (TextView) view.findViewById(R.id.headerText);
+            mHeaderTextView = (TextView) view.findViewById(R.id.headerText);
+            mDetailsTextView = (TextView) view.findViewById(R.id.detailsText);
+            mErrorTextView = (TextView) view.findViewById(R.id.errorText);
             mIsAlpha = DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC == storedQuality
                     || DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC == storedQuality
                     || DevicePolicyManager.PASSWORD_QUALITY_COMPLEX == storedQuality;
 
             Intent intent = getActivity().getIntent();
             if (intent != null) {
-                CharSequence headerMessage = intent.getCharSequenceExtra(HEADER_TEXT);
+                CharSequence headerMessage = intent.getCharSequenceExtra(
+                        ConfirmDeviceCredentialBaseFragment.HEADER_TEXT);
+                CharSequence detailsMessage = intent.getCharSequenceExtra(
+                        ConfirmDeviceCredentialBaseFragment.DETAILS_TEXT);
                 if (TextUtils.isEmpty(headerMessage)) {
                     headerMessage = getString(getDefaultHeader());
                 }
-                mHeaderText.setText(headerMessage);
+                if (TextUtils.isEmpty(detailsMessage)) {
+                    detailsMessage = getString(getDefaultDetails());
+                }
+                mHeaderTextView.setText(headerMessage);
+                mDetailsTextView.setText(detailsMessage);
             }
-
-            final Activity activity = getActivity();
-            mKeyboardHelper = new PasswordEntryKeyboardHelper(activity,
-                    mKeyboardView, mPasswordEntry);
-            mKeyboardHelper.setKeyboardMode(mIsAlpha ?
-                    PasswordEntryKeyboardHelper.KEYBOARD_MODE_ALPHA
-                    : PasswordEntryKeyboardHelper.KEYBOARD_MODE_NUMERIC);
-            mKeyboardView.requestFocus();
-
             int currentType = mPasswordEntry.getInputType();
             mPasswordEntry.setInputType(mIsAlpha ? currentType
                     : (InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD));
-
-            if (activity instanceof SettingsActivity) {
-                final SettingsActivity sa = (SettingsActivity) activity;
-                int id = getDefaultHeader();
-                CharSequence title = getText(id);
-                sa.setTitle(title);
-            }
-
             return view;
         }
 
@@ -164,10 +129,19 @@
                     : R.string.lockpassword_confirm_your_pin_header;
         }
 
+        private int getDefaultDetails() {
+            return mIsAlpha ? R.string.lockpassword_confirm_your_password_generic
+                    : R.string.lockpassword_confirm_your_pin_generic;
+        }
+
+        private int getErrorMessage() {
+            return mIsAlpha ? R.string.lockpassword_invalid_password
+                    : R.string.lockpassword_invalid_pin;
+        }
+
         @Override
         public void onPause() {
             super.onPause();
-            mKeyboardView.requestFocus();
             if (mCountdownTimer != null) {
                 mCountdownTimer.cancel();
                 mCountdownTimer = null;
@@ -181,9 +155,7 @@
 
         @Override
         public void onResume() {
-            // TODO Auto-generated method stub
             super.onResume();
-            mKeyboardView.requestFocus();
             long deadline = mLockPatternUtils.getLockoutAttemptDeadline();
             if (deadline != 0) {
                 handleAttemptLockout(deadline);
@@ -196,18 +168,40 @@
             outState.putInt(KEY_NUM_WRONG_CONFIRM_ATTEMPTS, mNumWrongConfirmAttempts);
         }
 
+        @Override
+        protected void authenticationSucceeded() {
+            Intent intent = new Intent();
+            getActivity().setResult(RESULT_OK, intent);
+            getActivity().finish();
+        }
+
         private void handleNext() {
             final String pin = mPasswordEntry.getText().toString();
-            if (mLockPatternUtils.checkPassword(pin)) {
-
-                Intent intent = new Intent();
+            final boolean verifyChallenge = getActivity().getIntent().getBooleanExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
+            boolean matched = false;
+            Intent intent = new Intent();
+            if (verifyChallenge)  {
+                if (getActivity() instanceof ConfirmLockPassword.InternalActivity) {
+                    long challenge = getActivity().getIntent().getLongExtra(
+                            ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0);
+                    byte[] token = mLockPatternUtils.verifyPassword(pin, challenge);
+                    if (token != null) {
+                        matched = true;
+                        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
+                    }
+                }
+            } else if (mLockPatternUtils.checkPassword(pin)) {
+                matched = true;
                 if (getActivity() instanceof ConfirmLockPassword.InternalActivity) {
                     intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_TYPE,
                                     mIsAlpha ? StorageManager.CRYPT_TYPE_PASSWORD
                                              : StorageManager.CRYPT_TYPE_PIN);
                     intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, pin);
                 }
+            }
 
+            if (matched) {
                 getActivity().setResult(RESULT_OK, intent);
                 getActivity().finish();
             } else {
@@ -215,14 +209,13 @@
                     long deadline = mLockPatternUtils.setLockoutAttemptDeadline();
                     handleAttemptLockout(deadline);
                 } else {
-                    showError(R.string.lockpattern_need_to_unlock_wrong);
+                    showError(getErrorMessage());
                 }
             }
         }
 
         private void handleAttemptLockout(long elapsedRealtimeDeadline) {
             long elapsedRealtime = SystemClock.elapsedRealtime();
-            showError(R.string.lockpattern_too_many_failed_confirmation_attempts_header, 0);
             mPasswordEntry.setEnabled(false);
             mCountdownTimer = new CountDownTimer(
                     elapsedRealtimeDeadline - elapsedRealtime,
@@ -231,15 +224,15 @@
                 @Override
                 public void onTick(long millisUntilFinished) {
                     final int secondsCountdown = (int) (millisUntilFinished / 1000);
-                    mHeaderText.setText(getString(
-                            R.string.lockpattern_too_many_failed_confirmation_attempts_footer,
-                            secondsCountdown));
+                    showError(getString(
+                            R.string.lockpattern_too_many_failed_confirmation_attempts,
+                            secondsCountdown), 0);
                 }
 
                 @Override
                 public void onFinish() {
                     mPasswordEntry.setEnabled(true);
-                    mHeaderText.setText(getDefaultHeader());
+                    mErrorTextView.setText("");
                     mNumWrongConfirmAttempts = 0;
                 }
             }.start();
@@ -264,13 +257,13 @@
 
         private final Runnable mResetErrorRunnable = new Runnable() {
             public void run() {
-                mHeaderText.setText(getDefaultHeader());
+                mErrorTextView.setText("");
             }
         };
 
-        private void showError(int msg, long timeout) {
-            mHeaderText.setText(msg);
-            mHeaderText.announceForAccessibility(mHeaderText.getText());
+        private void showError(CharSequence msg, long timeout) {
+            mErrorTextView.setText(msg);
+            mErrorTextView.announceForAccessibility(mErrorTextView.getText());
             mPasswordEntry.setText(null);
             mHandler.removeCallbacks(mResetErrorRunnable);
             if (timeout != 0) {
@@ -278,6 +271,10 @@
             }
         }
 
+        private void showError(int msg, long timeout) {
+            showError(getText(msg), timeout);
+        }
+
         // {@link OnEditorActionListener} methods.
         public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
             // Check if this was the result of hitting the enter or "done" key
@@ -289,16 +286,5 @@
             }
             return false;
         }
-
-        // {@link TextWatcher} methods.
-        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-        }
-
-        public void onTextChanged(CharSequence s, int start, int before, int count) {
-        }
-
-        public void afterTextChanged(Editable s) {
-            mContinueButton.setEnabled(mPasswordEntry.getText().length() > 0);
-        }
     }
 }
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index b5d444b..420a7f8 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -22,13 +22,14 @@
 import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient;
 import com.android.internal.widget.LockPatternView.Cell;
 
+import android.annotation.Nullable;
 import android.app.Activity;
-import android.app.Fragment;
 import android.content.Intent;
 import android.os.CountDownTimer;
 import android.os.SystemClock;
 import android.os.Bundle;
 import android.os.storage.StorageManager;
+import android.view.MenuItem;
 import android.widget.TextView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -42,23 +43,11 @@
  * Sets an activity result of {@link Activity#RESULT_OK} when the user
  * successfully confirmed their pattern.
  */
-public class ConfirmLockPattern extends SettingsActivity {
+public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
 
     public static class InternalActivity extends ConfirmLockPattern {
     }
 
-    /**
-     * Names of {@link CharSequence} fields within the originating {@link Intent}
-     * that are used to configure the keyguard confirmation view's labeling.
-     * The view will use the system-defined resource strings for any labels that
-     * the caller does not supply.
-     */
-    public static final String PACKAGE = "com.android.settings";
-    public static final String HEADER_TEXT = PACKAGE + ".ConfirmLockPattern.header";
-    public static final String FOOTER_TEXT = PACKAGE + ".ConfirmLockPattern.footer";
-    public static final String HEADER_WRONG_TEXT = PACKAGE + ".ConfirmLockPattern.header_wrong";
-    public static final String FOOTER_WRONG_TEXT = PACKAGE + ".ConfirmLockPattern.footer_wrong";
-
     private enum Stage {
         NeedToUnlock,
         NeedToUnlockWrong,
@@ -66,13 +55,6 @@
     }
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        CharSequence msg = getText(R.string.lockpassword_confirm_your_pattern_header);
-        setTitle(msg);
-    }
-
-    @Override
     public Intent getIntent() {
         Intent modIntent = new Intent(super.getIntent());
         modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ConfirmLockPatternFragment.class.getName());
@@ -85,7 +67,7 @@
         return false;
     }
 
-    public static class ConfirmLockPatternFragment extends InstrumentedFragment {
+    public static class ConfirmLockPatternFragment extends ConfirmDeviceCredentialBaseFragment {
 
         // how long we wait to clear a wrong pattern
         private static final int WRONG_PATTERN_CLEAR_TIMEOUT_MS = 2000;
@@ -98,13 +80,14 @@
         private CountDownTimer mCountdownTimer;
 
         private TextView mHeaderTextView;
-        private TextView mFooterTextView;
+        private TextView mDetailsTextView;
+        private TextView mErrorTextView;
+        private View mLeftSpacerLandscape;
+        private View mRightSpacerLandscape;
 
         // caller-supplied text for various prompts
         private CharSequence mHeaderText;
-        private CharSequence mFooterText;
-        private CharSequence mHeaderWrongText;
-        private CharSequence mFooterWrongText;
+        private CharSequence mDetailsText;
 
         // required constructor for fragments
         public ConfirmLockPatternFragment() {
@@ -123,7 +106,10 @@
             View view = inflater.inflate(R.layout.confirm_lock_pattern, null);
             mHeaderTextView = (TextView) view.findViewById(R.id.headerText);
             mLockPatternView = (LockPatternView) view.findViewById(R.id.lockPattern);
-            mFooterTextView = (TextView) view.findViewById(R.id.footerText);
+            mDetailsTextView = (TextView) view.findViewById(R.id.detailsText);
+            mErrorTextView = (TextView) view.findViewById(R.id.errorText);
+            mLeftSpacerLandscape = view.findViewById(R.id.leftSpacer);
+            mRightSpacerLandscape = view.findViewById(R.id.rightSpacer);
 
             // make it so unhandled touch events within the unlock screen go to the
             // lock pattern view.
@@ -133,10 +119,10 @@
 
             Intent intent = getActivity().getIntent();
             if (intent != null) {
-                mHeaderText = intent.getCharSequenceExtra(HEADER_TEXT);
-                mFooterText = intent.getCharSequenceExtra(FOOTER_TEXT);
-                mHeaderWrongText = intent.getCharSequenceExtra(HEADER_WRONG_TEXT);
-                mFooterWrongText = intent.getCharSequenceExtra(FOOTER_WRONG_TEXT);
+                mHeaderText = intent.getCharSequenceExtra(
+                        ConfirmDeviceCredentialBaseFragment.HEADER_TEXT);
+                mDetailsText = intent.getCharSequenceExtra(
+                        ConfirmDeviceCredentialBaseFragment.DETAILS_TEXT);
             }
 
             mLockPatternView.setTactileFeedbackEnabled(mLockPatternUtils.isTactileFeedbackEnabled());
@@ -199,28 +185,21 @@
                     if (mHeaderText != null) {
                         mHeaderTextView.setText(mHeaderText);
                     } else {
-                        mHeaderTextView.setText(R.string.lockpattern_need_to_unlock);
+                        mHeaderTextView.setText(R.string.lockpassword_confirm_your_pattern_header);
                     }
-                    if (mFooterText != null) {
-                        mFooterTextView.setText(mFooterText);
+                    if (mDetailsText != null) {
+                        mDetailsTextView.setText(mDetailsText);
                     } else {
-                        mFooterTextView.setText(R.string.lockpattern_need_to_unlock_footer);
+                        mDetailsTextView.setText(
+                                R.string.lockpassword_confirm_your_pattern_generic);
                     }
+                    mErrorTextView.setText("");
 
                     mLockPatternView.setEnabled(true);
                     mLockPatternView.enableInput();
                     break;
                 case NeedToUnlockWrong:
-                    if (mHeaderWrongText != null) {
-                        mHeaderTextView.setText(mHeaderWrongText);
-                    } else {
-                        mHeaderTextView.setText(R.string.lockpattern_need_to_unlock_wrong);
-                    }
-                    if (mFooterWrongText != null) {
-                        mFooterTextView.setText(mFooterWrongText);
-                    } else {
-                        mFooterTextView.setText(R.string.lockpattern_need_to_unlock_wrong_footer);
-                    }
+                    mErrorTextView.setText(R.string.lockpattern_need_to_unlock_wrong);
 
                     mLockPatternView.setDisplayMode(LockPatternView.DisplayMode.Wrong);
                     mLockPatternView.setEnabled(true);
@@ -252,6 +231,23 @@
             mLockPatternView.postDelayed(mClearPatternRunnable, WRONG_PATTERN_CLEAR_TIMEOUT_MS);
         }
 
+        @Override
+        protected void authenticationSucceeded() {
+            Intent intent = new Intent();
+            getActivity().setResult(Activity.RESULT_OK, intent);
+            getActivity().finish();
+        }
+
+        @Override
+        public void onFingerprintIconVisibilityChanged(boolean visible) {
+            if (mLeftSpacerLandscape != null && mRightSpacerLandscape != null) {
+
+                // In landscape, adjust spacing depending on fingerprint icon visibility.
+                mLeftSpacerLandscape.setVisibility(visible ? View.GONE : View.VISIBLE);
+                mRightSpacerLandscape.setVisibility(visible ? View.GONE : View.VISIBLE);
+            }
+        }
+
         /**
          * The pattern listener that responds according to a user confirming
          * an existing lock pattern.
@@ -272,9 +268,22 @@
             }
 
             public void onPatternDetected(List<LockPatternView.Cell> pattern) {
-                if (mLockPatternUtils.checkPattern(pattern)) {
-
-                    Intent intent = new Intent();
+                final boolean verifyChallenge = getActivity().getIntent().getBooleanExtra(
+                        ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
+                boolean matched = false;
+                Intent intent = new Intent();
+                if (verifyChallenge) {
+                    if (getActivity() instanceof ConfirmLockPattern.InternalActivity) {
+                        long challenge = getActivity().getIntent().getLongExtra(
+                            ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0);
+                        byte[] token = mLockPatternUtils.verifyPattern(pattern, challenge);
+                        if (token != null) {
+                            matched = true;
+                            intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
+                        }
+                    }
+                } else if (mLockPatternUtils.checkPattern(pattern)) {
+                    matched = true;
                     if (getActivity() instanceof ConfirmLockPattern.InternalActivity) {
                         intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_TYPE,
                                         StorageManager.CRYPT_TYPE_PATTERN);
@@ -282,6 +291,9 @@
                                         LockPatternUtils.patternToString(pattern));
                     }
 
+                }
+
+                if (matched) {
                     getActivity().setResult(Activity.RESULT_OK, intent);
                     getActivity().finish();
                 } else {
@@ -308,10 +320,9 @@
 
                 @Override
                 public void onTick(long millisUntilFinished) {
-                    mHeaderTextView.setText(R.string.lockpattern_too_many_failed_confirmation_attempts_header);
                     final int secondsCountdown = (int) (millisUntilFinished / 1000);
-                    mFooterTextView.setText(getString(
-                            R.string.lockpattern_too_many_failed_confirmation_attempts_footer,
+                    mErrorTextView.setText(getString(
+                            R.string.lockpattern_too_many_failed_confirmation_attempts,
                             secondsCountdown));
                 }
 
diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index 45d3d11..8506964 100644
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -439,9 +439,8 @@
     private boolean confirmKeyGuard() {
         Resources res = getResources();
         boolean launched = new ChooseLockSettingsHelper(this)
-                .launchConfirmationActivity(CONFIRM_KEY_GUARD_REQUEST, null,
-                                            res.getText(R.string.credentials_install_gesture_explanation),
-                                            true);
+                .launchConfirmationActivity(CONFIRM_KEY_GUARD_REQUEST,
+                        res.getText(R.string.credentials_title), true);
         return launched;
     }
 
diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java
index 3fb60e3..2e4aeb8 100644
--- a/src/com/android/settings/CryptKeeperSettings.java
+++ b/src/com/android/settings/CryptKeeperSettings.java
@@ -166,9 +166,8 @@
             return true;
         }
 
-        return helper.launchConfirmationActivity(request, null,
-                res.getText(R.string.crypt_keeper_confirm_encrypt),
-                true);
+        return helper.launchConfirmationActivity(request,
+                res.getText(R.string.crypt_keeper_encrypt_title), true);
     }
 
     @Override
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index e0091e1..5c7e0e9 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -24,6 +24,7 @@
 import android.app.backup.IBackupManager;
 import android.bluetooth.BluetoothAdapter;
 import android.content.BroadcastReceiver;
+import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -751,6 +752,9 @@
     }
 
     private void updateBugreportOptions() {
+        final ComponentName bugreportStorageProviderComponentName =
+                new ComponentName("com.android.shell",
+                        "com.android.shell.BugreportStorageProvider");
         if ("user".equals(Build.TYPE)) {
             final ContentResolver resolver = getActivity().getContentResolver();
             final boolean adbEnabled = Settings.Global.getInt(
@@ -758,14 +762,23 @@
             if (adbEnabled) {
                 mBugreport.setEnabled(true);
                 mBugreportInPower.setEnabled(true);
+                getPackageManager().setComponentEnabledSetting(
+                        bugreportStorageProviderComponentName,
+                        PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0);
             } else {
                 mBugreport.setEnabled(false);
                 mBugreportInPower.setEnabled(false);
                 mBugreportInPower.setChecked(false);
                 Settings.Secure.putInt(resolver, Settings.Secure.BUGREPORT_IN_POWER_MENU, 0);
+                getPackageManager().setComponentEnabledSetting(
+                        bugreportStorageProviderComponentName,
+                        PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0);
             }
         } else {
             mBugreportInPower.setEnabled(true);
+            getPackageManager().setComponentEnabledSetting(
+                    bugreportStorageProviderComponentName,
+                    PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0);
         }
     }
 
@@ -1597,10 +1610,8 @@
     }
 
     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));
+        return new ChooseLockSettingsHelper(getActivity(), this).launchConfirmationActivity(
+                requestCode, resources.getString(R.string.oem_unlock_enable));
     }
 
     @Override
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 061b133..37d9c9c 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -90,6 +90,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_uri_about;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 47cbcde..7ad3832 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -422,6 +422,11 @@
         return false;
     }
 
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_uri_display;
+    }
+
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
                 @Override
diff --git a/src/com/android/settings/FingerprintEnroll.java b/src/com/android/settings/FingerprintEnroll.java
index 96e612b..8449a1f 100644
--- a/src/com/android/settings/FingerprintEnroll.java
+++ b/src/com/android/settings/FingerprintEnroll.java
@@ -105,6 +105,7 @@
         private ProgressBar mProgressBar;
         private ImageView mFingerprintAnimator;
         private ObjectAnimator mProgressAnim;
+        private byte[] mToken;
 
         // Give the user a chance to see progress completed before jumping to the next stage.
         Runnable mDelayedFinishRunnable = new Runnable() {
@@ -253,8 +254,7 @@
 
                 case EnrollingStart:
                     mEnrollmentSteps = -1;
-                    long challenge = 0x12345; // TODO: get from keyguard confirmation
-                    mFingerprintManager.enroll(challenge, mEnrollmentCallback, mEnrollmentCancel,0);
+                    mFingerprintManager.enroll(mToken, mEnrollmentCancel, mEnrollmentCallback, 0);
                     mProgressBar.setProgress(0);
                     mEnrolling = true;
                     startFingerprintAnimator(); // XXX hack - this should follow fingerprint detection
@@ -350,9 +350,12 @@
         public void onActivityResult(int requestCode, int resultCode, Intent data) {
             super.onActivityResult(requestCode, resultCode, data);
 
-            if (requestCode == CHOOSE_LOCK_GENERIC_REQUEST) {
-                if (resultCode == RESULT_FINISHED) {
+            if (requestCode == CHOOSE_LOCK_GENERIC_REQUEST
+                    || requestCode == CONFIRM_REQUEST) {
+                if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {
                     // The lock pin/pattern/password was set. Start enrolling!
+                    mToken = data.getByteArrayExtra(
+                            ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
                     updateStage(Stage.EnrollingFindSensor);
                 }
             }
@@ -380,9 +383,13 @@
                 mContentView.findViewById(buttons[i]).setOnClickListener(this);
             }
 
-            LockPatternUtils utils = new LockPatternUtils(activity);
-            if (!utils.isSecure()) {
-                // Device doesn't have any security. Set that up first.
+            if (mToken == null) {
+                mToken = getActivity().getIntent().getByteArrayExtra(
+                        ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
+            }
+
+            if (mToken == null) {
+                // need to choose or confirm lock
                 updateStage(Stage.EnrollingOnboard);
             } else if (ALWAYS_SHOW_FIND_SCREEN
                     || mFingerprintManager.getEnrolledFingerprints().size() == 0) {
@@ -397,6 +404,8 @@
         public void onSaveInstanceState(final Bundle outState) {
             super.onSaveInstanceState(outState);
             outState.putString(EXTRA_STAGE, mStage.toString());
+            outState.putByteArray(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
+                    mToken);
             if (mStage == Stage.EnrollingRepeat) {
                 outState.putInt(EXTRA_PROGRESS, mProgressBar.getProgress());
             }
@@ -406,6 +415,8 @@
         public void onActivityCreated(Bundle savedInstanceState) {
             super.onActivityCreated(savedInstanceState);
             if (savedInstanceState != null) {
+                mToken = savedInstanceState.getByteArray(
+                        ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
                 //probably orientation change
                 String stageSaved = savedInstanceState.getString(EXTRA_STAGE, null);
                 if (stageSaved != null) {
@@ -426,7 +437,7 @@
                     break;
                 case R.id.fingerprint_enroll_button_next:
                     if (mStage == Stage.EnrollingOnboard) {
-                        launchChooseLock();
+                        launchChooseOrConfirmLock();
                     } else if (mStage == Stage.EnrollingFindSensor) {
                         updateStage(Stage.EnrollingStart);
                     } else if (mStage == Stage.EnrollingFinish) {
@@ -438,13 +449,20 @@
             }
         }
 
-        private void launchChooseLock() {
+        private void launchChooseOrConfirmLock() {
             Intent intent = new Intent();
-            intent.setClassName("com.android.settings", ChooseLockGeneric.class.getName());
-            intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
-                    DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
-            intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS, true);
-            startActivityForResult(intent, CHOOSE_LOCK_GENERIC_REQUEST);
+            long challenge = mFingerprintManager.preEnroll();
+            ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(getActivity(), this);
+            if (!helper.launchConfirmationActivity(CONFIRM_REQUEST, null,
+                        null, null, challenge)) {
+                intent.setClassName("com.android.settings", ChooseLockGeneric.class.getName());
+                intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
+                        DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
+                intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS, true);
+                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
+                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+                startActivityForResult(intent, CHOOSE_LOCK_GENERIC_REQUEST);
+            }
         }
     }
 }
diff --git a/src/com/android/settings/FingerprintSettings.java b/src/com/android/settings/FingerprintSettings.java
index c134cfb..00f4b43 100644
--- a/src/com/android/settings/FingerprintSettings.java
+++ b/src/com/android/settings/FingerprintSettings.java
@@ -19,11 +19,13 @@
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.os.CancellationSignal;
 import android.os.Handler;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
@@ -49,6 +51,16 @@
  * Settings screen for fingerprints
  */
 public class FingerprintSettings extends SettingsActivity {
+    /**
+     * Used by the FP settings wizard to indicate the wizard is
+     * finished, and each activity in the wizard should finish.
+     * <p>
+     * Previously, each activity in the wizard would finish itself after
+     * starting the next activity. However, this leads to broken 'Back'
+     * behavior. So, now an activity does not finish itself until it gets this
+     * result.
+     */
+    static final int RESULT_FINISHED = RESULT_FIRST_USER;
 
     @Override
     public Intent getIntent() {
@@ -80,10 +92,14 @@
         private static final String KEY_MANAGE_CATEGORY = "fingerprint_manage_category";
         private static final String KEY_FINGERPRINT_ENABLE_KEYGUARD_TOGGLE =
                 "fingerprint_enable_keyguard_toggle";
+        private static final String KEY_LAUNCHED_CONFIRM = "launched_confirm";
 
         private static final int MSG_REFRESH_FINGERPRINT_TEMPLATES = 1000;
         private static final int MSG_HIGHLIGHT_FINGERPRINT_ITEM = 1001;
 
+        private static final int CONFIRM_REQUEST = 101;
+        private static final int CHOOSE_LOCK_GENERIC_REQUEST = 102;
+
         private static final int ADD_FINGERPRINT_REQUEST = 10;
 
         private static final boolean ENABLE_USAGE_CATEGORY = false;
@@ -92,8 +108,12 @@
         private FingerprintManager mFingerprintManager;
         private EditText mDialogTextField;
         private PreferenceGroup mManageCategory;
+        private CancellationSignal mFingerprintCancel;
+        private int mMaxFingerprintAttempts;
+        private byte[] mToken;
+        private boolean mLaunchedConfirm;
+
         private AuthenticationCallback mAuthCallback = new AuthenticationCallback() {
-            int mAttempts;
             @Override
             public void onAuthenticationSucceeded(AuthenticationResult result) {
                 mHandler.obtainMessage(MSG_HIGHLIGHT_FINGERPRINT_ITEM,
@@ -101,20 +121,19 @@
                 retryFingerprint(true);
             }
 
+            public void onAuthenticationFailed() {
+                retryFingerprint(true);
+            };
+
             @Override
             public void onAuthenticationError(int errMsgId, CharSequence errString) {
-                Toast.makeText(getActivity(), errString, Toast.LENGTH_SHORT);
-                retryFingerprint(false);
-            }
-
-            private void retryFingerprint(boolean resetAttempts) {
-                if (resetAttempts) {
-                    mAttempts = 0;
+                // get activity will be null on a screen rotation
+                if (getActivity() != null) {
+                    Toast.makeText(getActivity(), errString, Toast.LENGTH_SHORT);
+                    if (errMsgId != FingerprintManager.FINGERPRINT_ERROR_CANCELED) {
+                        retryFingerprint(false);
+                    }
                 }
-                if (mAttempts < MAX_RETRY_ATTEMPTS) {
-                    mFingerprintManager.authenticate(null, mAuthCallback, null, 0);
-                }
-                mAttempts++;
             }
 
             @Override
@@ -148,6 +167,24 @@
             };
         };
 
+        private void stopFingerprint() {
+            if (mFingerprintCancel != null) {
+                mFingerprintCancel.cancel();
+                mFingerprintCancel = null;
+            }
+        }
+
+        private void retryFingerprint(boolean resetAttempts) {
+            if (resetAttempts) {
+                mMaxFingerprintAttempts = 0;
+            }
+            if (mMaxFingerprintAttempts < MAX_RETRY_ATTEMPTS) {
+                mFingerprintCancel = new CancellationSignal();
+                mFingerprintManager.authenticate(null, mFingerprintCancel, mAuthCallback, 0);
+            }
+            mMaxFingerprintAttempts++;
+        }
+
         @Override
         protected int getMetricsCategory() {
             return MetricsLogger.FINGERPRINT;
@@ -156,9 +193,21 @@
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
+            if (savedInstanceState != null) {
+                mToken = savedInstanceState.getByteArray(
+                        ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
+                mLaunchedConfirm = savedInstanceState.getBoolean(
+                        KEY_LAUNCHED_CONFIRM, false);
+            }
+
             mFingerprintManager = (FingerprintManager) getActivity().getSystemService(
                     Context.FINGERPRINT_SERVICE);
-            mFingerprintManager.authenticate(null, mAuthCallback, null, 0);
+
+            // Need to authenticate a session token if none
+            if (mToken == null && mLaunchedConfirm == false) {
+                mLaunchedConfirm = true;
+                launchChooseOrConfirmLock();
+            }
         }
 
         protected void removeFingerprintPreference(int fingerprintId) {
@@ -252,6 +301,21 @@
             // Make sure we reload the preference hierarchy since fingerprints may be added,
             // deleted or renamed.
             createPreferenceHierarchy();
+
+            retryFingerprint(true);
+        }
+
+        @Override
+        public void onPause() {
+            super.onPause();
+            stopFingerprint();
+        }
+
+        @Override
+        public void onSaveInstanceState(final Bundle outState) {
+            outState.putByteArray(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
+                    mToken);
+            outState.putBoolean(KEY_LAUNCHED_CONFIRM, mLaunchedConfirm);
         }
 
         @Override
@@ -260,6 +324,8 @@
             if (KEY_FINGERPRINT_ADD.equals(key)) {
                 Intent intent = new Intent();
                 intent.setClassName("com.android.settings", FingerprintEnroll.class.getName());
+                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
+                stopFingerprint();
                 startActivityForResult(intent, ADD_FINGERPRINT_REQUEST);
             } else if (pref instanceof FingerprintPreference) {
                 FingerprintPreference fpref = (FingerprintPreference) pref;
@@ -319,6 +385,43 @@
         protected int getHelpResource() {
             return R.string.help_url_security;
         }
+
+        @Override
+        public void onActivityResult(int requestCode, int resultCode, Intent data) {
+            super.onActivityResult(requestCode, resultCode, data);
+            if (requestCode == CHOOSE_LOCK_GENERIC_REQUEST
+                    || requestCode == CONFIRM_REQUEST) {
+                if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {
+                    // The lock pin/pattern/password was set. Start enrolling!
+                    if (data != null) {
+                        mToken = data.getByteArrayExtra(
+                                ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
+                    }
+                }
+            }
+
+            if (mToken == null) {
+                // Didn't get an authentication, finishing
+                getActivity().finish();
+            }
+        }
+
+        private void launchChooseOrConfirmLock() {
+            Intent intent = new Intent();
+            long challenge = mFingerprintManager.preEnroll();
+            ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(getActivity(), this);
+            // TODO: update text or remove params from method
+            if (!helper.launchConfirmationActivity(CONFIRM_REQUEST, null,
+                        null, null, challenge)) {
+                intent.setClassName("com.android.settings", ChooseLockGeneric.class.getName());
+                intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
+                        DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
+                intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS, true);
+                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
+                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+                startActivityForResult(intent, CHOOSE_LOCK_GENERIC_REQUEST);
+            }
+        }
     }
 
     public static class FingerprintPreference extends Preference {
diff --git a/src/com/android/settings/FingerprintUiHelper.java b/src/com/android/settings/FingerprintUiHelper.java
new file mode 100644
index 0000000..f4a0275
--- /dev/null
+++ b/src/com/android/settings/FingerprintUiHelper.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings;
+
+import android.hardware.fingerprint.FingerprintManager;
+import android.os.CancellationSignal;
+import android.os.Vibrator;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+/**
+ * Small helper class to manage text/icon around fingerprint authentication UI.
+ */
+public class FingerprintUiHelper extends FingerprintManager.AuthenticationCallback {
+
+    private static final long ERROR_TIMEOUT = 1300;
+    private static final long[] FP_ERROR_VIBRATE_PATTERN = new long[] {0, 30, 100, 30};
+    private static final long[] FP_SUCCESS_VIBRATE_PATTERN = new long[] {0, 30};
+
+    private ImageView mIcon;
+    private TextView mErrorTextView;
+    private CancellationSignal mCancellationSignal;
+
+    private Callback mCallback;
+    private FingerprintManager mFingerprintManager;
+
+    public FingerprintUiHelper(ImageView icon, TextView errorTextView, Callback callback) {
+        mFingerprintManager = icon.getContext().getSystemService(FingerprintManager.class);
+        mIcon = icon;
+        mErrorTextView = errorTextView;
+        mCallback = callback;
+    }
+
+    public void startListening() {
+        if (mFingerprintManager.getEnrolledFingerprints().size() > 0) {
+            mCancellationSignal = new CancellationSignal();
+            mFingerprintManager.authenticate(null, mCancellationSignal, this, 0 /* flags */);
+            setFingerprintIconVisibility(true);
+            mIcon.setImageResource(R.drawable.ic_fingerprint);
+        }
+    }
+
+    public void stopListening() {
+        if (mCancellationSignal != null) {
+            mCancellationSignal.cancel();
+            mCancellationSignal = null;
+        }
+    }
+
+    private void setFingerprintIconVisibility(boolean visible) {
+        mIcon.setVisibility(visible ? View.VISIBLE : View.GONE);
+        mCallback.onFingerprintIconVisibilityChanged(visible);
+    }
+
+    @Override
+    public void onAuthenticationError(int errMsgId, CharSequence errString) {
+        showError(errString);
+        setFingerprintIconVisibility(false);
+    }
+
+    @Override
+    public void onAuthenticationHelp(int helpMsgId, CharSequence helpString) {
+        showError(helpString);
+    }
+
+    @Override
+    public void onAuthenticationFailed() {
+        showError(mIcon.getResources().getString(
+                R.string.fingerprint_not_recognized));
+    }
+
+    @Override
+    public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) {
+        vibrateFingerprintSuccess();
+        mCallback.onAuthenticated();
+    }
+
+    private void showError(CharSequence error) {
+        vibrateFingerprintError();
+        mIcon.setImageResource(R.drawable.ic_fingerprint_error);
+        mErrorTextView.setText(error);
+        mErrorTextView.removeCallbacks(mResetErrorTextRunnable);
+        mErrorTextView.postDelayed(mResetErrorTextRunnable, ERROR_TIMEOUT);
+    }
+
+    private void vibrateFingerprintError() {
+        mIcon.getContext().getSystemService(Vibrator.class).vibrate(FP_ERROR_VIBRATE_PATTERN, -1);
+    }
+
+    private void vibrateFingerprintSuccess() {
+        mIcon.getContext().getSystemService(Vibrator.class).vibrate(FP_SUCCESS_VIBRATE_PATTERN, -1);
+    }
+
+    private Runnable mResetErrorTextRunnable = new Runnable() {
+        @Override
+        public void run() {
+            mErrorTextView.setText("");
+            mIcon.setImageResource(R.drawable.ic_fingerprint);
+        }
+    };
+
+    public interface Callback {
+        void onAuthenticated();
+        void onFingerprintIconVisibilityChanged(boolean visible);
+    }
+}
diff --git a/src/com/android/settings/HelpUtils.java b/src/com/android/settings/HelpUtils.java
index 22e2f76..36fb194 100644
--- a/src/com/android/settings/HelpUtils.java
+++ b/src/com/android/settings/HelpUtils.java
@@ -24,8 +24,10 @@
 import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.Menu;
 import android.view.MenuItem;
 
+import java.net.URISyntaxException;
 import java.util.Locale;
 
 /**
@@ -33,7 +35,9 @@
  * browser to a particular URL, while taking into account the preferred language and app version.
  */
 public class HelpUtils {
-    private final static String TAG = HelpUtils.class.getName();
+    private final static String TAG = HelpUtils.class.getSimpleName();
+
+    private static final int MENU_HELP = Menu.FIRST + 100;
 
     /**
      * Help URL query parameter key for the preferred language.
@@ -53,6 +57,16 @@
     /** Static helper that is not instantiable*/
     private HelpUtils() { }
 
+    public static boolean prepareHelpMenuItem(Context context, Menu menu, String helpUri) {
+        MenuItem helpItem = menu.add(0, MENU_HELP, 0, R.string.help_label);
+        return prepareHelpMenuItem(context, helpItem, helpUri);
+    }
+
+    public static boolean prepareHelpMenuItem(Context context, Menu menu, int helpUriResource) {
+        MenuItem helpItem = menu.add(0, MENU_HELP, 0, R.string.help_label);
+        return prepareHelpMenuItem(context, helpItem, context.getString(helpUriResource));
+    }
+
     /**
      * Prepares the help menu item by doing the following.
      * - If the string corresponding to the helpUrlResourceId is empty or null, then the help menu
@@ -77,22 +91,15 @@
      * @return returns whether the help menu item has been made visible.
      */
     public static boolean prepareHelpMenuItem(Context context, MenuItem helpMenuItem,
-            String helpUrlString) {
-        if (TextUtils.isEmpty(helpUrlString)) {
+            String helpUriString) {
+        if (TextUtils.isEmpty(helpUriString)) {
             // The help url string is empty or null, so set the help menu item to be invisible.
             helpMenuItem.setVisible(false);
 
             // return that the help menu item is not visible (i.e. false)
             return false;
         } else {
-            // The help url string exists, so first add in some extra query parameters.
-            final Uri fullUri = uriWithAddedParameters(context, Uri.parse(helpUrlString));
-
-            // Then, create an intent that will be fired when the user
-            // selects this help menu item.
-            Intent intent = new Intent(Intent.ACTION_VIEW, fullUri);
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-                    | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+            Intent intent = getHelpIntent(context, helpUriString);
 
             // Set the intent to the help menu item, show the help menu item in the overflow
             // menu, and make it visible.
@@ -111,6 +118,24 @@
         }
     }
 
+    private static Intent getHelpIntent(Context context, String helpUriString) {
+        // Try to handle as Intent Uri, otherwise just treat as Uri.
+        try {
+            return Intent.parseUri(helpUriString,
+                    Intent.URI_ANDROID_APP_SCHEME | Intent.URI_INTENT_SCHEME);
+        } catch (URISyntaxException e) {
+        }
+        // The help url string exists, so first add in some extra query parameters.
+        final Uri fullUri = uriWithAddedParameters(context, Uri.parse(helpUriString));
+
+        // Then, create an intent that will be fired when the user
+        // selects this help menu item.
+        Intent intent = new Intent(Intent.ACTION_VIEW, fullUri);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+        return intent;
+    }
+
     /**
      * Adds two query parameters into the Uri, namely the language code and the version code
      * of the app's package as gotten via the context.
diff --git a/src/com/android/settings/InstrumentedFragment.java b/src/com/android/settings/InstrumentedFragment.java
index 604af18..883c67c 100644
--- a/src/com/android/settings/InstrumentedFragment.java
+++ b/src/com/android/settings/InstrumentedFragment.java
@@ -23,9 +23,12 @@
  * Instrumented fragment that logs visibility state.
  */
 public abstract class InstrumentedFragment extends PreferenceFragment {
-    // Declare new temproary categories here, starting after this value.
+    // Declare new temporary categories here, starting after this value.
     public static final int VIEW_CATEGORY_UNDECLARED = 100000;
 
+    public static final int VIEW_CATEGORY_DEFAULT_APPS = VIEW_CATEGORY_UNDECLARED + 1;
+    public static final int VIEW_CATEGORY_STORAGE_APPS = VIEW_CATEGORY_UNDECLARED + 2;
+
     /**
      * Declare the view of this category.
      *
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 1b6468f..23f6812 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -75,8 +75,8 @@
      */
     private boolean runKeyguardConfirmation(int request) {
         Resources res = getActivity().getResources();
-        return new ChooseLockSettingsHelper(getActivity(), this).launchConfirmationActivity(request,
-                null, res.getText(R.string.master_clear_gesture_explanation));
+        return new ChooseLockSettingsHelper(getActivity(), this).launchConfirmationActivity(
+                request, res.getText(R.string.master_clear_title));
     }
 
     @Override
diff --git a/src/com/android/settings/MediaFormat.java b/src/com/android/settings/MediaFormat.java
index 20dac8e..517ec2d 100644
--- a/src/com/android/settings/MediaFormat.java
+++ b/src/com/android/settings/MediaFormat.java
@@ -72,9 +72,8 @@
      * component as a subactivity
      */
     private boolean runKeyguardConfirmation(int request) {
-        return new ChooseLockSettingsHelper(this)
-                .launchConfirmationActivity(request, null,
-                        getText(R.string.media_format_gesture_explanation));
+        return new ChooseLockSettingsHelper(this).launchConfirmationActivity(request,
+                getText(R.string.media_format_title));
     }
 
     @Override
diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index 4eb8a9e..6eb22fb 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -204,7 +204,7 @@
         if (summary != null) {
             mConfigure.setSummary(summary);
         } else {
-            mConfigure.setSummary(R.string.backup_configure_account_default_summary);
+            //mConfigure.setSummary(R.string.backup_configure_account_default_summary);
         }
     }
 
diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java
index a3376d3..587b8e8 100644
--- a/src/com/android/settings/ResetNetwork.java
+++ b/src/com/android/settings/ResetNetwork.java
@@ -78,8 +78,8 @@
      */
     private boolean runKeyguardConfirmation(int request) {
         Resources res = getActivity().getResources();
-        return new ChooseLockSettingsHelper(getActivity(), this).launchConfirmationActivity(request,
-                null, res.getText(R.string.reset_network_gesture_explanation));
+        return new ChooseLockSettingsHelper(getActivity(), this).launchConfirmationActivity(
+                request, res.getText(R.string.reset_network_title));
     }
 
     @Override
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index 1edc7a9..f67467b 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -65,33 +65,34 @@
                 return;
             }
             // TODO maybe show a progress dialog if this ends up taking a while
+            Context context = getActivity();
 
             ConnectivityManager connectivityManager = (ConnectivityManager)
-                    getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
+                    context.getSystemService(Context.CONNECTIVITY_SERVICE);
             if (connectivityManager != null) {
                 connectivityManager.factoryReset();
             }
 
             WifiManager wifiManager = (WifiManager)
-                    getActivity().getSystemService(Context.WIFI_SERVICE);
+                    context.getSystemService(Context.WIFI_SERVICE);
             if (wifiManager != null) {
                 wifiManager.factoryReset();
             }
 
             TelephonyManager telephonyManager = (TelephonyManager)
-                    getActivity().getSystemService(Context.TELEPHONY_SERVICE);
+                    context.getSystemService(Context.TELEPHONY_SERVICE);
             if (telephonyManager != null) {
                 telephonyManager.factoryReset(mSubId);
             }
 
             NetworkPolicyManager policyManager = (NetworkPolicyManager)
-                    getActivity().getSystemService(Context.NETWORK_POLICY_SERVICE);
+                    context.getSystemService(Context.NETWORK_POLICY_SERVICE);
             if (policyManager != null) {
                 String subscriberId = telephonyManager.getSubscriberId(mSubId);
                 policyManager.factoryReset(subscriberId);
             }
 
-            Toast.makeText(getActivity(), R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)
+            Toast.makeText(context, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)
                     .show();
         }
     };
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index c74c90a..30b7590 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -362,7 +362,7 @@
     private void addTrustAgentSettings(PreferenceGroup securityCategory) {
         final boolean hasSecurity = mLockPatternUtils.isSecure();
         ArrayList<TrustAgentComponentInfo> agents =
-                getActiveTrustAgents(getPackageManager(), mLockPatternUtils);
+                getActiveTrustAgents(getPackageManager(), mLockPatternUtils, mDPM);
         for (int i = 0; i < agents.size(); i++) {
             final TrustAgentComponentInfo agent = agents.get(i);
             Preference trustAgentPreference =
@@ -377,7 +377,11 @@
             trustAgentPreference.setIntent(intent);
             // Add preference to the settings menu.
             securityCategory.addPreference(trustAgentPreference);
-            if (!hasSecurity) {
+
+            if (agent.disabledByAdministrator) {
+                trustAgentPreference.setEnabled(false);
+                trustAgentPreference.setSummary(R.string.trust_agent_disabled_device_admin);
+            } else if (!hasSecurity) {
                 trustAgentPreference.setEnabled(false);
                 trustAgentPreference.setSummary(R.string.disabled_because_no_backup_security);
             }
@@ -422,11 +426,15 @@
     }
 
     private static ArrayList<TrustAgentComponentInfo> getActiveTrustAgents(
-            PackageManager pm, LockPatternUtils utils) {
+            PackageManager pm, LockPatternUtils utils, DevicePolicyManager dpm) {
         ArrayList<TrustAgentComponentInfo> result = new ArrayList<TrustAgentComponentInfo>();
         List<ResolveInfo> resolveInfos = pm.queryIntentServices(TRUST_AGENT_INTENT,
                 PackageManager.GET_META_DATA);
         List<ComponentName> enabledTrustAgents = utils.getEnabledTrustAgents();
+
+        boolean disableTrustAgents = (dpm.getKeyguardDisabledFeatures(null)
+                & DevicePolicyManager.KEYGUARD_DISABLE_TRUST_AGENTS) != 0;
+
         if (enabledTrustAgents != null && !enabledTrustAgents.isEmpty()) {
             for (int i = 0; i < resolveInfos.size(); i++) {
                 ResolveInfo resolveInfo = resolveInfos.get(i);
@@ -438,6 +446,10 @@
                         !enabledTrustAgents.contains(
                                 TrustAgentUtils.getComponentName(resolveInfo)) ||
                         TextUtils.isEmpty(trustAgentComponentInfo.title)) continue;
+                if (disableTrustAgents && dpm.getTrustAgentConfiguration(
+                        null, TrustAgentUtils.getComponentName(resolveInfo)) == null) {
+                    trustAgentComponentInfo.disabledByAdministrator = true;
+                }
                 result.add(trustAgentComponentInfo);
                 if (ONLY_ONE_TRUST_AGENT) break;
             }
@@ -603,8 +615,9 @@
             ChooseLockSettingsHelper helper =
                     new ChooseLockSettingsHelper(this.getActivity(), this);
             mTrustAgentClickIntent = preference.getIntent();
-            if (!helper.launchConfirmationActivity(CHANGE_TRUST_AGENT_SETTINGS, null, null) &&
-                    mTrustAgentClickIntent != null) {
+            boolean confirmationLaunched = helper.launchConfirmationActivity(
+                    CHANGE_TRUST_AGENT_SETTINGS, preference.getTitle());
+            if (!confirmationLaunched&&  mTrustAgentClickIntent != null) {
                 // If this returns false, it means no password confirmation is required.
                 startActivity(mTrustAgentClickIntent);
                 mTrustAgentClickIntent = null;
@@ -771,7 +784,8 @@
             final LockPatternUtils lockPatternUtils = new LockPatternUtils(context);
             if (lockPatternUtils.isSecure()) {
                 ArrayList<TrustAgentComponentInfo> agents =
-                        getActiveTrustAgents(context.getPackageManager(), lockPatternUtils);
+                        getActiveTrustAgents(context.getPackageManager(), lockPatternUtils,
+                                context.getSystemService(DevicePolicyManager.class));
                 for (int i = 0; i < agents.size(); i++) {
                     final TrustAgentComponentInfo agent = agents.get(i);
                     data = new SearchIndexableRaw(context);
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 70455a4..ba08036 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -33,6 +33,7 @@
     public static class VpnSettingsActivity extends SettingsActivity { /* empty */ }
     public static class DateTimeSettingsActivity extends SettingsActivity { /* empty */ }
     public static class StorageSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class StorageVolumeSettingsActivity extends SettingsActivity { /* empty */ }
     public static class WifiSettingsActivity extends SettingsActivity { /* empty */ }
     public static class WifiP2pSettingsActivity extends SettingsActivity { /* empty */ }
     public static class InputMethodAndLanguageSettingsActivity extends SettingsActivity { /* empty */ }
@@ -96,6 +97,8 @@
     public static class ZenModeSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ZenModePrioritySettingsActivity extends SettingsActivity { /* empty */ }
     public static class ZenModeAutomationSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class ZenModeScheduleRuleSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class ZenModeExternalRuleSettingsActivity extends SettingsActivity { /* empty */ }
     public static class NotificationSettingsActivity extends SettingsActivity { /* empty */ }
     public static class NotificationAppListActivity extends SettingsActivity { /* empty */ }
     public static class AppNotificationSettingsActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 4794608..e8be34a 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -82,7 +82,8 @@
 import com.android.settings.dashboard.DashboardTile;
 import com.android.settings.dashboard.NoHomeDialogFragment;
 import com.android.settings.dashboard.SearchResultsSummary;
-import com.android.settings.deviceinfo.Memory;
+import com.android.settings.deviceinfo.PublicVolumeSettings;
+import com.android.settings.deviceinfo.StorageSettings;
 import com.android.settings.deviceinfo.UsbSettings;
 import com.android.settings.fuelgauge.BatterySaverSettings;
 import com.android.settings.fuelgauge.PowerUsageSummary;
@@ -94,12 +95,14 @@
 import com.android.settings.nfc.AndroidBeam;
 import com.android.settings.nfc.PaymentSettings;
 import com.android.settings.notification.AppNotificationSettings;
-import com.android.settings.notification.ConditionProviderSettings;
 import com.android.settings.notification.NotificationAccessSettings;
 import com.android.settings.notification.NotificationSettings;
 import com.android.settings.notification.NotificationStation;
 import com.android.settings.notification.OtherSoundSettings;
+import com.android.settings.notification.ZenModeExternalRuleSettings;
+import com.android.settings.notification.ZenModePrioritySettings;
 import com.android.settings.notification.ZenModeSettings;
+import com.android.settings.notification.ZenModeScheduleRuleSettings;
 import com.android.settings.print.PrintJobSettingsFragment;
 import com.android.settings.print.PrintSettingsFragment;
 import com.android.settings.search.DynamicIndexableContentMonitor;
@@ -304,7 +307,8 @@
             CaptionPropertiesFragment.class.getName(),
             com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment.class.getName(),
             TextToSpeechSettings.class.getName(),
-            Memory.class.getName(),
+            StorageSettings.class.getName(),
+            PublicVolumeSettings.class.getName(),
             DevelopmentSettings.class.getName(),
             UsbSettings.class.getName(),
             AndroidBeam.class.getName(),
@@ -317,7 +321,6 @@
             DreamSettings.class.getName(),
             UserSettings.class.getName(),
             NotificationAccessSettings.class.getName(),
-            ConditionProviderSettings.class.getName(),
             PrintSettingsFragment.class.getName(),
             PrintJobSettingsFragment.class.getName(),
             TrustedCredentialsSettings.class.getName(),
@@ -332,7 +335,10 @@
             AppNotificationSettings.class.getName(),
             OtherSoundSettings.class.getName(),
             ApnSettings.class.getName(),
-            WifiCallingSettings.class.getName()
+            WifiCallingSettings.class.getName(),
+            ZenModePrioritySettings.class.getName(),
+            ZenModeScheduleRuleSettings.class.getName(),
+            ZenModeExternalRuleSettings.class.getName(),
     };
 
 
@@ -934,17 +940,31 @@
      */
     public void startPreferencePanelAsUser(String fragmentClass, Bundle args, int titleRes,
             CharSequence titleText, UserHandle userHandle) {
-        String title = null;
-        if (titleRes < 0) {
-            if (titleText != null) {
-                title = titleText.toString();
-            } else {
-                // There not much we can do in that case
-                title = "";
+        // This is a workaround.
+        //
+        // Calling startWithFragmentAsUser() without specifying FLAG_ACTIVITY_NEW_TASK to the intent
+        // starting the fragment could cause a native stack corruption. See b/17523189. However,
+        // adding that flag and start the preference panel with the same UserHandler will make it
+        // impossible to use back button to return to the previous screen. See b/20042570.
+        //
+        // We work around this issue by adding FLAG_ACTIVITY_NEW_TASK to the intent, while doing
+        // another check here to call startPreferencePanel() instead of startWithFragmentAsUser()
+        // when we're calling it as the same user.
+        if (userHandle.getIdentifier() == UserHandle.myUserId()) {
+            startPreferencePanel(fragmentClass, args, titleRes, titleText, null, 0);
+        } else {
+            String title = null;
+            if (titleRes < 0) {
+                if (titleText != null) {
+                    title = titleText.toString();
+                } else {
+                    // There not much we can do in that case
+                    title = "";
+                }
             }
+            Utils.startWithFragmentAsUser(this, fragmentClass, args,
+                    titleRes, title, mIsShortcut, userHandle);
         }
-        Utils.startWithFragmentAsUser(this, fragmentClass, args,
-                titleRes, title, mIsShortcut, userHandle);
     }
 
     /**
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index bf41c80..17ff4b2 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -42,6 +42,8 @@
 import android.widget.ListAdapter;
 import android.widget.ListView;
 
+import com.android.settings.widget.FloatingActionButton;
+
 /**
  * Base class for Settings fragments, with some helper functions and dialog management.
  */
@@ -50,14 +52,13 @@
 
     private static final String TAG = "SettingsPreferenceFragment";
 
-    private static final int MENU_HELP = Menu.FIRST + 100;
     private static final int DELAY_HIGHLIGHT_DURATION_MILLIS = 600;
 
     private static final String SAVE_HIGHLIGHTED_KEY = "android:preference_highlighted";
 
     private SettingsDialogFragment mDialogFragment;
 
-    private String mHelpUrl;
+    private String mHelpUri;
 
     // Cache the content resolver for async callbacks
     private ContentResolver mContentResolver;
@@ -81,6 +82,7 @@
     };
 
     private ViewGroup mPinnedHeaderFrameLayout;
+    private FloatingActionButton mFloatingActionButton;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -93,7 +95,7 @@
         // Prepare help url and enable menu if necessary
         int helpResource = getHelpResource();
         if (helpResource != 0) {
-            mHelpUrl = getResources().getString(helpResource);
+            mHelpUri = getResources().getString(helpResource);
         }
     }
 
@@ -102,9 +104,14 @@
             Bundle savedInstanceState) {
         final View root = super.onCreateView(inflater, container, savedInstanceState);
         mPinnedHeaderFrameLayout = (ViewGroup) root.findViewById(R.id.pinned_header);
+        mFloatingActionButton = (FloatingActionButton) root.findViewById(R.id.fab);
         return root;
     }
 
+    public FloatingActionButton getFloatingActionButton() {
+        return mFloatingActionButton;
+    }
+
     public void setPinnedHeaderView(View pinnedHeader) {
         mPinnedHeaderFrameLayout.addView(pinnedHeader);
         mPinnedHeaderFrameLayout.setVisibility(View.VISIBLE);
@@ -125,7 +132,7 @@
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        if (!TextUtils.isEmpty(mHelpUrl)) {
+        if (!TextUtils.isEmpty(mHelpUri)) {
             setHasOptionsMenu(true);
         }
     }
@@ -158,6 +165,11 @@
         unregisterObserverIfNeeded();
     }
 
+    public void showLoadingWhenEmpty() {
+        View loading = getView().findViewById(R.id.loading_container);
+        getListView().setEmptyView(loading);
+    }
+
     public void registerObserverIfNeeded() {
         if (!mIsDataSetObserverRegistered) {
             if (mCurrentRootAdapter != null) {
@@ -273,14 +285,13 @@
      * @return the resource id for the help url
      */
     protected int getHelpResource() {
-        return 0;
+        return R.string.help_uri_default;
     }
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        if (mHelpUrl != null && getActivity() != null) {
-            MenuItem helpItem = menu.add(0, MENU_HELP, 0, R.string.help_label);
-            HelpUtils.prepareHelpMenuItem(getActivity(), helpItem, mHelpUrl);
+        if (mHelpUri != null && getActivity() != null) {
+            HelpUtils.prepareHelpMenuItem(getActivity(), menu, mHelpUri);
         }
     }
 
diff --git a/src/com/android/settings/SetupChooseLockGeneric.java b/src/com/android/settings/SetupChooseLockGeneric.java
index a631caf..f2da8cc 100644
--- a/src/com/android/settings/SetupChooseLockGeneric.java
+++ b/src/com/android/settings/SetupChooseLockGeneric.java
@@ -52,13 +52,13 @@
 
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent(), resid);
+        resid = SetupWizardUtils.getTheme(getIntent());
         super.onApplyThemeResource(theme, resid, first);
     }
 
     @Override
     public void onNavigationBarCreated(SetupWizardNavBar bar) {
-        SetupWizardUtils.setImmersiveMode(this, bar);
+        SetupWizardUtils.setImmersiveMode(this);
         bar.getNextButton().setEnabled(false);
     }
 
@@ -130,19 +130,56 @@
 
         @Override
         protected Intent getLockPasswordIntent(Context context, int quality,
-                int minLength, int maxLength, boolean requirePasswordToDecrypt,
-                boolean confirmCredentials) {
-            final Intent intent = SetupChooseLockPassword.createIntent(context, quality,
-                    minLength, maxLength, requirePasswordToDecrypt, confirmCredentials);
+                int minLength, final int maxLength,
+                boolean requirePasswordToDecrypt, boolean confirmCredentials) {
+            final Intent intent = SetupChooseLockPassword.createIntent(context, quality, minLength,
+                    maxLength, requirePasswordToDecrypt, confirmCredentials);
             SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
             return intent;
         }
 
         @Override
-        protected Intent getLockPatternIntent(Context context,
-                boolean requirePassword, boolean confirmCredentials) {
-            final Intent intent = SetupChooseLockPattern.createIntent(context,
-                    requirePassword, confirmCredentials);
+        protected Intent getLockPasswordIntent(Context context, int quality,
+                int minLength, final int maxLength,
+                boolean requirePasswordToDecrypt, long challenge) {
+            final Intent intent = SetupChooseLockPassword.createIntent(context, quality, minLength,
+                    maxLength, requirePasswordToDecrypt, challenge);
+            SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
+            return intent;
+        }
+
+        @Override
+        protected Intent getLockPasswordIntent(Context context, int quality, int minLength,
+                final int maxLength, boolean requirePasswordToDecrypt, String password) {
+            final Intent intent = SetupChooseLockPassword.createIntent(context, quality, minLength,
+                    maxLength, requirePasswordToDecrypt, password);
+            SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
+            return intent;
+        }
+
+        @Override
+        protected Intent getLockPatternIntent(Context context, final boolean requirePassword,
+                final boolean confirmCredentials) {
+            final Intent intent = SetupChooseLockPattern.createIntent(context, requirePassword,
+                    confirmCredentials);
+            SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
+            return intent;
+        }
+
+        @Override
+        protected Intent getLockPatternIntent(Context context, final boolean requirePassword,
+                long challenge) {
+            final Intent intent = SetupChooseLockPattern.createIntent(context, requirePassword,
+                    challenge);
+            SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
+            return intent;
+        }
+
+        @Override
+        protected Intent getLockPatternIntent(Context context, final boolean requirePassword,
+                final String pattern) {
+            final Intent intent = SetupChooseLockPattern.createIntent(context, requirePassword,
+                    pattern);
             SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
             return intent;
         }
diff --git a/src/com/android/settings/SetupChooseLockPassword.java b/src/com/android/settings/SetupChooseLockPassword.java
index b9f408e..461b67c 100644
--- a/src/com/android/settings/SetupChooseLockPassword.java
+++ b/src/com/android/settings/SetupChooseLockPassword.java
@@ -17,6 +17,7 @@
 package com.android.settings;
 
 import com.android.setupwizard.navigationbar.SetupWizardNavBar;
+import com.android.setupwizardlib.util.SystemBarHelper;
 
 import android.app.Fragment;
 import android.content.Context;
@@ -26,7 +27,6 @@
 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
@@ -48,6 +48,24 @@
         return intent;
     }
 
+    public static Intent createIntent(Context context, int quality,
+            int minLength, final int maxLength, boolean requirePasswordToDecrypt, String password) {
+        Intent intent = ChooseLockPassword.createIntent(context, quality, minLength, maxLength,
+                requirePasswordToDecrypt, password);
+        intent.setClass(context, SetupChooseLockPassword.class);
+        intent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false);
+        return intent;
+    }
+
+    public static Intent createIntent(Context context, int quality,
+            int minLength, final int maxLength, boolean requirePasswordToDecrypt, long challenge) {
+        Intent intent = ChooseLockPassword.createIntent(context, quality, minLength, maxLength,
+                requirePasswordToDecrypt, challenge);
+        intent.setClass(context, SetupChooseLockPassword.class);
+        intent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false);
+        return intent;
+    }
+
     private SetupWizardNavBar mNavigationBar;
     private SetupChooseLockPasswordFragment mFragment;
 
@@ -63,14 +81,14 @@
 
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent(), resid);
+        resid = SetupWizardUtils.getTheme(getIntent());
         super.onApplyThemeResource(theme, resid, first);
     }
 
     @Override
     public void onNavigationBarCreated(SetupWizardNavBar bar) {
         mNavigationBar = bar;
-        SetupWizardUtils.setImmersiveMode(this, bar);
+        SetupWizardUtils.setImmersiveMode(this);
     }
 
     @Override
@@ -93,15 +111,14 @@
         }
     }
 
-    public static class SetupChooseLockPasswordFragment extends ChooseLockPasswordFragment
-            implements View.OnApplyWindowInsetsListener {
+    public static class SetupChooseLockPasswordFragment extends ChooseLockPasswordFragment {
 
         @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);
+            SystemBarHelper.setImeInsetView(scrollView);
             ViewGroup setupContent = (ViewGroup) view.findViewById(R.id.setup_content);
             inflater.inflate(R.layout.setup_choose_lock_password, setupContent, true);
             return view;
@@ -133,20 +150,5 @@
             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
index 903a207..ca79744 100644
--- a/src/com/android/settings/SetupChooseLockPattern.java
+++ b/src/com/android/settings/SetupChooseLockPattern.java
@@ -38,14 +38,26 @@
 public class SetupChooseLockPattern extends ChooseLockPattern
         implements SetupWizardNavBar.NavigationBarListener {
 
-    public static Intent createIntent(Context context,
-            boolean requirePassword, boolean confirmCredentials) {
+    public static Intent createIntent(Context context, boolean requirePassword,
+            boolean confirmCredentials) {
         Intent intent = ChooseLockPattern.createIntent(context, requirePassword,
                 confirmCredentials);
         intent.setClass(context, SetupChooseLockPattern.class);
         return intent;
     }
 
+    public static Intent createIntent(Context context, boolean requirePassword, String pattern) {
+        Intent intent = ChooseLockPattern.createIntent(context, requirePassword, pattern);
+        intent.setClass(context, SetupChooseLockPattern.class);
+        return intent;
+    }
+
+    public static Intent createIntent(Context context, boolean requirePassword, long challenge) {
+        Intent intent = ChooseLockPattern.createIntent(context, requirePassword, challenge);
+        intent.setClass(context, SetupChooseLockPattern.class);
+        return intent;
+    }
+
     private SetupWizardNavBar mNavigationBar;
     private SetupChooseLockPatternFragment mFragment;
 
@@ -61,14 +73,14 @@
 
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent(), resid);
+        resid = SetupWizardUtils.getTheme(getIntent());
         super.onApplyThemeResource(theme, resid, first);
     }
 
     @Override
     public void onNavigationBarCreated(SetupWizardNavBar bar) {
         mNavigationBar = bar;
-        SetupWizardUtils.setImmersiveMode(this, bar);
+        SetupWizardUtils.setImmersiveMode(this);
     }
 
     @Override
diff --git a/src/com/android/settings/SetupEncryptionInterstitial.java b/src/com/android/settings/SetupEncryptionInterstitial.java
index 41782da..8d5f613 100644
--- a/src/com/android/settings/SetupEncryptionInterstitial.java
+++ b/src/com/android/settings/SetupEncryptionInterstitial.java
@@ -62,13 +62,13 @@
 
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent(), resid);
+        resid = SetupWizardUtils.getTheme(getIntent());
         super.onApplyThemeResource(theme, resid, first);
     }
 
     @Override
     public void onNavigationBarCreated(SetupWizardNavBar bar) {
-        SetupWizardUtils.setImmersiveMode(this, bar);
+        SetupWizardUtils.setImmersiveMode(this);
     }
 
     @Override
diff --git a/src/com/android/settings/SetupRedactionInterstitial.java b/src/com/android/settings/SetupRedactionInterstitial.java
index badfe8d..266a0490 100644
--- a/src/com/android/settings/SetupRedactionInterstitial.java
+++ b/src/com/android/settings/SetupRedactionInterstitial.java
@@ -60,13 +60,13 @@
 
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent(), resid);
+        resid = SetupWizardUtils.getTheme(getIntent());
         super.onApplyThemeResource(theme, resid, first);
     }
 
     @Override
     public void onNavigationBarCreated(SetupWizardNavBar bar) {
-        SetupWizardUtils.setImmersiveMode(this, bar);
+        SetupWizardUtils.setImmersiveMode(this);
         bar.getBackButton().setEnabled(false);
     }
 
diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java
index c35bb15..d91ba13 100644
--- a/src/com/android/settings/SetupWizardUtils.java
+++ b/src/com/android/settings/SetupWizardUtils.java
@@ -17,35 +17,22 @@
 package com.android.settings;
 
 import com.android.settings.widget.SetupWizardIllustration;
-import com.android.setupwizard.navigationbar.SetupWizardNavBar;
-
+import com.android.setupwizardlib.util.SystemBarHelper;
+import com.android.setupwizardlib.util.WizardManagerHelper;
 
 import android.app.Activity;
+import android.app.Dialog;
 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.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) {
@@ -60,42 +47,34 @@
      */
     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);
+        final Intent nextIntent = WizardManagerHelper.getNextIntent(intent, 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;
+    public static int getTheme(Intent intent) {
+        if (WizardManagerHelper.isLightTheme(intent, true)) {
+            return R.style.SetupWizardTheme_Light;
+        } else {
+            return 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);
+    public static void setImmersiveMode(Activity activity) {
+        final boolean useImmersiveMode = activity.getIntent().getBooleanExtra(
+                WizardManagerHelper.EXTRA_USE_IMMERSIVE_MODE, false);
         if (useImmersiveMode) {
-            final Window window = activity.getWindow();
-            window.setNavigationBarColor(Color.TRANSPARENT);
-            window.setStatusBarColor(Color.TRANSPARENT);
+            SystemBarHelper.hideSystemBars(activity.getWindow());
         }
     }
 
+    public static void applyImmersiveFlags(final Dialog dialog) {
+        SystemBarHelper.hideSystemBars(dialog);
+    }
+
     public static TextView getHeader(Activity activity) {
         return (TextView) activity.findViewById(R.id.title);
     }
@@ -109,9 +88,10 @@
     }
 
     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));
+        toIntent.putExtra(WizardManagerHelper.EXTRA_THEME,
+                fromIntent.getStringExtra(WizardManagerHelper.EXTRA_THEME));
+        toIntent.putExtra(WizardManagerHelper.EXTRA_USE_IMMERSIVE_MODE,
+                fromIntent.getBooleanExtra(WizardManagerHelper.EXTRA_USE_IMMERSIVE_MODE, false));
     }
 
     public static void setIllustration(Activity activity, int asset) {
diff --git a/src/com/android/settings/TrustAgentSettings.java b/src/com/android/settings/TrustAgentSettings.java
index 1427d5f..4c6b4ee 100644
--- a/src/com/android/settings/TrustAgentSettings.java
+++ b/src/com/android/settings/TrustAgentSettings.java
@@ -18,6 +18,7 @@
 
 import java.util.List;
 
+import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -38,9 +39,11 @@
 public class TrustAgentSettings extends SettingsPreferenceFragment implements
         Preference.OnPreferenceChangeListener {
     private static final String SERVICE_INTERFACE = TrustAgentService.SERVICE_INTERFACE;
+
     private ArrayMap<ComponentName, AgentInfo> mAvailableAgents;
     private final ArraySet<ComponentName> mActiveAgents = new ArraySet<ComponentName>();
     private LockPatternUtils mLockPatternUtils;
+    private DevicePolicyManager mDpm;
 
     public static final class AgentInfo {
         CharSequence label;
@@ -69,6 +72,7 @@
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+        mDpm = getActivity().getSystemService(DevicePolicyManager.class);
         addPreferencesFromResource(R.xml.trust_agent_settings);
     }
 
@@ -89,6 +93,10 @@
         PreferenceGroup category =
                 (PreferenceGroup) getPreferenceScreen().findPreference("trust_agents");
         category.removeAll();
+
+        boolean disabledByDevicePolicy = (mDpm.getKeyguardDisabledFeatures(null)
+                & DevicePolicyManager.KEYGUARD_DISABLE_TRUST_AGENTS) != 0;
+
         final int count = mAvailableAgents.size();
         for (int i = 0; i < count; i++) {
             AgentInfo agent = mAvailableAgents.valueAt(i);
@@ -100,6 +108,13 @@
             preference.setPersistent(false);
             preference.setOnPreferenceChangeListener(this);
             preference.setChecked(mActiveAgents.contains(agent.component));
+
+            if (disabledByDevicePolicy
+                    && mDpm.getTrustAgentConfiguration(null, agent.component) == null) {
+                preference.setEnabled(false);
+                preference.setSummary(R.string.trust_agent_disabled_device_admin);
+            }
+
             category.addPreference(agent.preference);
         }
     }
diff --git a/src/com/android/settings/TrustAgentUtils.java b/src/com/android/settings/TrustAgentUtils.java
index 31a073c..109663a 100644
--- a/src/com/android/settings/TrustAgentUtils.java
+++ b/src/com/android/settings/TrustAgentUtils.java
@@ -57,6 +57,7 @@
         ComponentName componentName;
         String title;
         String summary;
+        boolean disabledByAdministrator;
     }
 
     public static ComponentName getComponentName(ResolveInfo resolveInfo) {
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index f90351c..d05160c 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -39,8 +39,8 @@
 import android.content.pm.Signature;
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
-import android.content.res.TypedArray;
 import android.content.res.Resources.NotFoundException;
+import android.content.res.TypedArray;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -74,6 +74,9 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.Animation.AnimationListener;
+import android.view.animation.AnimationUtils;
 import android.widget.ListView;
 import android.widget.TabWidget;
 
@@ -1115,4 +1118,39 @@
                 ? R.string.launch_defaults_some
                 : R.string.launch_defaults_none);
     }
+
+    public static void handleLoadingContainer(View loading, View doneLoading, boolean done,
+            boolean animate) {
+        setViewShown(loading, !done, animate);
+        setViewShown(doneLoading, done, animate);
+    }
+
+    private static void setViewShown(final View view, boolean shown, boolean animate) {
+        if (animate) {
+            Animation animation = AnimationUtils.loadAnimation(view.getContext(),
+                    shown ? android.R.anim.fade_in : android.R.anim.fade_out);
+            if (shown) {
+                view.setVisibility(View.VISIBLE);
+            } else {
+                animation.setAnimationListener(new AnimationListener() {
+                    @Override
+                    public void onAnimationStart(Animation animation) {
+                    }
+
+                    @Override
+                    public void onAnimationRepeat(Animation animation) {
+                    }
+
+                    @Override
+                    public void onAnimationEnd(Animation animation) {
+                        view.setVisibility(View.INVISIBLE);
+                    }
+                });
+            }
+            view.startAnimation(animation);
+        } else {
+            view.clearAnimation();
+            view.setVisibility(shown ? View.VISIBLE : View.INVISIBLE);
+        }
+    }
 }
diff --git a/src/com/android/settings/VoiceSettingsActivity.java b/src/com/android/settings/VoiceSettingsActivity.java
deleted file mode 100644
index b5e8ede..0000000
--- a/src/com/android/settings/VoiceSettingsActivity.java
+++ /dev/null
@@ -1,51 +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.
- */
-
-package com.android.settings;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-
-/**
- * Activity for modifying a setting using the Voice Interaction API. This activity
- * MUST only modify the setting if the intent was sent using
- * {@link android.service.voice.VoiceInteractionSession#startVoiceActivity startVoiceActivity}.
- */
-abstract public class VoiceSettingsActivity extends Activity {
-
-    private static final String TAG = "VoiceSettingsActivity";
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        if (isVoiceInteraction()) {
-            // Only permit if this is a voice interaction.
-            onVoiceSettingInteraction(getIntent());
-        } else {
-            Log.v(TAG, "Cannot modify settings without voice interaction");
-        }
-        finish();
-    }
-
-    /**
-     * Modify the setting as a voice interaction. The activity will finish
-     * after this method is called.
-     */
-    abstract protected void onVoiceSettingInteraction(Intent intent);
-}
diff --git a/src/com/android/settings/WallpaperTypeSettings.java b/src/com/android/settings/WallpaperTypeSettings.java
index 8c8da31..9046bfb 100644
--- a/src/com/android/settings/WallpaperTypeSettings.java
+++ b/src/com/android/settings/WallpaperTypeSettings.java
@@ -40,6 +40,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_uri_wallpaper;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 000aa30..e8c3e15 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -22,7 +22,6 @@
 import android.app.Dialog;
 import android.app.admin.DevicePolicyManager;
 import android.content.ActivityNotFoundException;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -38,7 +37,6 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
 import android.provider.SearchIndexableResource;
@@ -49,20 +47,17 @@
 
 import com.android.ims.ImsManager;
 import com.android.internal.logging.MetricsLogger;
-import com.android.internal.telephony.SmsApplication;
-import com.android.internal.telephony.SmsApplication.SmsApplicationData;
 import com.android.internal.telephony.TelephonyIntents;
 import com.android.internal.telephony.TelephonyProperties;
 import com.android.settings.nfc.NfcEnabler;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 
-public class WirelessSettings extends SettingsPreferenceFragment
-        implements OnPreferenceChangeListener, Indexable {
+public class WirelessSettings extends SettingsPreferenceFragment implements Indexable {
     private static final String TAG = "WirelessSettings";
 
     private static final String KEY_TOGGLE_AIRPLANE = "toggle_airplane";
@@ -74,7 +69,6 @@
     private static final String KEY_PROXY_SETTINGS = "proxy_settings";
     private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
     private static final String KEY_MANAGE_MOBILE_PLAN = "manage_mobile_plan";
-    private static final String KEY_SMS_APPLICATION = "sms_application";
     private static final String KEY_TOGGLE_NSD = "toggle_nsd"; //network service discovery
     private static final String KEY_CELL_BROADCAST_SETTINGS = "cell_broadcast_settings";
     private static final String KEY_WFC_SETTINGS = "wifi_calling_settings";
@@ -96,7 +90,6 @@
     private static final int MANAGE_MOBILE_PLAN_DIALOG_ID = 1;
     private static final String SAVED_MANAGE_MOBILE_PLAN_MSG = "mManageMobilePlanMessage";
 
-    private AppListPreference mSmsApplicationPreference;
     private PreferenceScreen mButtonWfc;
 
     /**
@@ -187,27 +180,6 @@
         }
     }
 
-    private void initSmsApplicationSetting() {
-        log("initSmsApplicationSetting:");
-        Collection<SmsApplicationData> smsApplications =
-                SmsApplication.getApplicationCollection(getActivity());
-
-        // If the list is empty the dialog will be empty, but we will not crash.
-        int count = smsApplications.size();
-        String[] packageNames = new String[count];
-        int i = 0;
-        for (SmsApplicationData smsApplicationData : smsApplications) {
-            packageNames[i] = smsApplicationData.mPackageName;
-            i++;
-        }
-        String defaultPackageName = null;
-        ComponentName appName = SmsApplication.getDefaultSmsApplication(getActivity(), true);
-        if (appName != null) {
-            defaultPackageName = appName.getPackageName();
-        }
-        mSmsApplicationPreference.setPackageNames(packageNames, defaultPackageName);
-    }
-
     @Override
     public Dialog onCreateDialog(int dialogId) {
         log("onCreateDialog: dialogId=" + dialogId);
@@ -233,11 +205,6 @@
         Log.d(TAG, s);
     }
 
-    private boolean isSmsSupported() {
-        // Some tablet has sim card but could not do telephony operations. Skip those.
-        return mTm.isSmsCapable();
-    }
-
     @Override
     protected int getMetricsCategory() {
         return MetricsLogger.WIRELESS;
@@ -260,7 +227,6 @@
 
         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);
@@ -271,15 +237,6 @@
         mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference);
         mNfcEnabler = new NfcEnabler(activity, nfc, androidBeam);
 
-        mSmsApplicationPreference = (AppListPreference) findPreference(KEY_SMS_APPLICATION);
-        // Restricted users cannot currently read/write SMS.
-        if (isRestrictedUser) {
-            removePreference(KEY_SMS_APPLICATION);
-        } else {
-            mSmsApplicationPreference.setOnPreferenceChangeListener(this);
-            initSmsApplicationSetting();
-        }
-
         if (ImsManager.isWfcEnabledByPlatform(activity)) {
             mButtonWfc = (PreferenceScreen) findPreference(KEY_WFC_SETTINGS);
         } else {
@@ -355,11 +312,6 @@
             }
         }
 
-        // Remove SMS Application if the device does not support SMS
-        if (!isSmsSupported()) {
-            removePreference(KEY_SMS_APPLICATION);
-        }
-
         // Remove Airplane Mode settings if it's a stationary device such as a TV.
         if (mPm.hasSystemFeature(PackageManager.FEATURE_TELEVISION)) {
             removePreference(KEY_TOGGLE_AIRPLANE);
@@ -410,13 +362,6 @@
     }
 
     @Override
-    public void onStart() {
-        super.onStart();
-
-        initSmsApplicationSetting();
-    }
-
-    @Override
     public void onResume() {
         super.onResume();
 
@@ -473,15 +418,6 @@
         return R.string.help_url_more_networks;
     }
 
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (preference == mSmsApplicationPreference && newValue != null) {
-            SmsApplication.setDefaultApplication(newValue.toString(), getActivity());
-            return true;
-        }
-        return false;
-    }
-
     /**
      * For Search.
      */
@@ -504,7 +440,6 @@
                 final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
                 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);
@@ -542,13 +477,6 @@
                     result.add(KEY_MANAGE_MOBILE_PLAN);
                 }
 
-                // Remove SMS Application if the device does not support SMS
-                TelephonyManager tm =
-                        (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-                if (!tm.isSmsCapable() || isRestrictedUser) {
-                    result.add(KEY_SMS_APPLICATION);
-                }
-
                 final PackageManager pm = context.getPackageManager();
 
                 // Remove Airplane Mode settings if it's a stationary device such as a TV.
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index c4b3a96..96577a0 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -204,6 +204,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_uri_accessibility;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         addPreferencesFromResource(R.xml.accessibility_settings);
diff --git a/src/com/android/settings/applications/AdvancedAppSettings.java b/src/com/android/settings/applications/AdvancedAppSettings.java
index 2c6efa6..52a8b85 100644
--- a/src/com/android/settings/applications/AdvancedAppSettings.java
+++ b/src/com/android/settings/applications/AdvancedAppSettings.java
@@ -15,76 +15,34 @@
  */
 package com.android.settings.applications;
 
-import static android.net.NetworkPolicyManager.POLICY_NONE;
-import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
-
 import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.AlertDialog;
-import android.app.AppOpsManager;
-import android.app.INotificationManager;
-import android.content.Context;
-import android.content.DialogInterface;
 import android.content.pm.ApplicationInfo;
-import android.content.pm.IPackageManager;
-import android.content.pm.PackageManager;
-import android.net.NetworkPolicyManager;
-import android.os.AsyncTask;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.UserHandle;
 import android.preference.Preference;
-import android.preference.Preference.OnPreferenceClickListener;
-import android.provider.SearchIndexableResource;
 import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
 
 import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.applications.ApplicationsState.AppEntry;
-import com.android.settings.applications.ApplicationsState.Callbacks;
 import com.android.settings.applications.ApplicationsState.Session;
-import com.android.settings.applications.PermissionsInfo.Callback;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
+import com.android.settingslib.applications.PermissionsInfo;
 
 import java.util.ArrayList;
-import java.util.List;
 
-public class AdvancedAppSettings extends SettingsPreferenceFragment implements Callbacks,
-        DialogInterface.OnClickListener, DialogInterface.OnDismissListener, Callback, Indexable {
+public class AdvancedAppSettings extends SettingsPreferenceFragment implements
+        ApplicationsState.Callbacks, PermissionsInfo.Callback {
 
     static final String TAG = "AdvancedAppSettings";
     static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
     private static final String KEY_APP_PERM = "manage_perms";
-    private static final String KEY_ALL_APPS = "all_apps";
     private static final String KEY_APP_DOMAIN_URLS = "domain_urls";
-    private static final String KEY_RESET_ALL = "reset_all";
-    private static final String KEY_DEFAULT_EMERGENCY_APP = "default_emergency_app";
-    private static final String EXTRA_RESET_DIALOG = "resetDialog";
 
     private ApplicationsState mApplicationsState;
     private Session mSession;
     private Preference mAppPermsPreference;
     private Preference mAppDomainURLsPreference;
-    private Preference mAllAppsPreference;
-    private Preference mResetAllPreference;
-
-    AlertDialog mResetDialog;
-
-    private boolean mActivityResumed;
-    private PackageManager mPm;
-    private IPackageManager mIPm;
-    private INotificationManager mNm;
-    private NetworkPolicyManager mNpm;
-    private AppOpsManager mAom;
-    private Handler mHandler;
     private PermissionsInfo mPermissionsInfo;
 
     @Override
@@ -97,33 +55,11 @@
 
         mAppPermsPreference = findPreference(KEY_APP_PERM);
         mAppDomainURLsPreference = findPreference(KEY_APP_DOMAIN_URLS);
-        mAllAppsPreference = findPreference(KEY_ALL_APPS);
-        mResetAllPreference = findPreference(KEY_RESET_ALL);
-        mResetAllPreference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-            @Override
-            public boolean onPreferenceClick(Preference preference) {
-                buildResetDialog();
-                return true;
-            }
-        });
         updateUI();
-
-        mPm = getActivity().getPackageManager();
-        mIPm = IPackageManager.Stub.asInterface(ServiceManager.getService("package"));
-        mNm = INotificationManager.Stub.asInterface(
-                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
-        mNpm = NetworkPolicyManager.from(getActivity());
-        mAom = (AppOpsManager)getActivity().getSystemService(Context.APP_OPS_SERVICE);
-        mHandler = new Handler(getActivity().getMainLooper());
-
-        if (!DefaultEmergencyPreference.isAvailable(getActivity())) {
-            removePreference(KEY_DEFAULT_EMERGENCY_APP);
-        }
     }
 
     private void updateUI() {
         ArrayList<AppEntry> allApps = mSession.getAllApps();
-        mAllAppsPreference.setSummary(getString(R.string.all_apps_summary, allApps.size()));
 
         int countAppWithDomainURLs = 0;
         for (AppEntry entry : allApps) {
@@ -137,25 +73,6 @@
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        if (savedInstanceState != null && savedInstanceState.getBoolean(EXTRA_RESET_DIALOG)) {
-            buildResetDialog();
-        }
-
-        return super.onCreateView(inflater, container, savedInstanceState);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        if (mResetDialog != null) {
-            mResetDialog.dismiss();
-            mResetDialog = null;
-        }
-    }
-
-    @Override
     protected int getMetricsCategory() {
         return MetricsLogger.APPLICATIONS_ADVANCED;
     }
@@ -163,98 +80,10 @@
     @Override
     public void onResume() {
         super.onResume();
-        mActivityResumed = true;
         mPermissionsInfo = new PermissionsInfo(getActivity(), this);
     }
 
     @Override
-    public void onPause() {
-        mActivityResumed = false;
-        super.onPause();
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        if (mResetDialog != null) {
-            outState.putBoolean(EXTRA_RESET_DIALOG, true);
-        }
-    }
-
-    void buildResetDialog() {
-        if (mResetDialog == null) {
-            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-            builder.setTitle(R.string.reset_app_preferences_title);
-            builder.setMessage(R.string.reset_app_preferences_desc);
-            builder.setPositiveButton(R.string.reset_app_preferences_button, this);
-            builder.setNegativeButton(R.string.cancel, null);
-            mResetDialog = builder.show();
-            mResetDialog.setOnDismissListener(this);
-        }
-    }
-
-    @Override
-    public void onDismiss(DialogInterface dialog) {
-        if (mResetDialog == dialog) {
-            mResetDialog = null;
-        }
-    }
-
-    @Override
-    public void onClick(DialogInterface dialog, int which) {
-        if (mResetDialog == dialog) {
-            (new AsyncTask<Void, Void, Void>() {
-                @Override protected Void doInBackground(Void... params) {
-                    List<ApplicationInfo> apps = mPm.getInstalledApplications(
-                            PackageManager.GET_DISABLED_COMPONENTS);
-                    for (int i=0; i<apps.size(); i++) {
-                        ApplicationInfo app = apps.get(i);
-                        try {
-                            if (DEBUG) Log.v(TAG, "Enabling notifications: " + app.packageName);
-                            mNm.setNotificationsEnabledForPackage(app.packageName, app.uid, true);
-                        } catch (android.os.RemoteException ex) {
-                        }
-                        if (!app.enabled) {
-                            if (DEBUG) Log.v(TAG, "Enabling app: " + app.packageName);
-                            if (mPm.getApplicationEnabledSetting(app.packageName)
-                                    == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER) {
-                                mPm.setApplicationEnabledSetting(app.packageName,
-                                        PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,
-                                        PackageManager.DONT_KILL_APP);
-                            }
-                        }
-                    }
-                    try {
-                        mIPm.resetPreferredActivities(UserHandle.myUserId());
-                    } catch (RemoteException e) {
-                    }
-                    mAom.resetAllModes();
-                    final int[] restrictedUids = mNpm.getUidsWithPolicy(
-                            POLICY_REJECT_METERED_BACKGROUND);
-                    final int currentUserId = ActivityManager.getCurrentUser();
-                    for (int uid : restrictedUids) {
-                        // Only reset for current user
-                        if (UserHandle.getUserId(uid) == currentUserId) {
-                            if (DEBUG) Log.v(TAG, "Clearing data policy: " + uid);
-                            mNpm.setUidPolicy(uid, POLICY_NONE);
-                        }
-                    }
-                    mHandler.post(new Runnable() {
-                        @Override public void run() {
-                            if (DEBUG) Log.v(TAG, "Done clearing");
-                            if (getActivity() != null && mActivityResumed) {
-                                if (DEBUG) Log.v(TAG, "Updating UI!");
-
-                            }
-                        }
-                    });
-                    return null;
-                }
-            }).execute();
-        }
-    }
-
-    @Override
     public void onRunningStateChanged(boolean running) {
         // No-op.
     }
@@ -302,26 +131,4 @@
                 mPermissionsInfo.getRuntimePermAppsGrantedCount(),
                 mPermissionsInfo.getRuntimePermAppsCount()));
     }
-
-    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider() {
-        @Override
-        public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
-                boolean enabled) {
-            ArrayList<SearchIndexableResource> result = new ArrayList<>(1);
-            SearchIndexableResource sir = new SearchIndexableResource(context);
-            sir.xmlResId = R.xml.advanced_apps;
-            result.add(sir);
-            return result;
-        }
-
-        @Override
-        public List<String> getNonIndexableKeys(Context context) {
-            ArrayList<String> result = new ArrayList<>(1);
-            if (!DefaultEmergencyPreference.isAvailable(context)) {
-                result.add(KEY_DEFAULT_EMERGENCY_APP);
-            }
-            return result;
-        }
-    };
 }
diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
index 4b80fdd..647be4d 100644
--- a/src/com/android/settings/applications/AppStorageSettings.java
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -23,13 +23,12 @@
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.IPackageDataObserver;
-import android.content.pm.IPackageMoveObserver;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
-import android.os.RemoteException;
+import android.os.storage.StorageManager;
+import android.os.storage.VolumeInfo;
 import android.text.format.Formatter;
 import android.util.Log;
 import android.view.View;
@@ -38,11 +37,16 @@
 import android.widget.TextView;
 
 import com.android.internal.logging.MetricsLogger;
+import com.android.settings.DropDownPreference;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.applications.ApplicationsState.AppEntry;
 import com.android.settings.applications.ApplicationsState.Callbacks;
-import com.android.settings.DropDownPreference;
+import com.android.settings.deviceinfo.StorageWizardMoveConfirm;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
 
 public class AppStorageSettings extends AppInfoWithHeader
         implements OnClickListener, Callbacks, DropDownPreference.Callback {
@@ -53,7 +57,6 @@
     private static final int OP_FAILED = 2;
     private static final int MSG_CLEAR_USER_DATA = 1;
     private static final int MSG_CLEAR_CACHE = 3;
-    private static final int MSG_PACKAGE_MOVE = 4;
 
     // invalid size value used initially and also when size retrieval through PackageManager
     // fails for whatever reason
@@ -64,13 +67,11 @@
 
     private static final int DLG_CLEAR_DATA = DLG_BASE + 1;
     private static final int DLG_CANNOT_CLEAR_DATA = DLG_BASE + 2;
-    private static final int DLG_MOVE_FAILED = DLG_BASE + 3;
 
     private static final String KEY_MOVE_PREFERENCE = "app_location_setting";
     private static final String KEY_STORAGE_SETTINGS = "storage_settings";
     private static final String KEY_CACHE_SETTINGS = "cache_settings";
 
-    private CanBeOnSdCardChecker mCanBeOnSdCardChecker;
     private TextView mTotalSize;
     private TextView mAppSize;
     private TextView mDataSize;
@@ -83,7 +84,6 @@
     private Button mClearCacheButton;
 
     private DropDownPreference mMoveDropDown;
-    private boolean mMoveInProgress = false;
 
     private boolean mCanClearData = true;
     private boolean mHaveSizes = false;
@@ -97,7 +97,6 @@
 
     private ClearCacheObserver mClearCacheObserver;
     private ClearUserDataObserver mClearDataObserver;
-    private PackageMoveObserver mPackageMoveObserver;
 
     // Resource strings
     private CharSequence mInvalidSizeStr;
@@ -107,7 +106,6 @@
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        mCanBeOnSdCardChecker = new CanBeOnSdCardChecker();
         addPreferencesFromResource(R.xml.app_storage_settings);
         setupViews();
     }
@@ -166,18 +164,19 @@
 
     @Override
     public boolean onItemSelected(int pos, Object value) {
-        boolean selectedExternal = (Boolean) value;
-        boolean isExternal = (mAppEntry.info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0;
-        if (selectedExternal ^ isExternal) {
-            if (mPackageMoveObserver == null) {
-                mPackageMoveObserver = new PackageMoveObserver();
-            }
-            int moveFlags = selectedExternal ? PackageManager.MOVE_EXTERNAL_MEDIA
-                    : PackageManager.MOVE_INTERNAL;
-            mMoveInProgress = true;
-            refreshButtons();
-            mPm.movePackage(mAppEntry.info.packageName, mPackageMoveObserver, moveFlags);
+        final Context context = getActivity();
+
+        // If not current volume, kick off move wizard
+        final VolumeInfo targetVol = (VolumeInfo) value;
+        final VolumeInfo currentVol = context.getPackageManager().getApplicationCurrentVolume(
+                mAppEntry.info);
+        if (!Objects.equals(targetVol, currentVol)) {
+            final Intent intent = new Intent(context, StorageWizardMoveConfirm.class);
+            intent.putExtra(VolumeInfo.EXTRA_VOLUME_ID, targetVol.getId());
+            intent.putExtra(Intent.EXTRA_PACKAGE_NAME, mAppEntry.info.packageName);
+            startActivity(intent);
         }
+
         return true;
     }
 
@@ -260,27 +259,17 @@
         retrieveAppEntry();
         refreshButtons();
         refreshSizeInfo();
-        boolean isExternal = (mAppEntry.info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0;
-        mMoveDropDown.setSelectedItem(isExternal ? 1 : 0);
+
+        final VolumeInfo currentVol = getActivity().getPackageManager()
+                .getApplicationCurrentVolume(mAppEntry.info);
+        mMoveDropDown.setSelectedValue(currentVol);
+
         return true;
     }
 
     private void refreshButtons() {
-        if (!mMoveInProgress) {
-            initMoveDropDown();
-            initDataButtons();
-        } else {
-            mMoveDropDown.setSummary(R.string.moving);
-            mMoveDropDown.setSelectable(false);
-        }
-    }
-
-    private void updateMoveEnabled(boolean enabled) {
-        mMoveDropDown.clearItems();
-        mMoveDropDown.addItem(R.string.storage_type_internal, false);
-        if (enabled) {
-            mMoveDropDown.addItem(R.string.storage_type_external, true);
-        }
+        initMoveDropDown();
+        initDataButtons();
     }
 
     private void initDataButtons() {
@@ -310,20 +299,18 @@
     }
 
     private void initMoveDropDown() {
-        if (Environment.isExternalStorageEmulated()) {
-            updateMoveEnabled(false);
-            return;
+        final Context context = getActivity();
+        final StorageManager storage = context.getSystemService(StorageManager.class);
+
+        final List<VolumeInfo> candidates = context.getPackageManager()
+                .getApplicationCandidateVolumes(mAppEntry.info);
+        Collections.sort(candidates, VolumeInfo.getDescriptionComparator());
+
+        mMoveDropDown.clearItems();
+        for (VolumeInfo vol : candidates) {
+            final String volDescrip = storage.getBestVolumeDescription(vol);
+            mMoveDropDown.addItem(volDescrip, vol);
         }
-        boolean dataOnly = (mPackageInfo == null) && (mAppEntry != null);
-        boolean moveDisable = true;
-        if ((mAppEntry.info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0) {
-            // Always let apps move to internal storage from sdcard.
-            moveDisable = false;
-        } else {
-            mCanBeOnSdCardChecker.init();
-            moveDisable = !mCanBeOnSdCardChecker.check(mAppEntry.info);
-        }
-        updateMoveEnabled(!moveDisable);
         mMoveDropDown.setSelectable(!mAppControlRestricted);
     }
 
@@ -351,21 +338,6 @@
         }
     }
 
-    private void processMoveMsg(Message msg) {
-        int result = msg.arg1;
-        String packageName = mAppEntry.info.packageName;
-        // Refresh the button attributes.
-        mMoveInProgress = false;
-        if (result == PackageManager.MOVE_SUCCEEDED) {
-            Log.i(TAG, "Moved resources for " + packageName);
-            // Refresh size information again.
-            mState.requestSize(mPackageName, mUserId);
-        } else {
-            showDialogInner(DLG_MOVE_FAILED, result);
-        }
-        refreshUi();
-    }
-
     /*
      * Private method to handle clear message notification from observer when
      * the async operation from PackageManager is complete
@@ -382,24 +354,6 @@
         }
     }
 
-    private CharSequence getMoveErrMsg(int errCode) {
-        switch (errCode) {
-            case PackageManager.MOVE_FAILED_INSUFFICIENT_STORAGE:
-                return getActivity().getString(R.string.insufficient_storage);
-            case PackageManager.MOVE_FAILED_DOESNT_EXIST:
-                return getActivity().getString(R.string.does_not_exist);
-            case PackageManager.MOVE_FAILED_FORWARD_LOCKED:
-                return getActivity().getString(R.string.app_forward_locked);
-            case PackageManager.MOVE_FAILED_INVALID_LOCATION:
-                return getActivity().getString(R.string.invalid_location);
-            case PackageManager.MOVE_FAILED_SYSTEM_PACKAGE:
-                return getActivity().getString(R.string.system_package);
-            case PackageManager.MOVE_FAILED_INTERNAL_ERROR:
-                return "";
-        }
-        return "";
-    }
-
     @Override
     protected AlertDialog createDialog(int id, int errorCode) {
         switch (id) {
@@ -427,14 +381,6 @@
                             }
                         })
                         .create();
-            case DLG_MOVE_FAILED:
-                CharSequence msg = getActivity().getString(R.string.move_app_failed_dlg_text,
-                        getMoveErrMsg(errorCode));
-                return new AlertDialog.Builder(getActivity())
-                        .setTitle(getActivity().getText(R.string.move_app_failed_dlg_title))
-                        .setMessage(msg)
-                        .setNeutralButton(R.string.dlg_ok, null)
-                        .create();
         }
         return null;
     }
@@ -459,9 +405,6 @@
                     // Refresh size info
                     mState.requestSize(mPackageName, mUserId);
                     break;
-                case MSG_PACKAGE_MOVE:
-                    processMoveMsg(msg);
-                    break;
             }
         }
     };
@@ -508,13 +451,4 @@
            mHandler.sendMessage(msg);
         }
     }
-
-    class PackageMoveObserver extends IPackageMoveObserver.Stub {
-        public void packageMoved(String packageName, int returnCode) throws RemoteException {
-            final Message msg = mHandler.obtainMessage(MSG_PACKAGE_MOVE);
-            msg.arg1 = returnCode;
-            mHandler.sendMessage(msg);
-        }
-    }
-
 }
diff --git a/src/com/android/settings/applications/ApplicationsState.java b/src/com/android/settings/applications/ApplicationsState.java
index 71d0790..c5124c6 100644
--- a/src/com/android/settings/applications/ApplicationsState.java
+++ b/src/com/android/settings/applications/ApplicationsState.java
@@ -54,6 +54,7 @@
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
 import java.util.regex.Pattern;
 
 /**
@@ -295,20 +296,6 @@
         }
     };
 
-    public static final AppFilter FILTER_ON_SD_CARD = new AppFilter() {
-        final CanBeOnSdCardChecker mCanBeOnSdCardChecker
-                = new CanBeOnSdCardChecker();
-
-        public void init() {
-            mCanBeOnSdCardChecker.init();
-        }
-
-        @Override
-        public boolean filterApp(AppEntry entry) {
-            return mCanBeOnSdCardChecker.check(entry.info);
-        }
-    };
-
     public static final AppFilter FILTER_DISABLED = new AppFilter() {
         public void init() {
         }
@@ -349,6 +336,44 @@
         }
     };
 
+    public static class VolumeFilter implements AppFilter {
+        private final String mVolumeUuid;
+
+        public VolumeFilter(String volumeUuid) {
+            mVolumeUuid = volumeUuid;
+        }
+
+        @Override
+        public void init() {
+        }
+
+        @Override
+        public boolean filterApp(AppEntry info) {
+            return Objects.equals(info.info.volumeUuid, mVolumeUuid);
+        }
+    }
+
+    public static class CompoundFilter implements AppFilter {
+        private final AppFilter mFirstFilter;
+        private final AppFilter mSecondFilter;
+
+        public CompoundFilter(AppFilter first, AppFilter second) {
+            mFirstFilter = first;
+            mSecondFilter = second;
+        }
+
+        @Override
+        public void init() {
+            mFirstFilter.init();
+            mSecondFilter.init();
+        }
+
+        @Override
+        public boolean filterApp(AppEntry info) {
+            return mFirstFilter.filterApp(info) && mSecondFilter.filterApp(info);
+        }
+    }
+
     final Context mContext;
     final PackageManager mPm;
     final IPackageManager mIpm;
diff --git a/src/com/android/settings/applications/DefaultBrowserPreference.java b/src/com/android/settings/applications/DefaultBrowserPreference.java
new file mode 100644
index 0000000..da7f112
--- /dev/null
+++ b/src/com/android/settings/applications/DefaultBrowserPreference.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
+import android.os.UserHandle;
+import android.util.AttributeSet;
+
+import com.android.settings.AppListPreference;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DefaultBrowserPreference extends AppListPreference {
+
+    final private PackageManager mPm;
+
+    public DefaultBrowserPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        mPm = context.getPackageManager();
+        loadBrowserApps();
+    }
+
+    private void loadBrowserApps() {
+        List<String> browsers = resolveBrowserApps();
+
+        setPackageNames(browsers.toArray(new String[browsers.size()]), null);
+    }
+
+    private List<String> resolveBrowserApps() {
+        List<String> result = new ArrayList<>();
+
+        // Create an Intent that will match ALL Browser Apps
+        Intent intent = new Intent();
+        intent.setAction(Intent.ACTION_VIEW);
+        intent.addCategory(Intent.CATEGORY_BROWSABLE);
+        intent.setData(Uri.parse("http:"));
+
+        // Resolve that intent and check that the handleAllWebDataURI boolean is set
+        List<ResolveInfo> list = mPm.queryIntentActivitiesAsUser(intent, 0, UserHandle.myUserId());
+
+        final int count = list.size();
+        for (int i=0; i<count; i++) {
+            ResolveInfo info = list.get(i);
+            if (info.activityInfo == null || result.contains(info.activityInfo.packageName)
+                    || !info.handleAllWebDataURI) {
+                continue;
+            }
+
+            result.add(info.activityInfo.packageName);
+        }
+
+        return result;
+    }
+}
diff --git a/src/com/android/settings/applications/DefaultEmergencyPreference.java b/src/com/android/settings/applications/DefaultEmergencyPreference.java
index 97418fc..2bda0ed 100644
--- a/src/com/android/settings/applications/DefaultEmergencyPreference.java
+++ b/src/com/android/settings/applications/DefaultEmergencyPreference.java
@@ -24,25 +24,28 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.AsyncTask;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.preference.ListPreference;
 import android.provider.Settings;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
-import android.util.ArrayMap;
+import android.util.ArraySet;
 import android.util.AttributeSet;
 
+import com.android.settings.AppListPreference;
+
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 
 /**
  * A preference for choosing the default emergency app
  */
-public class DefaultEmergencyPreference extends ListPreference {
+public class DefaultEmergencyPreference extends AppListPreference {
 
     private final ContentResolver mContentResolver;
 
+    public static final Intent QUERY_INTENT = new Intent(
+            TelephonyManager.ACTION_EMERGENCY_ASSISTANCE);
+
     public DefaultEmergencyPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
         mContentResolver = context.getContentResolver();
@@ -53,25 +56,6 @@
     }
 
     @Override
-    protected Parcelable onSaveInstanceState() {
-        Parcelable superState = super.onSaveInstanceState();
-        return new SavedState(getEntries(), getEntryValues(), getSummary(), superState);
-    }
-
-    @Override
-    protected void onRestoreInstanceState(Parcelable state) {
-        if (state instanceof SavedState) {
-            SavedState savedState = (SavedState) state;
-            setEntries(savedState.entries);
-            setEntryValues(savedState.entryValues);
-            setSummary(savedState.summary);
-            super.onRestoreInstanceState(savedState.superState);
-        } else {
-            super.onRestoreInstanceState(state);
-        }
-    }
-
-    @Override
     protected boolean persistString(String value) {
         String previousValue = Settings.Secure.getString(mContentResolver,
                 Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION);
@@ -86,42 +70,39 @@
     }
 
     private void load() {
-        new AsyncTask<Void, Void, ArrayMap<String, CharSequence>>() {
+        new AsyncTask<Void, Void, Set<String>>() {
             @Override
-            protected ArrayMap<String, CharSequence> doInBackground(Void[] params) {
+            protected Set<String> doInBackground(Void[] params) {
                 return resolveAssistPackageAndQueryApps();
             }
 
             @Override
-            protected void onPostExecute(ArrayMap<String, CharSequence> entries) {
-                setEntries(entries.values().toArray(new CharSequence[entries.size()]));
-                setEntryValues(entries.keySet().toArray(new String[entries.size()]));
-
-                setValue(Settings.Secure.getString(mContentResolver,
-                        Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION));
+            protected void onPostExecute(Set<String> entries) {
+                String currentPkg = Settings.Secure.getString(mContentResolver,
+                        Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION);
+                setPackageNames(entries.toArray(new String[entries.size()]), currentPkg);
             }
         }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
 
-    private ArrayMap<String, CharSequence> resolveAssistPackageAndQueryApps() {
-        ArrayMap<String, CharSequence> packages = new ArrayMap<>();
+    private Set<String> resolveAssistPackageAndQueryApps() {
+        Set<String> packages = new ArraySet<>();
 
-        Intent queryIntent = new Intent(TelephonyManager.ACTION_EMERGENCY_ASSISTANCE);
         PackageManager packageManager = getContext().getPackageManager();
-        List<ResolveInfo> infos = packageManager.queryIntentActivities(queryIntent, 0);
+        List<ResolveInfo> infos = packageManager.queryIntentActivities(QUERY_INTENT, 0);
 
         PackageInfo bestMatch = null;
-        for (int i = 0; i < infos.size(); i++) {
-            if (infos.get(i) == null || infos.get(i).activityInfo == null
-                    || packages.containsKey(infos.get(i).activityInfo.packageName)) {
+        final int size = infos.size();
+        for (int i = 0; i < size; i++) {
+            ResolveInfo info = infos.get(i);
+            if (info == null || info.activityInfo == null
+                    || packages.contains(info.activityInfo.packageName)) {
                 continue;
             }
 
-            String packageName = infos.get(i).activityInfo.packageName;
-            CharSequence label = infos.get(i).activityInfo.applicationInfo
-                    .loadLabel(packageManager);
+            String packageName = info.activityInfo.packageName;
 
-            packages.put(packageName, label);
+            packages.add(packageName);
 
             PackageInfo packageInfo;
             try {
@@ -142,7 +123,7 @@
         String defaultPackage = Settings.Secure.getString(mContentResolver,
                 Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION);
         boolean defaultMissing = TextUtils.isEmpty(defaultPackage)
-                || !packages.containsKey(defaultPackage);
+                || !packages.contains(defaultPackage);
         if (bestMatch != null && defaultMissing) {
             Settings.Secure.putString(mContentResolver,
                     Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION,
@@ -153,6 +134,11 @@
     }
 
     public static boolean isAvailable(Context context) {
+        return isCapable(context)
+                && context.getPackageManager().resolveActivity(QUERY_INTENT, 0) != null;
+    }
+
+    public static boolean isCapable(Context context) {
         return context.getResources().getBoolean(
                 com.android.internal.R.bool.config_voice_capable);
     }
@@ -161,49 +147,4 @@
         return info.applicationInfo != null
                 && (info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
     }
-
-    private static class SavedState implements Parcelable {
-
-        public final CharSequence[] entries;
-        public final CharSequence[] entryValues;
-        public final CharSequence summary;
-        public final Parcelable superState;
-
-        public SavedState(CharSequence[] entries, CharSequence[] entryValues,
-                CharSequence summary, Parcelable superState) {
-            this.entries = entries;
-            this.entryValues = entryValues;
-            this.summary = summary;
-            this.superState = superState;
-        }
-
-        @Override
-        public int describeContents() {
-            return 0;
-        }
-
-        @Override
-        public void writeToParcel(Parcel dest, int flags) {
-            dest.writeCharSequenceArray(entries);
-            dest.writeCharSequenceArray(entryValues);
-            dest.writeCharSequence(summary);
-            dest.writeParcelable(superState, flags);
-        }
-
-        public Creator<SavedState> CREATOR = new Creator<SavedState>() {
-            @Override
-            public SavedState createFromParcel(Parcel source) {
-                CharSequence[] entries = source.readCharSequenceArray();
-                CharSequence[] entryValues = source.readCharSequenceArray();
-                CharSequence summary = source.readCharSequence();
-                Parcelable superState = source.readParcelable(getClass().getClassLoader());
-                return new SavedState(entries, entryValues, summary, superState);
-            }
-
-            @Override
-            public SavedState[] newArray(int size) {
-                return new SavedState[size];
-            }
-        };
-    }
 }
diff --git a/src/com/android/settings/applications/DefaultSmsPreference.java b/src/com/android/settings/applications/DefaultSmsPreference.java
new file mode 100644
index 0000000..bf616c3
--- /dev/null
+++ b/src/com/android/settings/applications/DefaultSmsPreference.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.applications;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+
+import com.android.internal.telephony.SmsApplication;
+import com.android.internal.telephony.SmsApplication.SmsApplicationData;
+import com.android.settings.AppListPreference;
+
+import java.util.Collection;
+import java.util.Objects;
+
+public class DefaultSmsPreference extends AppListPreference {
+
+    public DefaultSmsPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        loadSmsApps();
+    }
+
+    private void loadSmsApps() {
+        Collection<SmsApplicationData> smsApplications =
+                SmsApplication.getApplicationCollection(getContext());
+
+        int count = smsApplications.size();
+        String[] packageNames = new String[count];
+        int i = 0;
+        for (SmsApplicationData smsApplicationData : smsApplications) {
+            packageNames[i++] = smsApplicationData.mPackageName;
+        }
+        setPackageNames(packageNames, getDefaultPackage());
+    }
+
+    private String getDefaultPackage() {
+        ComponentName appName = SmsApplication.getDefaultSmsApplication(getContext(), true);
+        if (appName != null) {
+            return appName.getPackageName();
+        }
+        return null;
+    }
+
+    @Override
+    protected boolean persistString(String value) {
+        if (!TextUtils.isEmpty(value) && !Objects.equals(value, getDefaultPackage())) {
+            SmsApplication.setDefaultApplication(value, getContext());
+        }
+        setSummary(getEntry());
+        return true;
+    }
+
+    public static boolean isAvailable(Context context) {
+        TelephonyManager tm =
+                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        return tm.isSmsCapable();
+    }
+
+}
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index b0b35ab..b675ba4 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -20,15 +20,11 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
-import android.content.pm.IPackageManager;
 import android.content.pm.IntentFilterVerificationInfo;
-import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
-import android.os.RemoteException;
-import android.os.ServiceManager;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.PreferenceFrameLayout;
@@ -53,66 +49,29 @@
 import android.widget.ListView;
 import android.widget.Spinner;
 
-import com.android.internal.content.PackageHelper;
 import com.android.internal.logging.MetricsLogger;
+import com.android.settings.AppHeader;
+import com.android.settings.HelpUtils;
 import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.Settings.AllApplicationsActivity;
+import com.android.settings.Settings.DomainsURLsAppListActivity;
 import com.android.settings.Settings.NotificationAppListActivity;
+import com.android.settings.Settings.StorageUseActivity;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
 import com.android.settings.applications.ApplicationsState.AppEntry;
 import com.android.settings.applications.ApplicationsState.AppFilter;
+import com.android.settings.applications.ApplicationsState.CompoundFilter;
+import com.android.settings.applications.ApplicationsState.VolumeFilter;
 import com.android.settings.notification.NotificationBackend;
 import com.android.settings.notification.NotificationBackend.AppRow;
-import com.android.settings.Settings.DomainsURLsAppListActivity;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-final class CanBeOnSdCardChecker {
-    final IPackageManager mPm;
-    int mInstallLocation;
-
-    CanBeOnSdCardChecker() {
-        mPm = IPackageManager.Stub.asInterface(
-                ServiceManager.getService("package"));
-    }
-
-    void init() {
-        try {
-            mInstallLocation = mPm.getInstallLocation();
-        } catch (RemoteException e) {
-            Log.e("CanBeOnSdCardChecker", "Is Package Manager running?");
-            return;
-        }
-    }
-
-    boolean check(ApplicationInfo info) {
-        boolean canBe = false;
-        if ((info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0) {
-            canBe = true;
-        } else {
-            if ((info.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
-                if (info.installLocation == PackageInfo.INSTALL_LOCATION_PREFER_EXTERNAL ||
-                        info.installLocation == PackageInfo.INSTALL_LOCATION_AUTO) {
-                    canBe = true;
-                } else if (info.installLocation
-                        == PackageInfo.INSTALL_LOCATION_UNSPECIFIED) {
-                    if (mInstallLocation == PackageHelper.APP_INSTALL_EXTERNAL) {
-                        // For apps with no preference and the default value set
-                        // to install on sdcard.
-                        canBe = true;
-                    }
-                }
-            }
-        }
-        return canBe;
-    }
-}
-
 /**
  * Activity to pick an application that will be used to display installation information and
  * options to uninstall/delete user data for system applications. This activity
@@ -125,6 +84,12 @@
     static final String TAG = "ManageApplications";
     static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
+    // Intent extras.
+    public static final String EXTRA_CLASSNAME = "classname";
+    // Used for storage only.
+    public static final String EXTRA_VOLUME_UUID = "volumeUuid";
+    public static final String EXTRA_VOLUME_NAME = "volumeName";
+
     private static final String EXTRA_SORT_ORDER = "sortOrder";
 
     // attributes used as keys when passing values to InstalledAppDetails activity
@@ -141,19 +106,23 @@
     // Filter options used for displayed list of applications
     // The order which they appear is the order they will show when spinner is present.
     public static final int FILTER_APPS_DOWNLOADED_AND_LAUNCHER = 0;
-    public static final int FILTER_APPS_ALL                     = 1;
-    public static final int FILTER_APPS_ENABLED                 = 2;
-    public static final int FILTER_APPS_DISABLED                = 3;
-    public static final int FILTER_APPS_BLOCKED                 = 4;
-    public static final int FILTER_APPS_PRIORITY                = 5;
-    public static final int FILTER_APPS_SENSITIVE               = 6;
-    public static final int FILTER_APPS_PERSONAL                = 7;
-    public static final int FILTER_APPS_WORK                    = 8;
-    public static final int FILTER_APPS_WITH_DOMAIN_URLS        = 9;
+    public static final int FILTER_APPS_DL_ENABLED              = 1;
+    public static final int FILTER_APPS_DL_DISABLED             = 2;
+    public static final int FILTER_APPS_ALL                     = 3;
+    public static final int FILTER_APPS_ENABLED                 = 4;
+    public static final int FILTER_APPS_DISABLED                = 5;
+    public static final int FILTER_APPS_BLOCKED                 = 6;
+    public static final int FILTER_APPS_PRIORITY                = 7;
+    public static final int FILTER_APPS_SENSITIVE               = 8;
+    public static final int FILTER_APPS_PERSONAL                = 9;
+    public static final int FILTER_APPS_WORK                    = 10;
+    public static final int FILTER_APPS_WITH_DOMAIN_URLS        = 11;
 
     // This is the string labels for the filter modes above, the order must be kept in sync.
     public static final int[] FILTER_LABELS = new int[] {
-        R.string.filter_all_apps,      // Downloaded and launcher, spinner not shown in this case
+        R.string.filter_all_apps,      // Downloaded and launcher
+        R.string.filter_enabled_apps,  // Downloaded and launcher, Enabled
+        R.string.filter_apps_disabled, // Downloaded and launcher, Disabled
         R.string.filter_all_apps,      // All apps
         R.string.filter_enabled_apps,  // Enabled
         R.string.filter_apps_disabled, // Disabled
@@ -168,6 +137,12 @@
     // be kept in sync.
     public static final AppFilter[] FILTERS = new AppFilter[] {
         ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER, // Downloaded and launcher
+        new CompoundFilter(                               // Downloaded and launcher, Enabled
+                ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER,
+                ApplicationsState.FILTER_ALL_ENABLED),
+        new CompoundFilter(                               // Downloaded and launcher, Disabled
+                ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER,
+                ApplicationsState.FILTER_DISABLED),
         ApplicationsState.FILTER_EVERYTHING,  // All apps
         ApplicationsState.FILTER_ALL_ENABLED, // Enabled
         ApplicationsState.FILTER_DISABLED,    // Disabled
@@ -179,14 +154,12 @@
         ApplicationsState.FILTER_WITH_DOMAIN_URLS,   // Apps with Domain URLs
     };
 
-    // sort order that can be changed through the menu can be sorted alphabetically
-    // or size(descending)
-    private static final int MENU_OPTIONS_BASE = 0;
-    public static final int SORT_ORDER_ALPHA = MENU_OPTIONS_BASE + 1;
-    public static final int SORT_ORDER_SIZE = MENU_OPTIONS_BASE + 2;
-    public static final int RESET_APP_PREFERENCES = MENU_OPTIONS_BASE + 3;
     // sort order
-    private int mSortOrder = SORT_ORDER_ALPHA;
+    private int mSortOrder = R.id.sort_order_alpha;
+
+    // whether showing system apps.
+    private boolean mShowSystem;
+    private boolean mHasDisabledApps;
 
     private ApplicationsState mApplicationsState;
 
@@ -214,9 +187,9 @@
     private Menu mOptionsMenu;
 
     public static final int LIST_TYPE_MAIN = 0;
-    public static final int LIST_TYPE_ALL = 1;
-    public static final int LIST_TYPE_NOTIFICATION = 2;
-    public static final int LIST_TYPE_DOMAINS_URLS = 3;
+    public static final int LIST_TYPE_NOTIFICATION = 1;
+    public static final int LIST_TYPE_DOMAINS_URLS = 2;
+    public static final int LIST_TYPE_STORAGE = 3;
 
     private View mRootView;
 
@@ -224,6 +197,9 @@
     private Spinner mFilterSpinner;
     private FilterSpinnerAdapter mFilterAdapter;
     private NotificationBackend mNotifBackend;
+    private ResetAppsHelper mResetAppsHelper;
+    private String mVolumeUuid;
+    private String mVolumeName;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -232,18 +208,28 @@
         mApplicationsState = ApplicationsState.getInstance(getActivity().getApplication());
 
         Intent intent = getActivity().getIntent();
-        String className = getArguments() != null
-                ? getArguments().getString("classname") : null;
+        Bundle args = getArguments();
+        String className = args != null ? args.getString(EXTRA_CLASSNAME) : null;
         if (className == null) {
             className = intent.getComponent().getClassName();
         }
         if (className.equals(AllApplicationsActivity.class.getName())) {
-            mListType = LIST_TYPE_ALL;
+            mShowSystem = true;
         } else if (className.equals(NotificationAppListActivity.class.getName())) {
             mListType = LIST_TYPE_NOTIFICATION;
             mNotifBackend = new NotificationBackend();
         } else if (className.equals(DomainsURLsAppListActivity.class.getName())) {
             mListType = LIST_TYPE_DOMAINS_URLS;
+        } else if (className.equals(StorageUseActivity.class.getName())) {
+            if (args != null && args.containsKey(EXTRA_VOLUME_UUID)) {
+                mVolumeUuid = args.getString(EXTRA_VOLUME_UUID);
+                mVolumeName = args.getString(EXTRA_VOLUME_NAME);
+                mListType = LIST_TYPE_STORAGE;
+            } else {
+                // No volume selected, display a normal list, sorted by size.
+                mListType = LIST_TYPE_MAIN;
+                mSortOrder = R.id.sort_order_size;
+            }
         } else {
             mListType = LIST_TYPE_MAIN;
         }
@@ -254,6 +240,8 @@
         }
 
         mInvalidSizeStr = getActivity().getText(R.string.invalid_size_value);
+
+        mResetAppsHelper = new ResetAppsHelper(getActivity());
     }
 
 
@@ -263,8 +251,6 @@
         // initialize the inflater
         mInflater = inflater;
 
-        createHeader();
-
         mRootView = inflater.inflate(R.layout.manage_applications_apps, null);
         mLoadingContainer = mRootView.findViewById(R.id.loading_container);
         mLoadingContainer.setVisibility(View.VISIBLE);
@@ -294,6 +280,10 @@
             ((PreferenceFrameLayout.LayoutParams) mRootView.getLayoutParams()).removeBorders = true;
         }
 
+        createHeader();
+
+        mResetAppsHelper.onRestoreInstanceState(savedInstanceState);
+
         return mRootView;
     }
 
@@ -310,29 +300,38 @@
         contentParent.addView(mSpinnerHeader, 0);
 
         mFilterAdapter.enableFilter(getDefaultFilter());
-        if (mListType != LIST_TYPE_MAIN) {
+        if (mListType != LIST_TYPE_STORAGE) {
             if (UserManager.get(getActivity()).getUserProfiles().size() > 1) {
                 mFilterAdapter.enableFilter(FILTER_APPS_PERSONAL);
                 mFilterAdapter.enableFilter(FILTER_APPS_WORK);
             }
         }
+        updateMainFilters();
         if (mListType == LIST_TYPE_NOTIFICATION) {
             mFilterAdapter.enableFilter(FILTER_APPS_BLOCKED);
             mFilterAdapter.enableFilter(FILTER_APPS_PRIORITY);
             mFilterAdapter.enableFilter(FILTER_APPS_SENSITIVE);
-        } else if (mListType == LIST_TYPE_DOMAINS_URLS) {
-            mFilterAdapter.disableFilter(FILTER_APPS_ALL);
-            mFilterAdapter.enableFilter(FILTER_APPS_WITH_DOMAIN_URLS);
+        }
+        mApplications.setOverrideFilter(new VolumeFilter(mVolumeUuid));
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        if (mListType == LIST_TYPE_STORAGE) {
+            AppHeader.createAppHeader(getActivity(), null, mVolumeName, null);
         }
     }
 
     private int getDefaultFilter() {
-        if (mListType == LIST_TYPE_MAIN) {
-            return FILTER_APPS_DOWNLOADED_AND_LAUNCHER;
-        } else if (mListType == LIST_TYPE_DOMAINS_URLS) {
-            return FILTER_APPS_WITH_DOMAIN_URLS;
+        switch (mListType) {
+            case LIST_TYPE_MAIN:
+                return mShowSystem ? FILTER_APPS_ALL : FILTER_APPS_DOWNLOADED_AND_LAUNCHER;
+            case LIST_TYPE_DOMAINS_URLS:
+                return FILTER_APPS_WITH_DOMAIN_URLS;
+            default:
+                return FILTER_APPS_ALL;
         }
-        return FILTER_APPS_ALL;
     }
 
     @Override
@@ -340,12 +339,12 @@
         switch (mListType) {
             case LIST_TYPE_MAIN:
                 return MetricsLogger.MANAGE_APPLICATIONS;
-            case LIST_TYPE_ALL:
-                return MetricsLogger.MANAGE_APPLICATIONS_ALL;
             case LIST_TYPE_NOTIFICATION:
                 return MetricsLogger.MANAGE_APPLICATIONS_NOTIFICATIONS;
             case LIST_TYPE_DOMAINS_URLS:
                 return MetricsLogger.MANAGE_DOMAIN_URLS;
+            case LIST_TYPE_STORAGE:
+                return InstrumentedFragment.VIEW_CATEGORY_STORAGE_APPS;
             default:
                 return MetricsLogger.VIEW_UNKNOWN;
         }
@@ -358,12 +357,14 @@
         updateOptionsMenu();
         if (mApplications != null) {
             mApplications.resume(mSortOrder);
+            mApplications.updateLoading();
         }
     }
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
+        mResetAppsHelper.onSaveInstanceState(outState);
         outState.putInt(EXTRA_SORT_ORDER, mSortOrder);
     }
 
@@ -376,6 +377,12 @@
     }
 
     @Override
+    public void onStop() {
+        super.onStop();
+        mResetAppsHelper.stop();
+    }
+
+    @Override
     public void onDestroyView() {
         super.onDestroyView();
 
@@ -427,19 +434,13 @@
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        if (mListType == LIST_TYPE_DOMAINS_URLS) {
-            // No option menu
+        if (mListType != LIST_TYPE_MAIN) {
             return;
         }
+        HelpUtils.prepareHelpMenuItem(getActivity(), menu, mListType == LIST_TYPE_MAIN
+                ? R.string.help_uri_apps : R.string.help_uri_notifications);
         mOptionsMenu = menu;
-        if (mListType == LIST_TYPE_MAIN) {
-            // Only show advanced options when in the main app list (from dashboard).
-            inflater.inflate(R.menu.manage_apps, menu);
-        }
-        menu.add(0, SORT_ORDER_ALPHA, 1, R.string.sort_order_alpha)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-        menu.add(0, SORT_ORDER_SIZE, 2, R.string.sort_order_size)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+        inflater.inflate(R.menu.manage_apps, menu);
         updateOptionsMenu();
     }
 
@@ -459,11 +460,19 @@
         }
         if (mListType != LIST_TYPE_MAIN) {
             // Allow sorting except on main apps list.
-            mOptionsMenu.findItem(SORT_ORDER_ALPHA).setVisible(mSortOrder != SORT_ORDER_ALPHA);
-            mOptionsMenu.findItem(SORT_ORDER_SIZE).setVisible(mSortOrder != SORT_ORDER_SIZE);
+            mOptionsMenu.findItem(R.id.sort_order_alpha).setVisible(
+                    mSortOrder != R.id.sort_order_alpha);
+            mOptionsMenu.findItem(R.id.sort_order_size).setVisible(
+                    mSortOrder != R.id.sort_order_size);
+
+            mOptionsMenu.findItem(R.id.show_system).setVisible(false);
+            mOptionsMenu.findItem(R.id.hide_system).setVisible(false);
         } else {
-            mOptionsMenu.findItem(SORT_ORDER_ALPHA).setVisible(false);
-            mOptionsMenu.findItem(SORT_ORDER_SIZE).setVisible(false);
+            mOptionsMenu.findItem(R.id.sort_order_alpha).setVisible(false);
+            mOptionsMenu.findItem(R.id.sort_order_size).setVisible(false);
+
+            mOptionsMenu.findItem(R.id.show_system).setVisible(!mShowSystem);
+            mOptionsMenu.findItem(R.id.hide_system).setVisible(mShowSystem);
         }
     }
 
@@ -471,13 +480,21 @@
     public boolean onOptionsItemSelected(MenuItem item) {
         int menuId = item.getItemId();
         switch(item.getItemId()) {
-            case SORT_ORDER_ALPHA:
-            case SORT_ORDER_SIZE:
+            case R.id.sort_order_alpha:
+            case R.id.sort_order_size:
                 mSortOrder = menuId;
                 if (mApplications != null) {
                     mApplications.rebuild(mSortOrder);
                 }
                 break;
+            case R.id.show_system:
+            case R.id.hide_system:
+                mShowSystem = !mShowSystem;
+                updateMainFilters();
+                break;
+            case R.id.reset_app_preferences:
+                mResetAppsHelper.buildResetDialog();
+                return true;
             case R.id.advanced:
                 ((SettingsActivity) getActivity()).startPreferencePanel(
                         AdvancedAppSettings.class.getName(), null, R.string.advanced_apps,
@@ -491,6 +508,18 @@
         return true;
     }
 
+    private void updateMainFilters() {
+        if (mListType != LIST_TYPE_MAIN) {
+            return;
+        }
+        mFilterAdapter.setFilterEnabled(FILTER_APPS_ALL, mShowSystem);
+        mFilterAdapter.setFilterEnabled(FILTER_APPS_ENABLED, mShowSystem && mHasDisabledApps);
+        mFilterAdapter.setFilterEnabled(FILTER_APPS_DISABLED, mShowSystem && mHasDisabledApps);
+        mFilterAdapter.setFilterEnabled(FILTER_APPS_DOWNLOADED_AND_LAUNCHER, !mShowSystem);
+        mFilterAdapter.setFilterEnabled(FILTER_APPS_DL_ENABLED, !mShowSystem && mHasDisabledApps);
+        mFilterAdapter.setFilterEnabled(FILTER_APPS_DL_DISABLED, !mShowSystem && mHasDisabledApps);
+    }
+
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         if (mApplications != null && mApplications.getCount() > position) {
@@ -505,7 +534,9 @@
 
     @Override
     public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-        mApplications.setFilter(mFilterAdapter.getFilter(position));
+        mFilter = mFilterAdapter.getFilter(position);
+        mApplications.setFilter(mFilter);
+        if (DEBUG) Log.d(TAG, "Selecting filter " + mFilter);
     }
 
     @Override
@@ -521,17 +552,11 @@
     }
 
     public void setHasDisabled(boolean hasDisabledApps) {
-        if (mListType == LIST_TYPE_MAIN) {
-            // No filtering on main app list.
-            return;
-        }
-        if (hasDisabledApps) {
-            mFilterAdapter.enableFilter(FILTER_APPS_ENABLED);
-            mFilterAdapter.enableFilter(FILTER_APPS_DISABLED);
-        } else {
-            mFilterAdapter.disableFilter(FILTER_APPS_ENABLED);
-            mFilterAdapter.disableFilter(FILTER_APPS_DISABLED);
-        }
+        mHasDisabledApps = hasDisabledApps;
+        mFilterAdapter.setFilterEnabled(
+                mShowSystem ? FILTER_APPS_ENABLED : FILTER_APPS_DL_ENABLED, hasDisabledApps);
+        mFilterAdapter.setFilterEnabled(
+                mShowSystem ? FILTER_APPS_DISABLED : FILTER_APPS_DL_DISABLED, hasDisabledApps);
     }
 
     static class FilterSpinnerAdapter extends ArrayAdapter<CharSequence> {
@@ -552,23 +577,45 @@
             return mFilterOptions.get(position);
         }
 
+        public void setFilterEnabled(int filter, boolean enabled) {
+            if (enabled) {
+                enableFilter(filter);
+            } else {
+                disableFilter(filter);
+            }
+        }
+
         public void enableFilter(int filter) {
             if (mFilterOptions.contains(filter)) return;
+            if (DEBUG) Log.d(TAG, "Enabling filter " + filter);
             mFilterOptions.add(filter);
             Collections.sort(mFilterOptions);
             mManageApplications.mSpinnerHeader.setVisibility(
                     mFilterOptions.size() > 1 ? View.VISIBLE : View.GONE);
             notifyDataSetChanged();
+            if (mFilterOptions.size() == 1) {
+                if (DEBUG) Log.d(TAG, "Auto selecting filter " + filter);
+                mManageApplications.mFilterSpinner.setSelection(0);
+                mManageApplications.onItemSelected(null, null, 0, 0);
+            }
         }
 
         public void disableFilter(int filter) {
             if (!mFilterOptions.remove((Integer) filter)) {
                 return;
             }
+            if (DEBUG) Log.d(TAG, "Disabling filter " + filter);
             Collections.sort(mFilterOptions);
             mManageApplications.mSpinnerHeader.setVisibility(
                     mFilterOptions.size() > 1 ? View.VISIBLE : View.GONE);
             notifyDataSetChanged();
+            if (mManageApplications.mFilter == filter) {
+                if (mFilterOptions.size() > 0) {
+                    if (DEBUG) Log.d(TAG, "Auto selecting filter " + mFilterOptions.get(0));
+                    mManageApplications.mFilterSpinner.setSelection(0);
+                    mManageApplications.onItemSelected(null, null, 0, 0);
+                }
+            }
         }
 
         @Override
@@ -620,6 +667,7 @@
         private int mWhichSize = SIZE_TOTAL;
         CharSequence mCurFilterPrefix;
         private PackageManager mPm;
+        private AppFilter mOverrideFilter;
 
         private Filter mFilter = new Filter() {
             @Override
@@ -658,6 +706,11 @@
             }
         }
 
+        public void setOverrideFilter(AppFilter overrideFilter) {
+            mOverrideFilter = overrideFilter;
+            rebuild(true);
+        }
+
         public void setFilter(int filter) {
             mFilterMode = filter;
             rebuild(true);
@@ -714,8 +767,11 @@
                 mWhichSize = SIZE_INTERNAL;
             }
             filterObj = FILTERS[mFilterMode];
+            if (mOverrideFilter != null) {
+                filterObj = mOverrideFilter;
+            }
             switch (mLastSortMode) {
-                case SORT_ORDER_SIZE:
+                case R.id.sort_order_size:
                     switch (mWhichSize) {
                         case SIZE_INTERNAL:
                             comparatorObj = ApplicationsState.INTERNAL_SIZE_COMPARATOR;
@@ -746,17 +802,20 @@
             }
             notifyDataSetChanged();
 
-            if (entries == null) {
-                mManageApplications.mListContainer.setVisibility(View.INVISIBLE);
-                mManageApplications.mLoadingContainer.setVisibility(View.VISIBLE);
-            } else {
-                mManageApplications.mListContainer.setVisibility(View.VISIBLE);
-                mManageApplications.mLoadingContainer.setVisibility(View.GONE);
+            if (mEntries.size() != 0
+                    && mManageApplications.mListContainer.getVisibility() != View.VISIBLE) {
+                Utils.handleLoadingContainer(mManageApplications.mLoadingContainer,
+                        mManageApplications.mListContainer, true, true);
             }
 
             mManageApplications.setHasDisabled(hasDisabledApps());
         }
 
+        private void updateLoading() {
+            Utils.handleLoadingContainer(mManageApplications.mLoadingContainer,
+                    mManageApplications.mListContainer, mEntries.size() != 0, false);
+        }
+
         private boolean hasDisabledApps() {
             ArrayList<AppEntry> allApps = mSession.getAllApps();
             for (int i = 0; i < allApps.size(); i++) {
@@ -841,7 +900,7 @@
                         }
                     }
                     if (holder.entry.info.packageName.equals(mManageApplications.mCurrentPkgName)
-                            && mLastSortMode == SORT_ORDER_SIZE) {
+                            && mLastSortMode == R.id.sort_order_size) {
                         // We got the size information for the last app the
                         // user viewed, and are sorting by size...  they may
                         // have cleared data, so we immediately want to resort
@@ -862,7 +921,7 @@
 
         @Override
         public void onAllSizesComputed() {
-            if (mLastSortMode == SORT_ORDER_SIZE) {
+            if (mLastSortMode == R.id.sort_order_size) {
                 rebuild(false);
             }
         }
diff --git a/src/com/android/settings/applications/ManageDefaultApps.java b/src/com/android/settings/applications/ManageDefaultApps.java
new file mode 100644
index 0000000..326de22
--- /dev/null
+++ b/src/com/android/settings/applications/ManageDefaultApps.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.annotation.Nullable;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.preference.Preference;
+import android.provider.SearchIndexableResource;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+
+import com.android.settings.InstrumentedFragment;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Index;
+import com.android.settings.search.Indexable;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class ManageDefaultApps extends SettingsPreferenceFragment
+        implements Preference.OnPreferenceClickListener, Indexable {
+
+    private static final String TAG = ManageDefaultApps.class.getSimpleName();
+
+    private static final String KEY_DEFAULT_BROWSER = "default_browser";
+    private static final String KEY_SMS_APPLICATION = "default_sms_app";
+    private static final String KEY_DEFAULT_EMERGENCY_APP = "default_emergency_app";
+
+    private DefaultBrowserPreference mDefaultBrowserPreference;
+    private PackageManager mPm;
+    private int myUserId;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        addPreferencesFromResource(R.xml.default_apps);
+
+        mPm = getPackageManager();
+        myUserId = UserHandle.myUserId();
+
+        mDefaultBrowserPreference = (DefaultBrowserPreference) findPreference(KEY_DEFAULT_BROWSER);
+        mDefaultBrowserPreference.setOnPreferenceClickListener(
+                new Preference.OnPreferenceClickListener() {
+                    @Override
+                    public boolean onPreferenceClick(Preference preference) {
+                        final CharSequence packageName = mDefaultBrowserPreference.getValue();
+                        if (TextUtils.isEmpty(packageName)) {
+                            return false;
+                        }
+                        return mPm.setDefaultBrowserPackageName(packageName.toString(), myUserId);
+                    }
+        });
+        final boolean isRestrictedUser = UserManager.get(getActivity())
+                .getUserInfo(myUserId).isRestricted();
+
+        // Restricted users cannot currently read/write SMS.
+        // Remove SMS Application if the device does not support SMS
+        if (isRestrictedUser || !DefaultSmsPreference.isAvailable(getActivity())) {
+            removePreference(KEY_SMS_APPLICATION);
+        }
+
+        if (!DefaultEmergencyPreference.isAvailable(getActivity())) {
+            removePreference(KEY_DEFAULT_EMERGENCY_APP);
+        }
+
+        if (DefaultEmergencyPreference.isCapable(getActivity())) {
+            Index.getInstance(getActivity()).updateFromClassNameResource(
+                    ManageDefaultApps.class.getName(), true, true);
+        }
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        String packageName = getPackageManager().getDefaultBrowserPackageName(
+                UserHandle.myUserId());
+        if (!TextUtils.isEmpty(packageName)) {
+            // Check if the package is still there
+            Intent intent = new Intent();
+            intent.setPackage(packageName);
+            ResolveInfo info = mPm.resolveActivityAsUser(intent, 0, myUserId);
+            if (info != null) {
+                mDefaultBrowserPreference.setValue(packageName);
+            } else {
+                // Otherwise select the first one
+                mDefaultBrowserPreference.setValueIndex(0);
+            }
+        } else {
+            Log.d(TAG, "Cannot set empty default Browser value!");
+        }
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return InstrumentedFragment.VIEW_CATEGORY_DEFAULT_APPS;
+    }
+
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+        return false;
+    }
+
+    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+        new BaseSearchIndexProvider() {
+            @Override
+            public List<SearchIndexableResource> getXmlResourcesToIndex(
+                    Context context, boolean enabled) {
+                SearchIndexableResource sir = new SearchIndexableResource(context);
+                sir.xmlResId = R.xml.default_apps;
+                return Arrays.asList(sir);
+            }
+
+            @Override
+            public List<String> getNonIndexableKeys(Context context) {
+                final ArrayList<String> result = new ArrayList<String>();
+
+                // Remove SMS Application if the device does not support SMS
+                final boolean isRestrictedUser = UserManager.get(context)
+                        .getUserInfo(UserHandle.myUserId()).isRestricted();
+                if (!DefaultSmsPreference.isAvailable(context) || isRestrictedUser) {
+                    result.add(KEY_SMS_APPLICATION);
+                }
+
+                if (!DefaultEmergencyPreference.isAvailable(context)) {
+                    result.add(KEY_DEFAULT_EMERGENCY_APP);
+                }
+
+                return result;
+            }
+    };
+}
diff --git a/src/com/android/settings/applications/ManagePermissions.java b/src/com/android/settings/applications/ManagePermissions.java
index 8fb3e62..e8f9d0f 100644
--- a/src/com/android/settings/applications/ManagePermissions.java
+++ b/src/com/android/settings/applications/ManagePermissions.java
@@ -27,7 +27,8 @@
 import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.applications.PermissionsInfo.PermissionGroup;
+import com.android.settingslib.applications.PermissionsInfo;
+import com.android.settingslib.applications.PermissionsInfo.PermissionGroup;
 
 import java.util.List;
 
@@ -36,7 +37,6 @@
 
     private static final String TAG = "ManagePermissions";
 
-    private boolean mLoadComplete;
     private PermissionsInfo mPermissionsInfo;
 
     @Override
@@ -46,6 +46,13 @@
         mPermissionsInfo = new PermissionsInfo(getActivity(), this);
     }
 
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        showLoadingWhenEmpty();
+    }
+
     private void refreshUi() {
         PreferenceScreen screen = getPreferenceScreen();
         if (screen == null) {
diff --git a/src/com/android/settings/applications/PermissionsInfo.java b/src/com/android/settings/applications/PermissionsInfo.java
deleted file mode 100644
index 8656d1a..0000000
--- a/src/com/android/settings/applications/PermissionsInfo.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.applications;
-
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.PermissionGroupInfo;
-import android.content.pm.PermissionInfo;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.ShapeDrawable;
-import android.os.AsyncTask;
-import android.os.Build;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.util.ArrayMap;
-import android.util.Log;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-public class PermissionsInfo {
-
-    private static final String TAG = "PermissionsInfo";
-
-    private final PackageManager mPm;
-    private final ArrayList<PermissionGroup> mGroups = new ArrayList<>();
-    private final Map<String, PermissionGroup> mGroupLookup = new ArrayMap<>();
-    private final Callback mCallback;
-    private final Context mContext;
-    // Count of apps that request runtime permissions.
-    private int mRuntimePermAppsCt;
-    // Count of apps that are granted runtime permissions.
-    private int mRuntimePermAppsGrantedCt;
-
-    public PermissionsInfo(Context context, Callback callback) {
-        mContext = context;
-        mPm = context.getPackageManager();
-        mCallback = callback;
-        new PermissionsLoader().execute();
-    }
-
-    public List<PermissionGroup> getGroups() {
-        synchronized (mGroups) {
-            return new ArrayList<>(mGroups);
-        }
-    }
-
-    public int getRuntimePermAppsCount() {
-        return mRuntimePermAppsCt;
-    }
-
-    public int getRuntimePermAppsGrantedCount() {
-        return mRuntimePermAppsGrantedCt;
-    }
-
-    private PermissionGroup getOrCreateGroup(String permission) {
-        PermissionGroup group = mGroupLookup.get(permission);
-        if (group == null) {
-            // Some permissions don't have a group, in that case treat them like a group
-            // and create their own PermissionGroup (only if they are runtime).
-            try {
-                PermissionInfo info = mPm.getPermissionInfo(permission, 0);
-                if (info.protectionLevel == PermissionInfo.PROTECTION_DANGEROUS) {
-                    group = new PermissionGroup();
-                    // TODO: Add default permission icon.
-                    group.icon = info.icon != 0 ? info.loadIcon(mPm) : new ShapeDrawable();
-                    group.name = info.name;
-                    group.label = info.loadLabel(mPm).toString();
-                    mGroups.add(group);
-                    mGroupLookup.put(permission, group);
-                }
-            } catch (NameNotFoundException e) {
-                Log.w(TAG, "Unknown permission " + permission, e);
-            }
-        }
-        return group;
-    }
-
-    private class PermissionsLoader extends AsyncTask<Void, Void, Void> {
-
-        @Override
-        protected Void doInBackground(Void... params) {
-            List<PermissionGroupInfo> groups =
-                    mPm.getAllPermissionGroups(PackageManager.GET_META_DATA);
-            // Get the groups.
-            for (PermissionGroupInfo groupInfo : groups) {
-                PermissionGroup group = new PermissionGroup();
-                // TODO: Add default permission icon.
-                group.icon = groupInfo.icon != 0 ? groupInfo.loadIcon(mPm) : new ShapeDrawable();
-                group.name = groupInfo.name;
-                group.label = groupInfo.loadLabel(mPm).toString();
-                synchronized (mGroups) {
-                    mGroups.add(group);
-                }
-            }
-            // Load permissions and which are runtime.
-            for (PermissionGroup group : mGroups) {
-                try {
-                    List<PermissionInfo> permissions =
-                            mPm.queryPermissionsByGroup(group.name, 0);
-                    for (PermissionInfo info : permissions) {
-                        if (info.protectionLevel != PermissionInfo.PROTECTION_DANGEROUS) continue;
-                        mGroupLookup.put(info.name, group);
-                    }
-                } catch (NameNotFoundException e) {
-                    Log.w(TAG, "Problem getting permissions", e);
-                }
-            }
-            // Load granted info.
-            for (UserHandle user : UserManager.get(mContext).getUserProfiles()) {
-                List<PackageInfo> allApps = mPm.getInstalledPackages(
-                        PackageManager.GET_PERMISSIONS, user.getIdentifier());
-                for (PackageInfo info : allApps) {
-                    if (info.applicationInfo.targetSdkVersion <= Build.VERSION_CODES.LOLLIPOP_MR1
-                            || info.requestedPermissions == null)  {
-                        continue;
-                    }
-                    final int N = info.requestedPermissionsFlags.length;
-                    boolean appHasRuntimePerms = false;
-                    boolean appGrantedRuntimePerms = false;
-                    for (int i = 0; i < N; i++) {
-                        boolean granted = (info.requestedPermissionsFlags[i]
-                                & PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0;
-                        PermissionGroup group = getOrCreateGroup(info.requestedPermissions[i]);
-                        String key = Integer.toString(info.applicationInfo.uid);
-                        if (group != null && !group.possibleApps.contains(key)) {
-                            appHasRuntimePerms = true;
-                            group.possibleApps.add(key);
-                            if (granted) {
-                                appGrantedRuntimePerms = true;
-                                group.grantedApps.add(key);
-                            }
-                        }
-                    }
-                    if (appHasRuntimePerms) {
-                        mRuntimePermAppsCt++;
-                        if (appGrantedRuntimePerms) {
-                            mRuntimePermAppsGrantedCt++;
-                        }
-                    }
-                }
-            }
-            Collections.sort(mGroups);
-
-            return null;
-        }
-
-        @Override
-        protected void onPostExecute(Void result) {
-            mCallback.onPermissionLoadComplete();
-        }
-    }
-
-    public static class PermissionGroup implements Comparable<PermissionGroup> {
-        public final List<String> possibleApps = new ArrayList<>();
-        public final List<String> grantedApps = new ArrayList<>();
-        public String name;
-        public String label;
-        public Drawable icon;
-
-        @Override
-        public int compareTo(PermissionGroup another) {
-            return label.compareTo(another.label);
-        }
-    }
-
-    public interface Callback {
-        void onPermissionLoadComplete();
-    }
-
-}
diff --git a/src/com/android/settings/applications/ResetAppsHelper.java b/src/com/android/settings/applications/ResetAppsHelper.java
new file mode 100644
index 0000000..cc83157
--- /dev/null
+++ b/src/com/android/settings/applications/ResetAppsHelper.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.applications;
+
+import static android.net.NetworkPolicyManager.POLICY_NONE;
+import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
+
+import android.app.ActivityManager;
+import android.app.AlertDialog;
+import android.app.AppOpsManager;
+import android.app.INotificationManager;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.IPackageManager;
+import android.content.pm.PackageManager;
+import android.net.NetworkPolicyManager;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.UserHandle;
+
+import com.android.settings.R;
+
+import java.util.List;
+
+public class ResetAppsHelper implements DialogInterface.OnClickListener,
+        DialogInterface.OnDismissListener {
+
+    private static final String EXTRA_RESET_DIALOG = "resetDialog";
+
+    private final PackageManager mPm;
+    private final IPackageManager mIPm;
+    private final INotificationManager mNm;
+    private final NetworkPolicyManager mNpm;
+    private final AppOpsManager mAom;
+    private final Context mContext;
+
+    private AlertDialog mResetDialog;
+
+    public ResetAppsHelper(Context context) {
+        mContext = context;
+        mPm = context.getPackageManager();
+        mIPm = IPackageManager.Stub.asInterface(ServiceManager.getService("package"));
+        mNm = INotificationManager.Stub.asInterface(
+                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
+        mNpm = NetworkPolicyManager.from(context);
+        mAom = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
+    }
+
+    public void onRestoreInstanceState(Bundle savedInstanceState) {
+        if (savedInstanceState != null && savedInstanceState.getBoolean(EXTRA_RESET_DIALOG)) {
+            buildResetDialog();
+        }
+    }
+
+    public void onSaveInstanceState(Bundle outState) {
+        if (mResetDialog != null) {
+            outState.putBoolean(EXTRA_RESET_DIALOG, true);
+        }
+    }
+
+    public void stop() {
+        if (mResetDialog != null) {
+            mResetDialog.dismiss();
+            mResetDialog = null;
+        }
+    }
+
+    void buildResetDialog() {
+        if (mResetDialog == null) {
+            mResetDialog = new AlertDialog.Builder(mContext)
+                    .setTitle(R.string.reset_app_preferences_title)
+                    .setMessage(R.string.reset_app_preferences_desc)
+                    .setPositiveButton(R.string.reset_app_preferences_button, this)
+                    .setNegativeButton(R.string.cancel, null)
+                    .setOnDismissListener(this)
+                    .show();
+        }
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        if (mResetDialog == dialog) {
+            mResetDialog = null;
+        }
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        if (mResetDialog != dialog) {
+            return;
+        }
+        AsyncTask.execute(new Runnable() {
+            @Override
+            public void run() {
+                List<ApplicationInfo> apps = mPm.getInstalledApplications(
+                        PackageManager.GET_DISABLED_COMPONENTS);
+                for (int i = 0; i < apps.size(); i++) {
+                    ApplicationInfo app = apps.get(i);
+                    try {
+                        mNm.setNotificationsEnabledForPackage(app.packageName, app.uid, true);
+                    } catch (android.os.RemoteException ex) {
+                    }
+                    if (!app.enabled) {
+                        if (mPm.getApplicationEnabledSetting(app.packageName)
+                                == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER) {
+                            mPm.setApplicationEnabledSetting(app.packageName,
+                                    PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,
+                                    PackageManager.DONT_KILL_APP);
+                        }
+                    }
+                }
+                try {
+                    mIPm.resetPreferredActivities(UserHandle.myUserId());
+                } catch (RemoteException e) {
+                }
+                mAom.resetAllModes();
+                final int[] restrictedUids = mNpm.getUidsWithPolicy(
+                        POLICY_REJECT_METERED_BACKGROUND);
+                final int currentUserId = ActivityManager.getCurrentUser();
+                for (int uid : restrictedUids) {
+                    // Only reset for current user
+                    if (UserHandle.getUserId(uid) == currentUserId) {
+                        mNpm.setUidPolicy(uid, POLICY_NONE);
+                    }
+                }
+            }
+        });
+    }
+}
diff --git a/src/com/android/settings/applications/RunningServices.java b/src/com/android/settings/applications/RunningServices.java
index a4cd4a7..1841f13 100644
--- a/src/com/android/settings/applications/RunningServices.java
+++ b/src/com/android/settings/applications/RunningServices.java
@@ -23,9 +23,9 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.animation.AnimationUtils;
 
 import com.android.settings.R;
+import com.android.settings.Utils;
 
 public class RunningServices extends Fragment {
 
@@ -69,12 +69,7 @@
     public void onResume() {
         super.onResume();
         boolean haveData = mRunningProcessesView.doResume(this, mRunningProcessesAvail);
-        if (haveData) {
-            mRunningProcessesView.setVisibility(View.VISIBLE);
-            mLoadingContainer.setVisibility(View.INVISIBLE);
-        } else {
-            mLoadingContainer.setVisibility(View.VISIBLE);
-        }
+        Utils.handleLoadingContainer(mLoadingContainer, mRunningProcessesView, haveData, false);
     }
 
     @Override
@@ -110,19 +105,10 @@
         mOptionsMenu.findItem(SHOW_BACKGROUND_PROCESSES).setVisible(!showingBackground);
     }
 
-    private void handleRunningProcessesAvail() {
-        mLoadingContainer.startAnimation(AnimationUtils.loadAnimation(getActivity(),
-                android.R.anim.fade_out));
-        mRunningProcessesView.startAnimation(AnimationUtils.loadAnimation(getActivity(),
-                android.R.anim.fade_in));
-        mRunningProcessesView.setVisibility(View.VISIBLE);
-        mLoadingContainer.setVisibility(View.GONE);
-    }
-
     private final Runnable mRunningProcessesAvail = new Runnable() {
         @Override
         public void run() {
-            handleRunningProcessesAvail();
+            Utils.handleLoadingContainer(mLoadingContainer, mRunningProcessesView, true, true);
         }
     };
 
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index ae1b6d0..b1d2cba 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.dashboard;
 
-import android.app.Fragment;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -29,13 +28,15 @@
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-
 import com.android.internal.logging.MetricsLogger;
+import com.android.settings.HelpUtils;
 import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
@@ -75,6 +76,19 @@
     }
 
     @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        HelpUtils.prepareHelpMenuItem(getActivity(), menu, R.string.help_uri_dashboard);
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
 
diff --git a/src/com/android/settings/dashboard/DashboardTile.java b/src/com/android/settings/dashboard/DashboardTile.java
index 94833d3..5e7e49a 100644
--- a/src/com/android/settings/dashboard/DashboardTile.java
+++ b/src/com/android/settings/dashboard/DashboardTile.java
@@ -161,7 +161,7 @@
         final int N = userHandle.size();
         dest.writeInt(N);
         for (int i = 0; i < N; i++) {
-            dest.writeParcelable(userHandle.get(i), flags);
+            userHandle.get(i).writeToParcel(dest, flags);
         }
         dest.writeBundle(extras);
     }
diff --git a/src/com/android/settings/deviceinfo/FileItemInfoLayout.java b/src/com/android/settings/deviceinfo/FileItemInfoLayout.java
deleted file mode 100644
index 542d7c9..0000000
--- a/src/com/android/settings/deviceinfo/FileItemInfoLayout.java
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2011 Google Inc. All Rights Reserved.
-
-package com.android.settings.deviceinfo;
-
-import android.content.Context;
-import android.os.Environment.UserEnvironment;
-import android.os.UserHandle;
-import android.util.AttributeSet;
-import android.view.ViewDebug;
-import android.widget.CheckBox;
-import android.widget.Checkable;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.android.settings.R;
-
-/**
- * Handles display of a single row entry on Settings --> Storage --> Misc Files screen
- */
-public class FileItemInfoLayout extends RelativeLayout implements Checkable {
-    private TextView mFileNameView;
-    private TextView mFileSizeView;
-    private CheckBox mCheckbox;
-
-    private static final int sLengthExternalStorageDirPrefix = new UserEnvironment(
-            UserHandle.myUserId()).getExternalStorageDirectory().getAbsolutePath().length() + 1;
-
-    public FileItemInfoLayout(Context context) {
-        this(context, null);
-    }
-
-    public FileItemInfoLayout(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public FileItemInfoLayout(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    public void toggle() {
-        setChecked(!mCheckbox.isChecked());
-    }
-
-    /* (non-Javadoc)
-     * @see android.view.View#onFinishInflate()
-     */
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        mFileNameView = (TextView) findViewById(R.id.misc_filename);
-        mFileSizeView = (TextView) findViewById(R.id.misc_filesize);
-        mCheckbox = (CheckBox) findViewById(R.id.misc_checkbox);
-    }
-
-    public void setFileName(String fileName) {
-        mFileNameView.setText(fileName.substring(sLengthExternalStorageDirPrefix));
-    }
-
-    public void setFileSize(String filesize) {
-        mFileSizeView.setText(filesize);
-    }
-
-    @ViewDebug.ExportedProperty
-    public boolean isChecked() {
-        return mCheckbox.isChecked();
-    }
-
-    public CheckBox getCheckBox() {
-        return mCheckbox;
-    }
-
-    /**
-     * <p>Changes the checked state of this text view.</p>
-     *
-     * @param checked true to check the text, false to uncheck it
-     */
-    public void setChecked(boolean checked) {
-        mCheckbox.setChecked(checked);
-    }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/deviceinfo/Memory.java b/src/com/android/settings/deviceinfo/Memory.java
deleted file mode 100644
index a07f7c2..0000000
--- a/src/com/android/settings/deviceinfo/Memory.java
+++ /dev/null
@@ -1,509 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.deviceinfo;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.content.ActivityNotFoundException;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.IPackageDataObserver;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.hardware.usb.UsbManager;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.UserManager;
-import android.os.storage.IMountService;
-import android.os.storage.StorageEventListener;
-import android.os.storage.StorageManager;
-import android.os.storage.StorageVolume;
-import android.preference.Preference;
-import android.preference.PreferenceScreen;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.widget.Toast;
-
-import com.android.internal.logging.MetricsLogger;
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.Utils;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-import com.android.settings.search.SearchIndexableRaw;
-import com.google.android.collect.Lists;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Panel showing storage usage on disk for known {@link StorageVolume} returned
- * by {@link StorageManager}. Calculates and displays usage of data types.
- */
-public class Memory extends SettingsPreferenceFragment implements Indexable {
-    private static final String TAG = "MemorySettings";
-
-    private static final String TAG_CONFIRM_CLEAR_CACHE = "confirmClearCache";
-
-    private static final int DLG_CONFIRM_UNMOUNT = 1;
-    private static final int DLG_ERROR_UNMOUNT = 2;
-
-    // The mountToggle Preference that has last been clicked.
-    // Assumes no two successive unmount event on 2 different volumes are performed before the first
-    // one's preference is disabled
-    private static Preference sLastClickedMountToggle;
-    private static String sClickedMountPoint;
-
-    // Access using getMountService()
-    private IMountService mMountService;
-    private StorageManager mStorageManager;
-    private UsbManager mUsbManager;
-
-    private ArrayList<StorageVolumePreferenceCategory> mCategories = Lists.newArrayList();
-
-    @Override
-    protected int getMetricsCategory() {
-        return MetricsLogger.DEVICEINFO_MEMORY;
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        final Context context = getActivity();
-
-        mUsbManager = (UsbManager) getSystemService(Context.USB_SERVICE);
-
-        mStorageManager = StorageManager.from(context);
-        mStorageManager.registerListener(mStorageListener);
-
-        addPreferencesFromResource(R.xml.device_info_memory);
-
-        addCategory(StorageVolumePreferenceCategory.buildForInternal(context));
-
-        final StorageVolume[] storageVolumes = mStorageManager.getVolumeList();
-        for (StorageVolume volume : storageVolumes) {
-            if (!volume.isEmulated()) {
-                addCategory(StorageVolumePreferenceCategory.buildForPhysical(context, volume));
-            }
-        }
-
-        setHasOptionsMenu(true);
-    }
-
-    private void addCategory(StorageVolumePreferenceCategory category) {
-        mCategories.add(category);
-        getPreferenceScreen().addPreference(category);
-        category.init();
-    }
-
-    private boolean isMassStorageEnabled() {
-        // Mass storage is enabled if primary volume supports it
-        final StorageVolume[] volumes = mStorageManager.getVolumeList();
-        final StorageVolume primary = StorageManager.getPrimaryVolume(volumes);
-        return primary != null && primary.allowMassStorage();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        IntentFilter intentFilter = new IntentFilter(Intent.ACTION_MEDIA_SCANNER_STARTED);
-        intentFilter.addAction(Intent.ACTION_MEDIA_SCANNER_FINISHED);
-        intentFilter.addDataScheme("file");
-        getActivity().registerReceiver(mMediaScannerReceiver, intentFilter);
-
-        intentFilter = new IntentFilter();
-        intentFilter.addAction(UsbManager.ACTION_USB_STATE);
-        getActivity().registerReceiver(mMediaScannerReceiver, intentFilter);
-
-        for (StorageVolumePreferenceCategory category : mCategories) {
-            category.onResume();
-        }
-    }
-
-    StorageEventListener mStorageListener = new StorageEventListener() {
-        @Override
-        public void onStorageStateChanged(String path, String oldState, String newState) {
-            Log.i(TAG, "Received storage state changed notification that " + path +
-                    " changed state from " + oldState + " to " + newState);
-            for (StorageVolumePreferenceCategory category : mCategories) {
-                final StorageVolume volume = category.getStorageVolume();
-                if (volume != null && path.equals(volume.getPath())) {
-                    category.onStorageStateChanged();
-                    break;
-                }
-            }
-        }
-    };
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        getActivity().unregisterReceiver(mMediaScannerReceiver);
-        for (StorageVolumePreferenceCategory category : mCategories) {
-            category.onPause();
-        }
-    }
-
-    @Override
-    public void onDestroy() {
-        if (mStorageManager != null && mStorageListener != null) {
-            mStorageManager.unregisterListener(mStorageListener);
-        }
-        super.onDestroy();
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.storage, menu);
-    }
-
-    @Override
-    public void onPrepareOptionsMenu(Menu menu) {
-        final MenuItem usb = menu.findItem(R.id.storage_usb);
-        UserManager um = (UserManager)getActivity().getSystemService(Context.USER_SERVICE);
-        boolean usbItemVisible = !isMassStorageEnabled()
-                && !um.hasUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER);
-        usb.setVisible(usbItemVisible);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.storage_usb:
-                if (getActivity() instanceof SettingsActivity) {
-                    ((SettingsActivity) getActivity()).startPreferencePanel(
-                            UsbSettings.class.getCanonicalName(),
-                            null, R.string.storage_title_usb, null, this, 0);
-                } else {
-                    startFragment(this, UsbSettings.class.getCanonicalName(),
-                            R.string.storage_title_usb, -1, null);
-                }
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    private synchronized IMountService getMountService() {
-       if (mMountService == null) {
-           IBinder service = ServiceManager.getService("mount");
-           if (service != null) {
-               mMountService = IMountService.Stub.asInterface(service);
-           } else {
-               Log.e(TAG, "Can't get mount service");
-           }
-       }
-       return mMountService;
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        if (StorageVolumePreferenceCategory.KEY_CACHE.equals(preference.getKey())) {
-            ConfirmClearCacheFragment.show(this);
-            return true;
-        }
-
-        for (StorageVolumePreferenceCategory category : mCategories) {
-            Intent intent = category.intentForClick(preference);
-            if (intent != null) {
-                // Don't go across app boundary if monkey is running
-                if (!Utils.isMonkeyRunning()) {
-                    try {
-                        startActivity(intent);
-                    } catch (ActivityNotFoundException anfe) {
-                        Log.w(TAG, "No activity found for intent " + intent);
-                    }
-                }
-                return true;
-            }
-
-            final StorageVolume volume = category.getStorageVolume();
-            if (volume != null && category.mountToggleClicked(preference)) {
-                sLastClickedMountToggle = preference;
-                sClickedMountPoint = volume.getPath();
-                String state = mStorageManager.getVolumeState(volume.getPath());
-                if (Environment.MEDIA_MOUNTED.equals(state) ||
-                        Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
-                    unmount();
-                } else {
-                    mount();
-                }
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private final BroadcastReceiver mMediaScannerReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-            if (action.equals(UsbManager.ACTION_USB_STATE)) {
-               boolean isUsbConnected = intent.getBooleanExtra(UsbManager.USB_CONNECTED, false);
-               String usbFunction = mUsbManager.getDefaultFunction();
-               for (StorageVolumePreferenceCategory category : mCategories) {
-                   category.onUsbStateChanged(isUsbConnected, usbFunction);
-               }
-            } else if (action.equals(Intent.ACTION_MEDIA_SCANNER_FINISHED)) {
-                for (StorageVolumePreferenceCategory category : mCategories) {
-                    category.onMediaScannerFinished();
-                }
-            }
-        }
-    };
-
-    @Override
-    public Dialog onCreateDialog(int id) {
-        switch (id) {
-        case DLG_CONFIRM_UNMOUNT:
-                return new AlertDialog.Builder(getActivity())
-                    .setTitle(R.string.dlg_confirm_unmount_title)
-                    .setPositiveButton(R.string.dlg_ok, new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            doUnmount();
-                        }})
-                    .setNegativeButton(R.string.cancel, null)
-                    .setMessage(R.string.dlg_confirm_unmount_text)
-                    .create();
-        case DLG_ERROR_UNMOUNT:
-                return new AlertDialog.Builder(getActivity())
-            .setTitle(R.string.dlg_error_unmount_title)
-            .setNeutralButton(R.string.dlg_ok, null)
-            .setMessage(R.string.dlg_error_unmount_text)
-            .create();
-        }
-        return null;
-    }
-
-    private void doUnmount() {
-        // Present a toast here
-        Toast.makeText(getActivity(), R.string.unmount_inform_text, Toast.LENGTH_SHORT).show();
-        IMountService mountService = getMountService();
-        try {
-            sLastClickedMountToggle.setEnabled(false);
-            sLastClickedMountToggle.setTitle(getString(R.string.sd_ejecting_title));
-            sLastClickedMountToggle.setSummary(getString(R.string.sd_ejecting_summary));
-            mountService.unmountVolume(sClickedMountPoint, true, false);
-        } catch (RemoteException e) {
-            // Informative dialog to user that unmount failed.
-            showDialogInner(DLG_ERROR_UNMOUNT);
-        }
-    }
-
-    private void showDialogInner(int id) {
-        removeDialog(id);
-        showDialog(id);
-    }
-
-    private boolean hasAppsAccessingStorage() throws RemoteException {
-        IMountService mountService = getMountService();
-        int stUsers[] = mountService.getStorageUsers(sClickedMountPoint);
-        if (stUsers != null && stUsers.length > 0) {
-            return true;
-        }
-        // TODO FIXME Parameterize with mountPoint and uncomment.
-        // On HC-MR2, no apps can be installed on sd and the emulated internal storage is not
-        // removable: application cannot interfere with unmount
-        /*
-        ActivityManager am = (ActivityManager)getSystemService(Context.ACTIVITY_SERVICE);
-        List<ApplicationInfo> list = am.getRunningExternalApplications();
-        if (list != null && list.size() > 0) {
-            return true;
-        }
-        */
-        // Better safe than sorry. Assume the storage is used to ask for confirmation.
-        return true;
-    }
-
-    private void unmount() {
-        // Check if external media is in use.
-        try {
-           if (hasAppsAccessingStorage()) {
-               // Present dialog to user
-               showDialogInner(DLG_CONFIRM_UNMOUNT);
-           } else {
-               doUnmount();
-           }
-        } catch (RemoteException e) {
-            // Very unlikely. But present an error dialog anyway
-            Log.e(TAG, "Is MountService running?");
-            showDialogInner(DLG_ERROR_UNMOUNT);
-        }
-    }
-
-    private void mount() {
-        IMountService mountService = getMountService();
-        try {
-            if (mountService != null) {
-                mountService.mountVolume(sClickedMountPoint);
-            } else {
-                Log.e(TAG, "Mount service is null, can't mount");
-            }
-        } catch (RemoteException ex) {
-            // Not much can be done
-        }
-    }
-
-    private void onCacheCleared() {
-        for (StorageVolumePreferenceCategory category : mCategories) {
-            category.onCacheCleared();
-        }
-    }
-
-    private static class ClearCacheObserver extends IPackageDataObserver.Stub {
-        private final Memory mTarget;
-        private int mRemaining;
-
-        public ClearCacheObserver(Memory target, int remaining) {
-            mTarget = target;
-            mRemaining = remaining;
-        }
-
-        @Override
-        public void onRemoveCompleted(final String packageName, final boolean succeeded) {
-            synchronized (this) {
-                if (--mRemaining == 0) {
-                    mTarget.onCacheCleared();
-                }
-            }
-        }
-    }
-
-    /**
-     * Dialog to request user confirmation before clearing all cache data.
-     */
-    public static class ConfirmClearCacheFragment extends DialogFragment {
-        public static void show(Memory parent) {
-            if (!parent.isAdded()) return;
-
-            final ConfirmClearCacheFragment dialog = new ConfirmClearCacheFragment();
-            dialog.setTargetFragment(parent, 0);
-            dialog.show(parent.getFragmentManager(), TAG_CONFIRM_CLEAR_CACHE);
-        }
-
-        @Override
-        public Dialog onCreateDialog(Bundle savedInstanceState) {
-            final Context context = getActivity();
-
-            final AlertDialog.Builder builder = new AlertDialog.Builder(context);
-            builder.setTitle(R.string.memory_clear_cache_title);
-            builder.setMessage(getString(R.string.memory_clear_cache_message));
-
-            builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    final Memory target = (Memory) getTargetFragment();
-                    final PackageManager pm = context.getPackageManager();
-                    final List<PackageInfo> infos = pm.getInstalledPackages(0);
-                    final ClearCacheObserver observer = new ClearCacheObserver(
-                            target, infos.size());
-                    for (PackageInfo info : infos) {
-                        pm.deleteApplicationCacheFiles(info.packageName, observer);
-                    }
-                }
-            });
-            builder.setNegativeButton(android.R.string.cancel, null);
-
-            return builder.create();
-        }
-    }
-
-    /**
-     * Enable indexing of searchable data
-     */
-    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-        new BaseSearchIndexProvider() {
-            @Override
-            public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
-                final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();
-
-                SearchIndexableRaw data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.storage_settings);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.internal_storage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                final StorageVolume[] storageVolumes = StorageManager.from(context).getVolumeList();
-                for (StorageVolume volume : storageVolumes) {
-                    if (!volume.isEmulated()) {
-                        data.title = volume.getDescription(context);
-                        data.screenTitle = context.getString(R.string.storage_settings);
-                        result.add(data);
-                    }
-                }
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_size);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_available);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_apps_usage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_dcim_usage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_music_usage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_downloads_usage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_media_cache_usage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_media_misc_usage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                return result;
-            }
-        };
-
-}
diff --git a/src/com/android/settings/deviceinfo/MiscFilesHandler.java b/src/com/android/settings/deviceinfo/MiscFilesHandler.java
deleted file mode 100644
index 93e352b..0000000
--- a/src/com/android/settings/deviceinfo/MiscFilesHandler.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright (C) 2010 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.app.Activity;
-import android.app.ListActivity;
-import android.content.Context;
-import android.os.Bundle;
-import android.os.storage.StorageVolume;
-import android.text.format.Formatter;
-import android.util.Log;
-import android.util.SparseBooleanArray;
-import android.view.ActionMode;
-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.view.View.OnLongClickListener;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.ListView;
-
-import com.android.settings.R;
-import com.android.settings.deviceinfo.StorageMeasurement.FileInfo;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * This class handles the selection and removal of Misc files.
- */
-public class MiscFilesHandler extends ListActivity {
-    private static final String TAG = "MemorySettings";
-    private String mNumSelectedFormat;
-    private String mNumBytesSelectedFormat;
-    private MemoryMearurementAdapter mAdapter;
-    private LayoutInflater mInflater;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setFinishOnTouchOutside(true);
-        setTitle(R.string.misc_files);
-        mNumSelectedFormat = getString(R.string.misc_files_selected_count);
-        mNumBytesSelectedFormat = getString(R.string.misc_files_selected_count_bytes);
-        mAdapter = new MemoryMearurementAdapter(this);
-        mInflater = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        setContentView(R.layout.settings_storage_miscfiles_list);
-        ListView lv = getListView();
-        lv.setItemsCanFocus(true);
-        lv.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE_MODAL);
-        lv.setMultiChoiceModeListener(new ModeCallback(this));
-        setListAdapter(mAdapter);
-    } 
-
-    private class ModeCallback implements ListView.MultiChoiceModeListener {
-        private int mDataCount;
-        private final Context mContext;
-
-        public ModeCallback(Context context) {
-            mContext = context;
-            mDataCount = mAdapter.getCount();
-        }
-
-        public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-            final MenuInflater inflater = getMenuInflater();
-            inflater.inflate(R.menu.misc_files_menu, menu);
-            return true;
-        }
-
-        public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
-            return true;
-        }
-
-        public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-            ListView lv = getListView();
-            switch (item.getItemId()) {
-            case R.id.action_delete:
-                // delete the files selected
-                SparseBooleanArray checkedItems = lv.getCheckedItemPositions();
-                int checkedCount = getListView().getCheckedItemCount();
-                if (checkedCount > mDataCount) {
-                    throw new IllegalStateException("checked item counts do not match. " +
-                            "checkedCount: " + checkedCount + ", dataSize: " + mDataCount);
-                }
-                if (mDataCount > 0) {
-                    ArrayList<Object> toRemove = new ArrayList<Object>();
-                    for (int i = 0; i < mDataCount; i++) {
-                        if (!checkedItems.get(i)) {
-                            //item not selected
-                            continue;
-                        }
-                        if (StorageMeasurement.LOGV) {
-                            Log.i(TAG, "deleting: " + mAdapter.getItem(i));
-                        }
-                        // delete the file
-                        File file = new File(mAdapter.getItem(i).mFileName);
-                        if (file.isDirectory()) {
-                            deleteDir(file);
-                        } else {
-                            file.delete();                            
-                        }
-                        toRemove.add(mAdapter.getItem(i));
-                    }
-                    mAdapter.removeAll(toRemove);
-                    mAdapter.notifyDataSetChanged();
-                    mDataCount = mAdapter.getCount();
-                }
-                mode.finish();
-                break;
-
-            case R.id.action_select_all:
-                // check ALL items
-                for (int i = 0; i < mDataCount; i++) {
-                    lv.setItemChecked(i, true);
-                }
-                // update the title and subtitle with number selected and numberBytes selected
-                onItemCheckedStateChanged(mode, 1, 0, true);
-                break;
-            }
-            return true;
-        }
-
-        // Deletes all files and subdirectories under given dir.
-        // Returns true if all deletions were successful.
-        // If a deletion fails, the method stops attempting to delete and returns false.
-        private boolean deleteDir(File dir) {
-            String[] children = dir.list();
-            if (children != null) {
-                for (int i=0; i < children.length; i++) {
-                    boolean success = deleteDir(new File(dir, children[i]));
-                    if (!success) {
-                        return false;
-                    }
-                }
-            }
-            // The directory is now empty so delete it
-            return dir.delete();
-        }
-
-        public void onDestroyActionMode(ActionMode mode) {
-            // This block intentionally left blank
-        }
-
-        public void onItemCheckedStateChanged(ActionMode mode, int position, long id,
-                boolean checked) {
-            ListView lv = getListView();
-            int numChecked = lv.getCheckedItemCount();
-            mode.setTitle(String.format(mNumSelectedFormat, numChecked, mAdapter.getCount()));
-
-            // total the sizes of all items selected so far
-            SparseBooleanArray checkedItems = lv.getCheckedItemPositions();
-            long selectedDataSize = 0;
-            if (numChecked > 0) {
-                for (int i = 0; i < mDataCount; i++) {
-                    if (checkedItems.get(i)) {
-                        // item is checked
-                        selectedDataSize += mAdapter.getItem(i).mSize;
-                    }
-                }
-            }
-            mode.setSubtitle(String.format(mNumBytesSelectedFormat,
-                    Formatter.formatFileSize(mContext, selectedDataSize),
-                    Formatter.formatFileSize(mContext, mAdapter.getDataSize())));
-        }
-    }
-
-    class MemoryMearurementAdapter extends BaseAdapter {
-        private ArrayList<StorageMeasurement.FileInfo> mData = null;
-        private long mDataSize = 0;
-        private Context mContext;
-
-        public MemoryMearurementAdapter(Activity activity) {
-            mContext = activity;
-            final StorageVolume storageVolume = activity.getIntent().getParcelableExtra(
-                    StorageVolume.EXTRA_STORAGE_VOLUME);
-            StorageMeasurement mMeasurement = StorageMeasurement.getInstance(
-                    activity, storageVolume);
-            if (mMeasurement == null) return;
-            mData = (ArrayList<StorageMeasurement.FileInfo>) mMeasurement.mFileInfoForMisc;
-            if (mData != null) {
-                for (StorageMeasurement.FileInfo info : mData) {
-                    mDataSize += info.mSize;
-                }
-            }
-        }
-
-        @Override
-        public int getCount() {
-            return (mData == null) ? 0 : mData.size();
-        }
-
-        @Override
-        public StorageMeasurement.FileInfo getItem(int position) {
-            if (mData == null || mData.size() <= position) {
-                return null;
-            }
-            return mData.get(position);
-        }
-
-        @Override
-        public long getItemId(int position) {
-            if (mData == null || mData.size() <= position) {
-                return 0;
-            }
-            return mData.get(position).mId;
-        }
-
-        public void removeAll(List<Object> objs) {
-            if (mData == null) {
-                return;
-            }
-            for (Object o : objs) {
-                mData.remove(o);
-                mDataSize -= ((StorageMeasurement.FileInfo) o).mSize;
-            }
-        }
-
-        public long getDataSize() {
-            return mDataSize;
-        }
-
-        @Override
-        public void notifyDataSetChanged() {
-            super.notifyDataSetChanged();
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            final FileItemInfoLayout view = (convertView == null) ?
-                    (FileItemInfoLayout) mInflater.inflate(R.layout.settings_storage_miscfiles,
-                            parent, false) : (FileItemInfoLayout) convertView;
-            FileInfo item = getItem(position);
-            view.setFileName(item.mFileName);
-            view.setFileSize(Formatter.formatFileSize(mContext, item.mSize));
-            final ListView listView = (ListView) parent;
-            final int listPosition = position;
-            view.getCheckBox().setOnCheckedChangeListener(new OnCheckedChangeListener() {
-                
-                @Override
-                public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                    listView.setItemChecked(listPosition, isChecked);
-                }
-                
-            });
-            view.setOnLongClickListener(new OnLongClickListener() {
-                @Override
-                public boolean onLongClick(View v) {
-                    if (listView.getCheckedItemCount() > 0) {
-                        return false;
-                    }
-                    listView.setItemChecked(listPosition, !view.isChecked());
-                    return true;
-                }
-            });
-            view.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (listView.getCheckedItemCount() > 0) {
-                        listView.setItemChecked(listPosition, !view.isChecked());
-                    }
-                }
-            });
-            return view;
-        }
-    }
-}
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeFormatConfirm.java b/src/com/android/settings/deviceinfo/PrivateVolumeFormatConfirm.java
new file mode 100644
index 0000000..666a918
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeFormatConfirm.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.storage.DiskInfo;
+import android.os.storage.StorageManager;
+import android.os.storage.VolumeInfo;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.InstrumentedFragment;
+import com.android.settings.R;
+
+public class PrivateVolumeFormatConfirm extends InstrumentedFragment {
+    private VolumeInfo mVolume;
+    private DiskInfo mDisk;
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVICEINFO_STORAGE;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        final StorageManager storage = getActivity().getSystemService(StorageManager.class);
+        final String volumeId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID);
+        mVolume = storage.findVolumeById(volumeId);
+        mDisk = storage.findDiskById(mVolume.getDiskId());
+
+        final View view = inflater.inflate(R.layout.storage_internal_format, container, false);
+        final TextView body = (TextView) view.findViewById(R.id.body);
+        final Button confirm = (Button) view.findViewById(R.id.confirm);
+
+        body.setText(TextUtils.expandTemplate(getText(R.string.storage_internal_format_details),
+                mDisk.getDescription()));
+        confirm.setOnClickListener(mConfirmListener);
+
+        return view;
+    }
+
+    private final OnClickListener mConfirmListener = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            final Intent intent = new Intent(getActivity(), StorageWizardFormatProgress.class);
+            intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
+            intent.putExtra(StorageWizardFormatProgress.EXTRA_FORMAT_PUBLIC, true);
+            startActivity(intent);
+            getActivity().finish();
+        }
+    };
+}
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
new file mode 100644
index 0000000..00fb094
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@ -0,0 +1,576 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import static com.android.settings.deviceinfo.StorageSettings.TAG;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.DownloadManager;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.IPackageDataObserver;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.os.storage.StorageEventListener;
+import android.os.storage.StorageManager;
+import android.os.storage.VolumeInfo;
+import android.preference.Preference;
+import android.preference.PreferenceScreen;
+import android.provider.MediaStore;
+import android.text.TextUtils;
+import android.text.format.Formatter;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.EditText;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.util.Preconditions;
+import com.android.settings.R;
+import com.android.settings.Settings.StorageUseActivity;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
+import com.android.settings.applications.ManageApplications;
+import com.android.settings.deviceinfo.StorageMeasurement.MeasurementDetails;
+import com.android.settings.deviceinfo.StorageMeasurement.MeasurementReceiver;
+import com.android.settings.deviceinfo.StorageSettings.MountTask;
+import com.google.android.collect.Lists;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Panel showing summary and actions for a {@link VolumeInfo#TYPE_PRIVATE}
+ * storage volume.
+ */
+public class PrivateVolumeSettings extends SettingsPreferenceFragment {
+    // TODO: disable unmount when providing over MTP/PTP
+    // TODO: warn when mounted read-only
+
+    private static final String TAG_RENAME = "rename";
+    private static final String TAG_CONFIRM_CLEAR_CACHE = "confirmClearCache";
+
+    private StorageManager mStorageManager;
+    private UserManager mUserManager;
+
+    private String mVolumeId;
+    private VolumeInfo mVolume;
+    private VolumeInfo mSharedVolume;
+
+    private StorageMeasurement mMeasure;
+
+    private UserInfo mCurrentUser;
+
+    private int mNextOrder = 0;
+
+    private UsageBarPreference mGraph;
+    private StorageItemPreference mTotal;
+    private StorageItemPreference mAvailable;
+    private StorageItemPreference mApps;
+    private StorageItemPreference mDcim;
+    private StorageItemPreference mMusic;
+    private StorageItemPreference mDownloads;
+    private StorageItemPreference mCache;
+    private StorageItemPreference mMisc;
+    private List<StorageItemPreference> mUsers = Lists.newArrayList();
+
+    private long mTotalSize;
+    private long mAvailSize;
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVICEINFO_STORAGE;
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        final Context context = getActivity();
+
+        mUserManager = context.getSystemService(UserManager.class);
+        mStorageManager = context.getSystemService(StorageManager.class);
+
+        mVolumeId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID);
+        mVolume = mStorageManager.findVolumeById(mVolumeId);
+
+        Preconditions.checkNotNull(mVolume);
+        Preconditions.checkState(mVolume.getType() == VolumeInfo.TYPE_PRIVATE);
+
+        addPreferencesFromResource(R.xml.device_info_storage_volume);
+
+        // Find the emulated shared storage layered above this private volume
+        mSharedVolume = mStorageManager.findEmulatedForPrivate(mVolume);
+
+        mMeasure = new StorageMeasurement(context, mVolume, mSharedVolume);
+        mMeasure.setReceiver(mReceiver);
+
+        mGraph = buildGraph();
+        mTotal = buildItem(R.string.memory_size, 0);
+        mAvailable = buildItem(R.string.memory_available, R.color.memory_avail);
+
+        mApps = buildItem(R.string.memory_apps_usage, R.color.memory_apps_usage);
+        mDcim = buildItem(R.string.memory_dcim_usage, R.color.memory_dcim);
+        mMusic = buildItem(R.string.memory_music_usage, R.color.memory_music);
+        mDownloads = buildItem(R.string.memory_downloads_usage, R.color.memory_downloads);
+        mCache = buildItem(R.string.memory_media_cache_usage, R.color.memory_cache);
+        mMisc = buildItem(R.string.memory_media_misc_usage, R.color.memory_misc);
+
+        mCurrentUser = mUserManager.getUserInfo(UserHandle.myUserId());
+        final List<UserInfo> otherUsers = getUsersExcluding(mCurrentUser);
+        for (int i = 0; i < otherUsers.size(); i++) {
+            final UserInfo user = otherUsers.get(i);
+            final int colorRes = i % 2 == 0 ? R.color.memory_user_light
+                    : R.color.memory_user_dark;
+            final StorageItemPreference userPref = new StorageItemPreference(
+                    context, user.name, colorRes, user.id);
+            mUsers.add(userPref);
+        }
+
+        setHasOptionsMenu(true);
+    }
+
+    public void refresh() {
+        getActivity().setTitle(mStorageManager.getBestVolumeDescription(mVolume));
+
+        // Valid options may have changed
+        getFragmentManager().invalidateOptionsMenu();
+
+        final Context context = getActivity();
+        final PreferenceScreen screen = getPreferenceScreen();
+
+        screen.removeAll();
+
+        if (!mVolume.isMountedReadable()) {
+            return;
+        }
+
+        screen.addPreference(mGraph);
+        screen.addPreference(mTotal);
+        screen.addPreference(mAvailable);
+
+        final boolean showUsers = !mUsers.isEmpty();
+        if (showUsers) {
+            screen.addPreference(new PreferenceHeader(context, mCurrentUser.name));
+        }
+
+        screen.addPreference(mApps);
+        screen.addPreference(mDcim);
+        screen.addPreference(mMusic);
+        screen.addPreference(mDownloads);
+        screen.addPreference(mCache);
+        screen.addPreference(mMisc);
+
+        if (showUsers) {
+            screen.addPreference(new PreferenceHeader(context, R.string.storage_other_users));
+            for (Preference pref : mUsers) {
+                screen.addPreference(pref);
+            }
+        }
+
+        for (int i = 0; i < screen.getPreferenceCount(); i++) {
+            final Preference pref = screen.getPreference(i);
+            if (pref instanceof StorageItemPreference) {
+                ((StorageItemPreference) pref).setLoading();
+            }
+        }
+
+        final File file = mVolume.getPath();
+        mTotalSize = file.getTotalSpace();
+        mAvailSize = file.getFreeSpace();
+
+        mTotal.setSummary(Formatter.formatFileSize(context, mTotalSize));
+        mAvailable.setSummary(Formatter.formatFileSize(context, mAvailSize));
+
+        mGraph.clear();
+        mGraph.addEntry(0, (mTotalSize - mAvailSize) / (float) mTotalSize,
+                android.graphics.Color.GRAY);
+        mGraph.commit();
+
+        mMeasure.forceMeasure();
+    }
+
+    private UsageBarPreference buildGraph() {
+        final UsageBarPreference pref = new UsageBarPreference(getActivity());
+        pref.setOrder(mNextOrder++);
+        return pref;
+    }
+
+    private StorageItemPreference buildItem(int titleRes, int colorRes) {
+        final StorageItemPreference pref = new StorageItemPreference(getActivity(), titleRes,
+                colorRes);
+        pref.setOrder(mNextOrder++);
+        return pref;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        // Refresh to verify that we haven't been formatted away
+        mVolume = mStorageManager.findVolumeById(mVolumeId);
+        if (mVolume == null) {
+            getActivity().finish();
+            return;
+        }
+
+        mStorageManager.registerListener(mStorageListener);
+        refresh();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mStorageManager.unregisterListener(mStorageListener);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        mMeasure.onDestroy();
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.storage_volume, menu);
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        final MenuItem rename = menu.findItem(R.id.storage_rename);
+        final MenuItem mount = menu.findItem(R.id.storage_mount);
+        final MenuItem unmount = menu.findItem(R.id.storage_unmount);
+        final MenuItem format = menu.findItem(R.id.storage_format);
+        final MenuItem usb = menu.findItem(R.id.storage_usb);
+
+        // Actions live in menu for non-internal private volumes; they're shown
+        // as preference items for public volumes.
+        if (VolumeInfo.ID_PRIVATE_INTERNAL.equals(mVolume.getId())) {
+            rename.setVisible(false);
+            mount.setVisible(false);
+            unmount.setVisible(false);
+            format.setVisible(false);
+        } else {
+            rename.setVisible(mVolume.getType() == VolumeInfo.TYPE_PRIVATE);
+            mount.setVisible(mVolume.getState() == VolumeInfo.STATE_UNMOUNTED);
+            unmount.setVisible(mVolume.isMountedReadable());
+            format.setVisible(true);
+        }
+
+        // TODO: show usb if we jumped past first screen
+        usb.setVisible(false);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        final Context context = getActivity();
+        final Bundle args = new Bundle();
+        switch (item.getItemId()) {
+            case R.id.storage_rename:
+                RenameFragment.show(this);
+                return true;
+            case R.id.storage_mount:
+                new MountTask(context, mVolume).execute();
+                return true;
+            case R.id.storage_unmount:
+                args.putString(VolumeInfo.EXTRA_VOLUME_ID, mVolume.getId());
+                startFragment(this, PrivateVolumeUnmountConfirm.class.getCanonicalName(),
+                        R.string.storage_menu_unmount, 0, args);
+                return true;
+            case R.id.storage_format:
+                args.putString(VolumeInfo.EXTRA_VOLUME_ID, mVolume.getId());
+                startFragment(this, PrivateVolumeFormatConfirm.class.getCanonicalName(),
+                        R.string.storage_menu_format, 0, args);
+                return true;
+            case R.id.storage_usb:
+                startFragment(this, UsbSettings.class.getCanonicalName(),
+                        R.string.storage_title_usb, 0, null);
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference pref) {
+        // TODO: launch better intents for specific volume
+
+        Intent intent = null;
+        if (pref == mApps) {
+            Bundle args = new Bundle();
+            args.putString(ManageApplications.EXTRA_CLASSNAME, StorageUseActivity.class.getName());
+            args.putString(ManageApplications.EXTRA_VOLUME_UUID, mVolume.getFsUuid());
+            args.putString(ManageApplications.EXTRA_VOLUME_NAME, mVolume.getDescription());
+            intent = Utils.onBuildStartFragmentIntent(getActivity(),
+                    ManageApplications.class.getName(), args, null, R.string.apps_storage, null,
+                    false);
+        } else if (pref == mDownloads) {
+            intent = new Intent(DownloadManager.ACTION_VIEW_DOWNLOADS).putExtra(
+                    DownloadManager.INTENT_EXTRAS_SORT_BY_SIZE, true);
+
+        } else if (pref == mMusic) {
+            intent = new Intent(Intent.ACTION_GET_CONTENT);
+            intent.setType("audio/mp3");
+
+        } else if (pref == mDcim) {
+            intent = new Intent(Intent.ACTION_VIEW);
+            intent.putExtra(Intent.EXTRA_LOCAL_ONLY, true);
+            intent.setData(MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
+
+        } else if (pref == mCache) {
+            ConfirmClearCacheFragment.show(this);
+            return true;
+
+        } else if (pref == mMisc) {
+            intent = mSharedVolume.buildBrowseIntent();
+        }
+
+        if (intent != null) {
+            try {
+                startActivity(intent);
+            } catch (ActivityNotFoundException e) {
+                Log.w(TAG, "No activity found for " + intent);
+            }
+            return true;
+        }
+        return super.onPreferenceTreeClick(preferenceScreen, pref);
+    }
+
+    private final MeasurementReceiver mReceiver = new MeasurementReceiver() {
+        @Override
+        public void onDetailsChanged(MeasurementDetails details) {
+            updateDetails(details);
+        }
+    };
+
+    private void updateDetails(MeasurementDetails details) {
+        mGraph.clear();
+
+        updatePreference(mApps, details.appsSize);
+
+        final long dcimSize = totalValues(details.mediaSize, Environment.DIRECTORY_DCIM,
+                Environment.DIRECTORY_MOVIES, Environment.DIRECTORY_PICTURES);
+        updatePreference(mDcim, dcimSize);
+
+        final long musicSize = totalValues(details.mediaSize, Environment.DIRECTORY_MUSIC,
+                Environment.DIRECTORY_ALARMS, Environment.DIRECTORY_NOTIFICATIONS,
+                Environment.DIRECTORY_RINGTONES, Environment.DIRECTORY_PODCASTS);
+        updatePreference(mMusic, musicSize);
+
+        final long downloadsSize = totalValues(details.mediaSize, Environment.DIRECTORY_DOWNLOADS);
+        updatePreference(mDownloads, downloadsSize);
+
+        updatePreference(mCache, details.cacheSize);
+        updatePreference(mMisc, details.miscSize);
+
+        for (StorageItemPreference userPref : mUsers) {
+            final long userSize = details.usersSize.get(userPref.userHandle);
+            updatePreference(userPref, userSize);
+        }
+
+        mGraph.commit();
+    }
+
+    private void updatePreference(StorageItemPreference pref, long size) {
+        pref.setSummary(Formatter.formatFileSize(getActivity(), size));
+        if (size > 0) {
+            final int order = pref.getOrder();
+            mGraph.addEntry(order, size / (float) mTotalSize, pref.color);
+        }
+    }
+
+    /**
+     * Return list of other users, excluding the current user.
+     */
+    private List<UserInfo> getUsersExcluding(UserInfo excluding) {
+        final List<UserInfo> users = mUserManager.getUsers();
+        final Iterator<UserInfo> i = users.iterator();
+        while (i.hasNext()) {
+            if (i.next().id == excluding.id) {
+                i.remove();
+            }
+        }
+        return users;
+    }
+
+    private static long totalValues(HashMap<String, Long> map, String... keys) {
+        long total = 0;
+        for (String key : keys) {
+            if (map.containsKey(key)) {
+                total += map.get(key);
+            }
+        }
+        return total;
+    }
+
+    private final StorageEventListener mStorageListener = new StorageEventListener() {
+        @Override
+        public void onVolumeStateChanged(VolumeInfo vol, int oldState, int newState) {
+            if (Objects.equals(mVolume.getId(), vol.getId())) {
+                mVolume = vol;
+                refresh();
+            }
+        }
+
+        @Override
+        public void onVolumeMetadataChanged(VolumeInfo vol) {
+            if (Objects.equals(mVolume.getId(), vol.getId())) {
+                mVolume = vol;
+                refresh();
+            }
+        }
+    };
+
+    /**
+     * Dialog that allows editing of volume nickname.
+     */
+    public static class RenameFragment extends DialogFragment {
+        public static void show(PrivateVolumeSettings parent) {
+            if (!parent.isAdded()) return;
+
+            final RenameFragment dialog = new RenameFragment();
+            dialog.setTargetFragment(parent, 0);
+            dialog.setArguments(parent.getArguments());
+            dialog.show(parent.getFragmentManager(), TAG_RENAME);
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final Context context = getActivity();
+            final StorageManager storageManager = context.getSystemService(StorageManager.class);
+
+            final String volId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID);
+            final VolumeInfo vol = storageManager.findVolumeById(volId);
+
+            final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            final LayoutInflater dialogInflater = LayoutInflater.from(builder.getContext());
+
+            final View view = dialogInflater.inflate(R.layout.dialog_edittext, null, false);
+            final EditText nickname = (EditText) view.findViewById(R.id.edittext);
+
+            if (!TextUtils.isEmpty(vol.getNickname())) {
+                nickname.setText(vol.getNickname());
+            } else {
+                nickname.setText(storageManager.getBestVolumeDescription(vol));
+            }
+
+            builder.setTitle(R.string.storage_rename_title);
+            builder.setView(view);
+
+            builder.setPositiveButton(R.string.save,
+                    new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            // TODO: move to background thread
+                            storageManager.setVolumeNickname(volId, nickname.getText().toString());
+                        }
+                    });
+            builder.setNegativeButton(R.string.cancel, null);
+
+            return builder.create();
+        }
+    }
+
+    /**
+     * Dialog to request user confirmation before clearing all cache data.
+     */
+    public static class ConfirmClearCacheFragment extends DialogFragment {
+        public static void show(PrivateVolumeSettings parent) {
+            if (!parent.isAdded()) return;
+
+            final ConfirmClearCacheFragment dialog = new ConfirmClearCacheFragment();
+            dialog.setTargetFragment(parent, 0);
+            dialog.show(parent.getFragmentManager(), TAG_CONFIRM_CLEAR_CACHE);
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final Context context = getActivity();
+
+            final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            builder.setTitle(R.string.memory_clear_cache_title);
+            builder.setMessage(getString(R.string.memory_clear_cache_message));
+
+            builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    final PrivateVolumeSettings target = (PrivateVolumeSettings) getTargetFragment();
+                    final PackageManager pm = context.getPackageManager();
+                    final List<PackageInfo> infos = pm.getInstalledPackages(0);
+                    final ClearCacheObserver observer = new ClearCacheObserver(
+                            target, infos.size());
+                    for (PackageInfo info : infos) {
+                        pm.deleteApplicationCacheFiles(info.packageName, observer);
+                    }
+                }
+            });
+            builder.setNegativeButton(android.R.string.cancel, null);
+
+            return builder.create();
+        }
+    }
+
+    private static class ClearCacheObserver extends IPackageDataObserver.Stub {
+        private final PrivateVolumeSettings mTarget;
+        private int mRemaining;
+
+        public ClearCacheObserver(PrivateVolumeSettings target, int remaining) {
+            mTarget = target;
+            mRemaining = remaining;
+        }
+
+        @Override
+        public void onRemoveCompleted(final String packageName, final boolean succeeded) {
+            synchronized (this) {
+                if (--mRemaining == 0) {
+                    mTarget.refresh();
+                }
+            }
+        }
+    }
+
+    public static class PreferenceHeader extends Preference {
+        public PreferenceHeader(Context context, int titleRes) {
+            super(context, null, com.android.internal.R.attr.preferenceCategoryStyle);
+            setTitle(titleRes);
+        }
+
+        public PreferenceHeader(Context context, CharSequence title) {
+            super(context, null, com.android.internal.R.attr.preferenceCategoryStyle);
+            setTitle(title);
+        }
+
+        @Override
+        public boolean isEnabled() {
+            return false;
+        }
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeUnmountConfirm.java b/src/com/android/settings/deviceinfo/PrivateVolumeUnmountConfirm.java
new file mode 100644
index 0000000..614b737
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeUnmountConfirm.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import android.os.Bundle;
+import android.os.storage.DiskInfo;
+import android.os.storage.StorageManager;
+import android.os.storage.VolumeInfo;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.InstrumentedFragment;
+import com.android.settings.R;
+import com.android.settings.deviceinfo.StorageSettings.UnmountTask;
+
+public class PrivateVolumeUnmountConfirm extends InstrumentedFragment {
+    private VolumeInfo mVolume;
+    private DiskInfo mDisk;
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVICEINFO_STORAGE;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        final StorageManager storage = getActivity().getSystemService(StorageManager.class);
+        final String volumeId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID);
+        mVolume = storage.findVolumeById(volumeId);
+        mDisk = storage.findDiskById(mVolume.getDiskId());
+
+        final View view = inflater.inflate(R.layout.storage_internal_unmount, container, false);
+        final TextView body = (TextView) view.findViewById(R.id.body);
+        final Button confirm = (Button) view.findViewById(R.id.confirm);
+
+        body.setText(TextUtils.expandTemplate(getText(R.string.storage_internal_unmount_details),
+                mDisk.getDescription()));
+        confirm.setOnClickListener(mConfirmListener);
+
+        return view;
+    }
+
+    private final OnClickListener mConfirmListener = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            new UnmountTask(getActivity(), mVolume).execute();
+            getActivity().finish();
+        }
+    };
+}
diff --git a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java
new file mode 100644
index 0000000..e0b6843
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java
@@ -0,0 +1,227 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.storage.DiskInfo;
+import android.os.storage.StorageEventListener;
+import android.os.storage.StorageManager;
+import android.os.storage.VolumeInfo;
+import android.preference.Preference;
+import android.preference.PreferenceScreen;
+import android.provider.DocumentsContract;
+import android.text.format.Formatter;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.util.Preconditions;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.deviceinfo.StorageSettings.FormatTask;
+import com.android.settings.deviceinfo.StorageSettings.MountTask;
+import com.android.settings.deviceinfo.StorageSettings.UnmountTask;
+
+import java.io.File;
+import java.util.Objects;
+
+/**
+ * Panel showing summary and actions for a {@link VolumeInfo#TYPE_PUBLIC}
+ * storage volume.
+ */
+public class PublicVolumeSettings extends SettingsPreferenceFragment {
+    // TODO: disable unmount when providing over MTP/PTP
+
+    private StorageManager mStorageManager;
+
+    private String mVolumeId;
+    private VolumeInfo mVolume;
+    private DiskInfo mDisk;
+
+    private int mNextOrder = 0;
+
+    private UsageBarPreference mGraph;
+    private StorageItemPreference mTotal;
+    private StorageItemPreference mAvailable;
+
+    private Preference mMount;
+    private Preference mUnmount;
+    private Preference mFormat;
+    private Preference mFormatInternal;
+
+    private long mTotalSize;
+    private long mAvailSize;
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVICEINFO_STORAGE;
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        final Context context = getActivity();
+
+        mStorageManager = context.getSystemService(StorageManager.class);
+
+        if (DocumentsContract.ACTION_DOCUMENT_ROOT_SETTINGS.equals(
+                getActivity().getIntent().getAction())) {
+            final Uri rootUri = getActivity().getIntent().getData();
+            final String fsUuid = DocumentsContract.getRootId(rootUri);
+            mVolume = mStorageManager.findVolumeByUuid(fsUuid);
+        } else {
+            final String volId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID);
+            mVolume = mStorageManager.findVolumeById(volId);
+        }
+
+        Preconditions.checkNotNull(mVolume);
+        Preconditions.checkState(mVolume.getType() == VolumeInfo.TYPE_PUBLIC);
+
+        mDisk = mStorageManager.findDiskById(mVolume.getDiskId());
+        Preconditions.checkNotNull(mDisk);
+
+        mVolumeId = mVolume.getId();
+
+        addPreferencesFromResource(R.xml.device_info_storage_volume);
+
+        mGraph = buildGraph();
+        mTotal = buildItem(R.string.memory_size, 0);
+        mAvailable = buildItem(R.string.memory_available, R.color.memory_avail);
+
+        mMount = buildAction(R.string.storage_menu_mount);
+        mUnmount = buildAction(R.string.storage_menu_unmount);
+        mFormat = buildAction(R.string.storage_menu_format);
+        mFormatInternal = buildAction(R.string.storage_menu_format_internal);
+    }
+
+    public void refresh() {
+        getActivity().setTitle(mStorageManager.getBestVolumeDescription(mVolume));
+
+        final Context context = getActivity();
+        final PreferenceScreen screen = getPreferenceScreen();
+
+        screen.removeAll();
+
+        if (mVolume.isMountedReadable()) {
+            screen.addPreference(mGraph);
+            screen.addPreference(mTotal);
+            screen.addPreference(mAvailable);
+
+            final File file = mVolume.getPath();
+            mTotalSize = file.getTotalSpace();
+            mAvailSize = file.getFreeSpace();
+
+            mTotal.setSummary(Formatter.formatFileSize(context, mTotalSize));
+            mAvailable.setSummary(Formatter.formatFileSize(context, mAvailSize));
+
+            mGraph.clear();
+            mGraph.addEntry(0, (mTotalSize - mAvailSize) / (float) mTotalSize,
+                    android.graphics.Color.GRAY);
+            mGraph.commit();
+        }
+
+        if (mVolume.getState() == VolumeInfo.STATE_UNMOUNTED) {
+            screen.addPreference(mMount);
+        }
+        if (mVolume.isMountedReadable()) {
+            screen.addPreference(mUnmount);
+        }
+        screen.addPreference(mFormat);
+        if (mDisk.isAdoptable()) {
+            screen.addPreference(mFormatInternal);
+        }
+    }
+
+    private UsageBarPreference buildGraph() {
+        final UsageBarPreference pref = new UsageBarPreference(getActivity());
+        pref.setOrder(mNextOrder++);
+        return pref;
+    }
+
+    private StorageItemPreference buildItem(int titleRes, int colorRes) {
+        final StorageItemPreference pref = new StorageItemPreference(getActivity(), titleRes,
+                colorRes);
+        pref.setOrder(mNextOrder++);
+        return pref;
+    }
+
+    private Preference buildAction(int titleRes) {
+        final Preference pref = new Preference(getActivity());
+        pref.setTitle(titleRes);
+        pref.setOrder(mNextOrder++);
+        return pref;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        // Refresh to verify that we haven't been formatted away
+        mVolume = mStorageManager.findVolumeById(mVolumeId);
+        if (mVolume == null) {
+            getActivity().finish();
+            return;
+        }
+
+        mStorageManager.registerListener(mStorageListener);
+        refresh();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mStorageManager.unregisterListener(mStorageListener);
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference pref) {
+        final Context context = getActivity();
+        if (pref == mMount) {
+            new MountTask(context, mVolume).execute();
+        } else if (pref == mUnmount) {
+            new UnmountTask(context, mVolume).execute();
+        } else if (pref == mFormat) {
+            new FormatTask(context, mVolume).execute();
+        } else if (pref == mFormatInternal) {
+            final Intent intent = new Intent(context, StorageWizardFormatConfirm.class);
+            intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
+            startActivity(intent);
+        }
+
+        return super.onPreferenceTreeClick(preferenceScreen, pref);
+    }
+
+    private final StorageEventListener mStorageListener = new StorageEventListener() {
+        @Override
+        public void onVolumeStateChanged(VolumeInfo vol, int oldState, int newState) {
+            if (Objects.equals(mVolume.getId(), vol.getId())) {
+                mVolume = vol;
+                refresh();
+            }
+        }
+
+        @Override
+        public void onVolumeMetadataChanged(VolumeInfo vol) {
+            if (Objects.equals(mVolume.getId(), vol.getId())) {
+                mVolume = vol;
+                refresh();
+            }
+        }
+    };
+}
diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index a78d06c..b86f9c6 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -72,7 +72,7 @@
     // Broadcasts to listen to for connectivity changes.
     private static final String[] CONNECTIVITY_INTENTS = {
             BluetoothAdapter.ACTION_STATE_CHANGED,
-            ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE,
+            ConnectivityManager.CONNECTIVITY_ACTION,
             WifiManager.LINK_CONFIGURATION_CHANGED_ACTION,
             WifiManager.NETWORK_STATE_CHANGED_ACTION,
     };
diff --git a/src/com/android/settings/deviceinfo/StorageItemPreference.java b/src/com/android/settings/deviceinfo/StorageItemPreference.java
index 87e827e..8d48cf0 100644
--- a/src/com/android/settings/deviceinfo/StorageItemPreference.java
+++ b/src/com/android/settings/deviceinfo/StorageItemPreference.java
@@ -62,4 +62,8 @@
         shape.getPaint().setColor(color);
         return shape;
     }
+
+    public void setLoading() {
+        setSummary(R.string.memory_calculating_size);
+    }
 }
diff --git a/src/com/android/settings/deviceinfo/StorageMeasurement.java b/src/com/android/settings/deviceinfo/StorageMeasurement.java
index 34ef62b..b6c35e3 100644
--- a/src/com/android/settings/deviceinfo/StorageMeasurement.java
+++ b/src/com/android/settings/deviceinfo/StorageMeasurement.java
@@ -27,7 +27,6 @@
 import android.content.pm.PackageStats;
 import android.content.pm.UserInfo;
 import android.os.Environment;
-import android.os.Environment.UserEnvironment;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.IBinder;
@@ -36,23 +35,22 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.os.storage.StorageVolume;
+import android.os.storage.VolumeInfo;
 import android.util.Log;
 import android.util.SparseLongArray;
 
 import com.android.internal.app.IMediaContainerService;
-import com.google.android.collect.Maps;
+import com.android.internal.util.ArrayUtils;
 import com.google.android.collect.Sets;
 
 import java.io.File;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
-import javax.annotation.concurrent.GuardedBy;
-
 /**
  * Utility for measuring the disk usage of internal storage or a physical
  * {@link StorageVolume}. Connects with a remote {@link IMediaContainerService}
@@ -77,28 +75,7 @@
             Environment.DIRECTORY_RINGTONES, Environment.DIRECTORY_PODCASTS,
             Environment.DIRECTORY_DOWNLOADS, Environment.DIRECTORY_ANDROID);
 
-    @GuardedBy("sInstances")
-    private static HashMap<StorageVolume, StorageMeasurement> sInstances = Maps.newHashMap();
-
-    /**
-     * Obtain shared instance of {@link StorageMeasurement} for given physical
-     * {@link StorageVolume}, or internal storage if {@code null}.
-     */
-    public static StorageMeasurement getInstance(Context context, StorageVolume volume) {
-        synchronized (sInstances) {
-            StorageMeasurement value = sInstances.get(volume);
-            if (value == null) {
-                value = new StorageMeasurement(context.getApplicationContext(), volume);
-                sInstances.put(volume, value);
-            }
-            return value;
-        }
-    }
-
     public static class MeasurementDetails {
-        public long totalSize;
-        public long availSize;
-
         /**
          * Total apps disk usage.
          * <p>
@@ -128,7 +105,7 @@
          * When measuring a physical {@link StorageVolume}, this reflects media
          * on that volume.
          */
-        public HashMap<String, Long> mediaSize = Maps.newHashMap();
+        public HashMap<String, Long> mediaSize = new HashMap<>();
 
         /**
          * Misc external disk usage for the current user, unaccounted in
@@ -144,34 +121,31 @@
     }
 
     public interface MeasurementReceiver {
-        public void updateApproximate(StorageMeasurement meas, long totalSize, long availSize);
-        public void updateDetails(StorageMeasurement meas, MeasurementDetails details);
+        public void onDetailsChanged(MeasurementDetails details);
     }
 
-    private volatile WeakReference<MeasurementReceiver> mReceiver;
+    private WeakReference<MeasurementReceiver> mReceiver;
 
-    /** Physical volume being measured, or {@code null} for internal. */
-    private final StorageVolume mVolume;
+    private final Context mContext;
 
-    private final boolean mIsInternal;
-    private final boolean mIsPrimary;
+    private final VolumeInfo mVolume;
+    private final VolumeInfo mSharedVolume;
 
-    private final MeasurementHandler mHandler;
+    private final MainHandler mMainHandler;
+    private final MeasurementHandler mMeasurementHandler;
 
-    private long mTotalSize;
-    private long mAvailSize;
+    public StorageMeasurement(Context context, VolumeInfo volume, VolumeInfo sharedVolume) {
+        mContext = context.getApplicationContext();
 
-    List<FileInfo> mFileInfoForMisc;
-
-    private StorageMeasurement(Context context, StorageVolume volume) {
         mVolume = volume;
-        mIsInternal = volume == null;
-        mIsPrimary = volume != null ? volume.isPrimary() : false;
+        mSharedVolume = sharedVolume;
 
         // Start the thread that will measure the disk usage.
         final HandlerThread handlerThread = new HandlerThread("MemoryMeasurement");
         handlerThread.start();
-        mHandler = new MeasurementHandler(context, handlerThread.getLooper());
+
+        mMainHandler = new MainHandler();
+        mMeasurementHandler = new MeasurementHandler(handlerThread.getLooper());
     }
 
     public void setReceiver(MeasurementReceiver receiver) {
@@ -180,52 +154,38 @@
         }
     }
 
+    public void forceMeasure() {
+        invalidate();
+        measure();
+    }
+
     public void measure() {
-        if (!mHandler.hasMessages(MeasurementHandler.MSG_MEASURE)) {
-            mHandler.sendEmptyMessage(MeasurementHandler.MSG_MEASURE);
+        if (!mMeasurementHandler.hasMessages(MeasurementHandler.MSG_MEASURE)) {
+            mMeasurementHandler.sendEmptyMessage(MeasurementHandler.MSG_MEASURE);
         }
     }
 
-    public void cleanUp() {
+    public void onDestroy() {
         mReceiver = null;
-        mHandler.removeMessages(MeasurementHandler.MSG_MEASURE);
-        mHandler.sendEmptyMessage(MeasurementHandler.MSG_DISCONNECT);
+        mMeasurementHandler.removeMessages(MeasurementHandler.MSG_MEASURE);
+        mMeasurementHandler.sendEmptyMessage(MeasurementHandler.MSG_DISCONNECT);
     }
 
-    public void invalidate() {
-        mHandler.sendEmptyMessage(MeasurementHandler.MSG_INVALIDATE);
-    }
-
-    private void sendInternalApproximateUpdate() {
-        MeasurementReceiver receiver = (mReceiver != null) ? mReceiver.get() : null;
-        if (receiver == null) {
-            return;
-        }
-        receiver.updateApproximate(this, mTotalSize, mAvailSize);
-    }
-
-    private void sendExactUpdate(MeasurementDetails details) {
-        MeasurementReceiver receiver = (mReceiver != null) ? mReceiver.get() : null;
-        if (receiver == null) {
-            if (LOGV) {
-                Log.i(TAG, "measurements dropped because receiver is null! wasted effort");
-            }
-            return;
-        }
-        receiver.updateDetails(this, details);
+    private void invalidate() {
+        mMeasurementHandler.sendEmptyMessage(MeasurementHandler.MSG_INVALIDATE);
     }
 
     private static class StatsObserver extends IPackageStatsObserver.Stub {
-        private final boolean mIsInternal;
+        private final boolean mIsPrivate;
         private final MeasurementDetails mDetails;
         private final int mCurrentUser;
         private final Message mFinished;
 
         private int mRemaining;
 
-        public StatsObserver(boolean isInternal, MeasurementDetails details, int currentUser,
+        public StatsObserver(boolean isPrivate, MeasurementDetails details, int currentUser,
                 Message finished, int remaining) {
-            mIsInternal = isInternal;
+            mIsPrivate = isPrivate;
             mDetails = details;
             mCurrentUser = currentUser;
             mFinished = finished;
@@ -245,7 +205,7 @@
         }
 
         private void addStatsLocked(PackageStats stats) {
-            if (mIsInternal) {
+            if (mIsPrivate) {
                 long codeSize = stats.codeSize;
                 long dataSize = stats.dataSize;
                 long cacheSize = stats.cacheSize;
@@ -279,6 +239,17 @@
         }
     }
 
+    private class MainHandler extends Handler {
+        @Override
+        public void handleMessage(Message msg) {
+            final MeasurementDetails details = (MeasurementDetails) msg.obj;
+            final MeasurementReceiver receiver = (mReceiver != null) ? mReceiver.get() : null;
+            if (receiver != null) {
+                receiver.onDetailsChanged(details);
+            }
+        }
+    }
+
     private class MeasurementHandler extends Handler {
         public static final int MSG_MEASURE = 1;
         public static final int MSG_CONNECTED = 2;
@@ -294,8 +265,6 @@
 
         private MeasurementDetails mCached;
 
-        private final WeakReference<Context> mContext;
-
         private final ServiceConnection mDefContainerConn = new ServiceConnection() {
             @Override
             public void onServiceConnected(ComponentName name, IBinder service) {
@@ -313,9 +282,8 @@
             }
         };
 
-        public MeasurementHandler(Context context, Looper looper) {
+        public MeasurementHandler(Looper looper) {
             super(looper);
-            mContext = new WeakReference<Context>(context);
         }
 
         @Override
@@ -323,50 +291,39 @@
             switch (msg.what) {
                 case MSG_MEASURE: {
                     if (mCached != null) {
-                        sendExactUpdate(mCached);
+                        mMainHandler.obtainMessage(0, mCached).sendToTarget();
                         break;
                     }
 
-                    final Context context = (mContext != null) ? mContext.get() : null;
-                    if (context == null) {
-                        return;
-                    }
-
                     synchronized (mLock) {
                         if (mBound) {
                             removeMessages(MSG_DISCONNECT);
                             sendMessage(obtainMessage(MSG_CONNECTED, mDefaultContainer));
                         } else {
                             Intent service = new Intent().setComponent(DEFAULT_CONTAINER_COMPONENT);
-                            context.bindServiceAsUser(service, mDefContainerConn, Context.BIND_AUTO_CREATE,
-                                    UserHandle.OWNER);
+                            mContext.bindServiceAsUser(service, mDefContainerConn,
+                                    Context.BIND_AUTO_CREATE, UserHandle.OWNER);
                         }
                     }
                     break;
                 }
                 case MSG_CONNECTED: {
-                    IMediaContainerService imcs = (IMediaContainerService) msg.obj;
-                    measureApproximateStorage(imcs);
+                    final IMediaContainerService imcs = (IMediaContainerService) msg.obj;
                     measureExactStorage(imcs);
                     break;
                 }
                 case MSG_DISCONNECT: {
                     synchronized (mLock) {
                         if (mBound) {
-                            final Context context = (mContext != null) ? mContext.get() : null;
-                            if (context == null) {
-                                return;
-                            }
-
                             mBound = false;
-                            context.unbindService(mDefContainerConn);
+                            mContext.unbindService(mDefContainerConn);
                         }
                     }
                     break;
                 }
                 case MSG_COMPLETED: {
                     mCached = (MeasurementDetails) msg.obj;
-                    sendExactUpdate(mCached);
+                    mMainHandler.obtainMessage(0, mCached).sendToTarget();
                     break;
                 }
                 case MSG_INVALIDATE: {
@@ -375,88 +332,75 @@
                 }
             }
         }
+    }
 
-        private void measureApproximateStorage(IMediaContainerService imcs) {
-            final String path = mVolume != null ? mVolume.getPath()
-                    : Environment.getDataDirectory().getPath();
-            try {
-                final long[] stats = imcs.getFileSystemStats(path);
-                mTotalSize = stats[0];
-                mAvailSize = stats[1];
-            } catch (Exception e) {
-                Log.w(TAG, "Problem in container service", e);
-            }
+    private void measureExactStorage(IMediaContainerService imcs) {
+        final UserManager userManager = mContext.getSystemService(UserManager.class);
+        final PackageManager packageManager = mContext.getPackageManager();
 
-            sendInternalApproximateUpdate();
-        }
+        final List<UserInfo> users = userManager.getUsers();
+        final int currentUser = ActivityManager.getCurrentUser();
 
-        private void measureExactStorage(IMediaContainerService imcs) {
-            final Context context = mContext != null ? mContext.get() : null;
-            if (context == null) {
-                return;
-            }
+        final MeasurementDetails details = new MeasurementDetails();
+        final Message finished = mMeasurementHandler.obtainMessage(MeasurementHandler.MSG_COMPLETED,
+                details);
 
-            final MeasurementDetails details = new MeasurementDetails();
-            final Message finished = obtainMessage(MSG_COMPLETED, details);
-
-            details.totalSize = mTotalSize;
-            details.availSize = mAvailSize;
-
-            final UserManager userManager = (UserManager) context.getSystemService(
-                    Context.USER_SERVICE);
-            final List<UserInfo> users = userManager.getUsers();
-
-            final int currentUser = ActivityManager.getCurrentUser();
-            final UserEnvironment currentEnv = new UserEnvironment(currentUser);
+        if (mSharedVolume != null && mSharedVolume.isMountedReadable()) {
+            final File basePath = mSharedVolume.getPathForUser(currentUser);
 
             // Measure media types for emulated storage, or for primary physical
             // external volume
-            final boolean measureMedia = (mIsInternal && Environment.isExternalStorageEmulated())
-                    || mIsPrimary;
-            if (measureMedia) {
-                for (String type : sMeasureMediaTypes) {
-                    final File path = currentEnv.getExternalStoragePublicDirectory(type);
-                    final long size = getDirectorySize(imcs, path);
-                    details.mediaSize.put(type, size);
-                }
+            for (String type : sMeasureMediaTypes) {
+                final File path = new File(basePath, type);
+                final long size = getDirectorySize(imcs, path);
+                details.mediaSize.put(type, size);
             }
 
             // Measure misc files not counted under media
-            if (measureMedia) {
-                final File path = mIsInternal ? currentEnv.getExternalStorageDirectory()
-                        : mVolume.getPathFile();
-                details.miscSize = measureMisc(imcs, path);
-            }
+            details.miscSize = measureMisc(imcs, basePath);
 
-            // Measure total emulated storage of all users; internal apps data
-            // will be spliced in later
-            for (UserInfo user : users) {
-                final UserEnvironment userEnv = new UserEnvironment(user.id);
-                final long size = getDirectorySize(imcs, userEnv.getExternalStorageDirectory());
-                addValue(details.usersSize, user.id, size);
-            }
-
-            // Measure all apps for all users
-            final PackageManager pm = context.getPackageManager();
-            if (mIsInternal || mIsPrimary) {
-                final List<ApplicationInfo> apps = pm.getInstalledApplications(
-                        PackageManager.GET_UNINSTALLED_PACKAGES
-                        | PackageManager.GET_DISABLED_COMPONENTS);
-
-                final int count = users.size() * apps.size();
-                final StatsObserver observer = new StatsObserver(
-                        mIsInternal, details, currentUser, finished, count);
-
+            if (mSharedVolume.getType() == VolumeInfo.TYPE_EMULATED) {
+                // Measure total emulated storage of all users; internal apps data
+                // will be spliced in later
                 for (UserInfo user : users) {
-                    for (ApplicationInfo app : apps) {
-                        pm.getPackageSizeInfo(app.packageName, user.id, observer);
-                    }
+                    final File userPath = mSharedVolume.getPathForUser(user.id);
+                    final long size = getDirectorySize(imcs, userPath);
+                    addValue(details.usersSize, user.id, size);
                 }
-
-            } else {
-                finished.sendToTarget();
             }
         }
+
+        // Measure all apps hosted on this volume for all users
+        if (mVolume.getType() == VolumeInfo.TYPE_PRIVATE) {
+            final List<ApplicationInfo> apps = packageManager.getInstalledApplications(
+                    PackageManager.GET_UNINSTALLED_PACKAGES
+                    | PackageManager.GET_DISABLED_COMPONENTS);
+
+            final List<ApplicationInfo> volumeApps = new ArrayList<>();
+            for (ApplicationInfo app : apps) {
+                if (Objects.equals(app.volumeUuid, mVolume.getFsUuid())) {
+                    volumeApps.add(app);
+                }
+            }
+
+            final int count = users.size() * volumeApps.size();
+            if (count == 0) {
+                finished.sendToTarget();
+                return;
+            }
+
+            final StatsObserver observer = new StatsObserver(
+                    true, details, currentUser, finished, count);
+            for (UserInfo user : users) {
+                for (ApplicationInfo app : volumeApps) {
+                    packageManager.getPackageSizeInfo(app.packageName, user.id, observer);
+                }
+            }
+
+        } else {
+            finished.sendToTarget();
+            return;
+        }
     }
 
     private static long getDirectorySize(IMediaContainerService imcs, File path) {
@@ -471,64 +415,26 @@
     }
 
     private long measureMisc(IMediaContainerService imcs, File dir) {
-        mFileInfoForMisc = new ArrayList<FileInfo>();
-
         final File[] files = dir.listFiles();
-        if (files == null) return 0;
+        if (ArrayUtils.isEmpty(files)) return 0;
 
         // Get sizes of all top level nodes except the ones already computed
-        long counter = 0;
         long miscSize = 0;
-
         for (File file : files) {
-            final String path = file.getAbsolutePath();
             final String name = file.getName();
             if (sMeasureMediaTypes.contains(name)) {
                 continue;
             }
 
             if (file.isFile()) {
-                final long fileSize = file.length();
-                mFileInfoForMisc.add(new FileInfo(path, fileSize, counter++));
-                miscSize += fileSize;
+                miscSize += file.length();
             } else if (file.isDirectory()) {
-                final long dirSize = getDirectorySize(imcs, file);
-                mFileInfoForMisc.add(new FileInfo(path, dirSize, counter++));
-                miscSize += dirSize;
-            } else {
-                // Non directory, non file: not listed
+                miscSize += getDirectorySize(imcs, file);
             }
         }
-
-        // sort the list of FileInfo objects collected above in descending order of their sizes
-        Collections.sort(mFileInfoForMisc);
-
         return miscSize;
     }
 
-    static class FileInfo implements Comparable<FileInfo> {
-        final String mFileName;
-        final long mSize;
-        final long mId;
-
-        FileInfo(String fileName, long size, long id) {
-            mFileName = fileName;
-            mSize = size;
-            mId = id;
-        }
-
-        @Override
-        public int compareTo(FileInfo that) {
-            if (this == that || mSize == that.mSize) return 0;
-            else return (mSize < that.mSize) ? 1 : -1; // for descending sort
-        }
-
-        @Override
-        public String toString() {
-            return mFileName  + " : " + mSize + ", id:" + mId;
-        }
-    }
-
     private static void addValue(SparseLongArray array, int key, long value) {
         array.put(key, array.get(key) + value);
     }
diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java
new file mode 100644
index 0000000..7a7d90d
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageSettings.java
@@ -0,0 +1,386 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.UserManager;
+import android.os.storage.StorageEventListener;
+import android.os.storage.StorageManager;
+import android.os.storage.VolumeInfo;
+import android.preference.Preference;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceScreen;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.widget.Toast;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.search.SearchIndexableRaw;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Panel showing both internal storage (both built-in storage and private
+ * volumes) and removable storage (public volumes).
+ */
+public class StorageSettings extends SettingsPreferenceFragment implements Indexable {
+    static final String TAG = "StorageSettings";
+
+    // TODO: badging to indicate devices running low on storage
+    // TODO: show currently ejected private volumes
+
+    private UserManager mUserManager;
+    private StorageManager mStorageManager;
+
+    private PreferenceCategory mInternalCategory;
+    private PreferenceCategory mExternalCategory;
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVICEINFO_STORAGE;
+    }
+
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_uri_storage;
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        final Context context = getActivity();
+
+        mUserManager = context.getSystemService(UserManager.class);
+
+        mStorageManager = context.getSystemService(StorageManager.class);
+        mStorageManager.registerListener(mStorageListener);
+
+        addPreferencesFromResource(R.xml.device_info_storage);
+
+        mInternalCategory = (PreferenceCategory) findPreference("storage_internal");
+        mExternalCategory = (PreferenceCategory) findPreference("storage_external");
+
+        // TODO: if only one volume visible, shortcut into it
+
+        setHasOptionsMenu(true);
+    }
+
+    private final StorageEventListener mStorageListener = new StorageEventListener() {
+        @Override
+        public void onVolumeStateChanged(VolumeInfo vol, int oldState, int newState) {
+            if (isInteresting(vol)) {
+                refresh();
+            }
+        }
+    };
+
+    private static boolean isInteresting(VolumeInfo vol) {
+        switch(vol.getType()) {
+            case VolumeInfo.TYPE_PRIVATE:
+            case VolumeInfo.TYPE_PUBLIC:
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    private void refresh() {
+        final Context context = getActivity();
+
+        getPreferenceScreen().removeAll();
+        mInternalCategory.removeAll();
+        mExternalCategory.removeAll();
+
+        final List<VolumeInfo> volumes = mStorageManager.getVolumes();
+        Collections.sort(volumes, VolumeInfo.getDescriptionComparator());
+
+        for (VolumeInfo vol : volumes) {
+            if (vol.getType() == VolumeInfo.TYPE_PRIVATE) {
+                mInternalCategory.addPreference(new StorageVolumePreference(context, vol));
+            } else if (vol.getType() == VolumeInfo.TYPE_PUBLIC) {
+                mExternalCategory.addPreference(new StorageVolumePreference(context, vol));
+            }
+        }
+
+        if (mInternalCategory.getPreferenceCount() > 0) {
+            getPreferenceScreen().addPreference(mInternalCategory);
+        }
+        if (mExternalCategory.getPreferenceCount() > 0) {
+            getPreferenceScreen().addPreference(mExternalCategory);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mStorageManager.registerListener(mStorageListener);
+        refresh();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mStorageManager.unregisterListener(mStorageListener);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.storage, menu);
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        final MenuItem usb = menu.findItem(R.id.storage_usb);
+
+        usb.setVisible(!mUserManager.hasUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER));
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.storage_usb:
+                startFragment(this, UsbSettings.class.getCanonicalName(),
+                        R.string.storage_title_usb, 0, null);
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference pref) {
+        final String volId = pref.getKey();
+        final VolumeInfo vol = mStorageManager.findVolumeById(volId);
+        if (vol == null) {
+            return false;
+
+        } else if (vol.getType() == VolumeInfo.TYPE_PRIVATE) {
+            final Bundle args = new Bundle();
+            args.putString(VolumeInfo.EXTRA_VOLUME_ID, volId);
+            startFragment(this, PrivateVolumeSettings.class.getCanonicalName(),
+                    -1, 0, args);
+            return true;
+
+        } else if (vol.getType() == VolumeInfo.TYPE_PUBLIC) {
+            if (vol.isMountedReadable()) {
+                startActivity(vol.buildBrowseIntent());
+                return true;
+            } else {
+                final Bundle args = new Bundle();
+                args.putString(VolumeInfo.EXTRA_VOLUME_ID, volId);
+                startFragment(this, PublicVolumeSettings.class.getCanonicalName(),
+                        -1, 0, args);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public static class MountTask extends AsyncTask<Void, Void, Exception> {
+        private final Context mContext;
+        private final StorageManager mStorageManager;
+        private final String mVolumeId;
+        private final String mDescription;
+
+        public MountTask(Context context, VolumeInfo volume) {
+            mContext = context.getApplicationContext();
+            mStorageManager = mContext.getSystemService(StorageManager.class);
+            mVolumeId = volume.getId();
+            mDescription = mStorageManager.getBestVolumeDescription(volume);
+        }
+
+        @Override
+        protected Exception doInBackground(Void... params) {
+            try {
+                mStorageManager.mount(mVolumeId);
+                return null;
+            } catch (Exception e) {
+                return e;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(Exception e) {
+            if (e == null) {
+                Toast.makeText(mContext, mContext.getString(R.string.storage_mount_success,
+                        mDescription), Toast.LENGTH_SHORT).show();
+            } else {
+                Log.e(TAG, "Failed to mount " + mVolumeId, e);
+                Toast.makeText(mContext, mContext.getString(R.string.storage_mount_failure,
+                        mDescription), Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    public static class UnmountTask extends AsyncTask<Void, Void, Exception> {
+        private final Context mContext;
+        private final StorageManager mStorageManager;
+        private final String mVolumeId;
+        private final String mDescription;
+
+        public UnmountTask(Context context, VolumeInfo volume) {
+            mContext = context.getApplicationContext();
+            mStorageManager = mContext.getSystemService(StorageManager.class);
+            mVolumeId = volume.getId();
+            mDescription = mStorageManager.getBestVolumeDescription(volume);
+        }
+
+        @Override
+        protected Exception doInBackground(Void... params) {
+            try {
+                mStorageManager.unmount(mVolumeId);
+                return null;
+            } catch (Exception e) {
+                return e;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(Exception e) {
+            if (e == null) {
+                Toast.makeText(mContext, mContext.getString(R.string.storage_unmount_success,
+                        mDescription), Toast.LENGTH_SHORT).show();
+            } else {
+                Log.e(TAG, "Failed to unmount " + mVolumeId, e);
+                Toast.makeText(mContext, mContext.getString(R.string.storage_unmount_failure,
+                        mDescription), Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    public static class FormatTask extends AsyncTask<Void, Void, Exception> {
+        private final Context mContext;
+        private final StorageManager mStorageManager;
+        private final String mVolumeId;
+        private final String mDescription;
+
+        public FormatTask(Context context, VolumeInfo volume) {
+            mContext = context.getApplicationContext();
+            mStorageManager = mContext.getSystemService(StorageManager.class);
+            mVolumeId = volume.getId();
+            mDescription = mStorageManager.getBestVolumeDescription(volume);
+        }
+
+        @Override
+        protected Exception doInBackground(Void... params) {
+            try {
+                mStorageManager.format(mVolumeId);
+                mStorageManager.mount(mVolumeId);
+                return null;
+            } catch (Exception e) {
+                return e;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(Exception e) {
+            if (e == null) {
+                Toast.makeText(mContext, mContext.getString(R.string.storage_format_success,
+                        mDescription), Toast.LENGTH_SHORT).show();
+            } else {
+                Log.e(TAG, "Failed to format " + mVolumeId, e);
+                Toast.makeText(mContext, mContext.getString(R.string.storage_format_failure,
+                        mDescription), Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    /**
+     * Enable indexing of searchable data
+     */
+    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+        new BaseSearchIndexProvider() {
+            @Override
+            public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
+                final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();
+
+                SearchIndexableRaw data = new SearchIndexableRaw(context);
+                data.title = context.getString(R.string.storage_settings);
+                data.screenTitle = context.getString(R.string.storage_settings);
+                result.add(data);
+
+                data = new SearchIndexableRaw(context);
+                data.title = context.getString(R.string.internal_storage);
+                data.screenTitle = context.getString(R.string.storage_settings);
+                result.add(data);
+
+                data = new SearchIndexableRaw(context);
+                final StorageManager storage = context.getSystemService(StorageManager.class);
+                final List<VolumeInfo> vols = storage.getVolumes();
+                for (VolumeInfo vol : vols) {
+                    if (isInteresting(vol)) {
+                        data.title = storage.getBestVolumeDescription(vol);
+                        data.screenTitle = context.getString(R.string.storage_settings);
+                        result.add(data);
+                    }
+                }
+
+                data = new SearchIndexableRaw(context);
+                data.title = context.getString(R.string.memory_size);
+                data.screenTitle = context.getString(R.string.storage_settings);
+                result.add(data);
+
+                data = new SearchIndexableRaw(context);
+                data.title = context.getString(R.string.memory_available);
+                data.screenTitle = context.getString(R.string.storage_settings);
+                result.add(data);
+
+                data = new SearchIndexableRaw(context);
+                data.title = context.getString(R.string.memory_apps_usage);
+                data.screenTitle = context.getString(R.string.storage_settings);
+                result.add(data);
+
+                data = new SearchIndexableRaw(context);
+                data.title = context.getString(R.string.memory_dcim_usage);
+                data.screenTitle = context.getString(R.string.storage_settings);
+                result.add(data);
+
+                data = new SearchIndexableRaw(context);
+                data.title = context.getString(R.string.memory_music_usage);
+                data.screenTitle = context.getString(R.string.storage_settings);
+                result.add(data);
+
+                data = new SearchIndexableRaw(context);
+                data.title = context.getString(R.string.memory_downloads_usage);
+                data.screenTitle = context.getString(R.string.storage_settings);
+                result.add(data);
+
+                data = new SearchIndexableRaw(context);
+                data.title = context.getString(R.string.memory_media_cache_usage);
+                data.screenTitle = context.getString(R.string.storage_settings);
+                result.add(data);
+
+                data = new SearchIndexableRaw(context);
+                data.title = context.getString(R.string.memory_media_misc_usage);
+                data.screenTitle = context.getString(R.string.storage_settings);
+                result.add(data);
+
+                return result;
+            }
+        };
+}
diff --git a/src/com/android/settings/deviceinfo/StorageUnmountReceiver.java b/src/com/android/settings/deviceinfo/StorageUnmountReceiver.java
new file mode 100644
index 0000000..81ac97b
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageUnmountReceiver.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import static com.android.settings.deviceinfo.StorageSettings.TAG;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.storage.StorageManager;
+import android.os.storage.VolumeInfo;
+import android.util.Log;
+
+import com.android.settings.deviceinfo.StorageSettings.UnmountTask;
+
+public class StorageUnmountReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        final StorageManager storage = context.getSystemService(StorageManager.class);
+
+        final String volId = intent.getStringExtra(VolumeInfo.EXTRA_VOLUME_ID);
+        final VolumeInfo vol = storage.findVolumeById(volId);
+        if (vol != null) {
+            new UnmountTask(context, vol).execute();
+        } else {
+            Log.w(TAG, "Missing volume " + volId);
+        }
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
new file mode 100644
index 0000000..852aa39
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+import android.os.storage.StorageManager;
+import android.os.storage.VolumeInfo;
+import android.preference.Preference;
+import android.text.format.Formatter;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.deviceinfo.StorageSettings.UnmountTask;
+
+import java.io.File;
+
+/**
+ * Preference line representing a single {@link VolumeInfo}, possibly including
+ * quick actions like unmounting.
+ */
+public class StorageVolumePreference extends Preference {
+    private final StorageManager mStorageManager;
+    private final VolumeInfo mVolume;
+
+    public StorageVolumePreference(Context context, VolumeInfo volume) {
+        super(context);
+
+        mStorageManager = context.getSystemService(StorageManager.class);
+        mVolume = volume;
+
+        setKey(volume.getId());
+        setTitle(mStorageManager.getBestVolumeDescription(volume));
+
+        if (volume.isMountedReadable()) {
+            // TODO: move statfs() to background thread
+            final File path = volume.getPath();
+            final String free = Formatter.formatFileSize(context, path.getFreeSpace());
+            final String total = Formatter.formatFileSize(context, path.getTotalSpace());
+            setSummary(context.getString(R.string.storage_volume_summary, free, total));
+        }
+
+        // TODO: better icons
+        if (VolumeInfo.ID_PRIVATE_INTERNAL.equals(volume.getId())) {
+            setIcon(context.getDrawable(R.drawable.ic_settings_storage));
+        } else {
+            setIcon(context.getDrawable(R.drawable.ic_sim_sd));
+        }
+
+        if (volume.getType() == VolumeInfo.TYPE_PUBLIC
+                && volume.isMountedReadable()) {
+            setWidgetLayoutResource(R.layout.preference_storage_action);
+        }
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        final TextView unmount = (TextView) view.findViewById(R.id.unmount);
+        if (unmount != null) {
+            unmount.setText("\u23CF");
+            unmount.setOnClickListener(mUnmountListener);
+        }
+
+        super.onBindView(view);
+    }
+
+    private final View.OnClickListener mUnmountListener = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            new UnmountTask(getContext(), mVolume).execute();
+        }
+    };
+}
diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java b/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
deleted file mode 100644
index a98f8d9..0000000
--- a/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
+++ /dev/null
@@ -1,483 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.deviceinfo;
-
-import android.app.ActivityManagerNative;
-import android.app.ActivityThread;
-import android.app.DownloadManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.IPackageManager;
-import android.content.pm.UserInfo;
-import android.content.res.Resources;
-import android.hardware.usb.UsbManager;
-import android.os.Environment;
-import android.os.Handler;
-import android.os.Message;
-import android.os.RemoteException;
-import android.os.UserManager;
-import android.os.storage.StorageManager;
-import android.os.storage.StorageVolume;
-import android.preference.Preference;
-import android.preference.PreferenceCategory;
-import android.provider.MediaStore;
-import android.text.format.Formatter;
-
-import com.android.settings.R;
-import com.android.settings.Settings;
-import com.android.settings.deviceinfo.StorageMeasurement.MeasurementDetails;
-import com.android.settings.deviceinfo.StorageMeasurement.MeasurementReceiver;
-import com.google.android.collect.Lists;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-public class StorageVolumePreferenceCategory extends PreferenceCategory {
-    public static final String KEY_CACHE = "cache";
-
-    private static final int ORDER_USAGE_BAR = -2;
-    private static final int ORDER_STORAGE_LOW = -1;
-
-    /** Physical volume being measured, or {@code null} for internal. */
-    private final StorageVolume mVolume;
-    private final StorageMeasurement mMeasure;
-
-    private final Resources mResources;
-    private final StorageManager mStorageManager;
-    private final UserManager mUserManager;
-
-    private UsageBarPreference mUsageBarPreference;
-    private Preference mMountTogglePreference;
-    private Preference mFormatPreference;
-    private Preference mStorageLow;
-
-    private StorageItemPreference mItemTotal;
-    private StorageItemPreference mItemAvailable;
-    private StorageItemPreference mItemApps;
-    private StorageItemPreference mItemDcim;
-    private StorageItemPreference mItemMusic;
-    private StorageItemPreference mItemDownloads;
-    private StorageItemPreference mItemCache;
-    private StorageItemPreference mItemMisc;
-    private List<StorageItemPreference> mItemUsers = Lists.newArrayList();
-
-    private boolean mUsbConnected;
-    private String mUsbFunction;
-
-    private long mTotalSize;
-
-    private static final int MSG_UI_UPDATE_APPROXIMATE = 1;
-    private static final int MSG_UI_UPDATE_DETAILS = 2;
-
-    private Handler mUpdateHandler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case MSG_UI_UPDATE_APPROXIMATE: {
-                    final long[] size = (long[]) msg.obj;
-                    updateApproximate(size[0], size[1]);
-                    break;
-                }
-                case MSG_UI_UPDATE_DETAILS: {
-                    final MeasurementDetails details = (MeasurementDetails) msg.obj;
-                    updateDetails(details);
-                    break;
-                }
-            }
-        }
-    };
-
-    /**
-     * Build category to summarize internal storage, including any emulated
-     * {@link StorageVolume}.
-     */
-    public static StorageVolumePreferenceCategory buildForInternal(Context context) {
-        return new StorageVolumePreferenceCategory(context, null);
-    }
-
-    /**
-     * Build category to summarize specific physical {@link StorageVolume}.
-     */
-    public static StorageVolumePreferenceCategory buildForPhysical(
-            Context context, StorageVolume volume) {
-        return new StorageVolumePreferenceCategory(context, volume);
-    }
-
-    private StorageVolumePreferenceCategory(Context context, StorageVolume volume) {
-        super(context);
-
-        mVolume = volume;
-        mMeasure = StorageMeasurement.getInstance(context, volume);
-
-        mResources = context.getResources();
-        mStorageManager = StorageManager.from(context);
-        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
-
-        setTitle(volume != null ? volume.getDescription(context)
-                : context.getText(R.string.internal_storage));
-    }
-
-    private StorageItemPreference buildItem(int titleRes, int colorRes) {
-        return new StorageItemPreference(getContext(), titleRes, colorRes);
-    }
-
-    public void init() {
-        final Context context = getContext();
-
-        removeAll();
-
-        final UserInfo currentUser;
-        try {
-            currentUser = ActivityManagerNative.getDefault().getCurrentUser();
-        } catch (RemoteException e) {
-            throw new RuntimeException("Failed to get current user");
-        }
-
-        final List<UserInfo> otherUsers = getUsersExcluding(currentUser);
-        final boolean showUsers = mVolume == null && otherUsers.size() > 0;
-
-        mUsageBarPreference = new UsageBarPreference(context);
-        mUsageBarPreference.setOrder(ORDER_USAGE_BAR);
-        addPreference(mUsageBarPreference);
-
-        mItemTotal = buildItem(R.string.memory_size, 0);
-        mItemAvailable = buildItem(R.string.memory_available, R.color.memory_avail);
-        addPreference(mItemTotal);
-        addPreference(mItemAvailable);
-
-        mItemApps = buildItem(R.string.memory_apps_usage, R.color.memory_apps_usage);
-        mItemDcim = buildItem(R.string.memory_dcim_usage, R.color.memory_dcim);
-        mItemMusic = buildItem(R.string.memory_music_usage, R.color.memory_music);
-        mItemDownloads = buildItem(R.string.memory_downloads_usage, R.color.memory_downloads);
-        mItemCache = buildItem(R.string.memory_media_cache_usage, R.color.memory_cache);
-        mItemMisc = buildItem(R.string.memory_media_misc_usage, R.color.memory_misc);
-
-        mItemCache.setKey(KEY_CACHE);
-
-        final boolean showDetails = mVolume == null || mVolume.isPrimary();
-        if (showDetails) {
-            if (showUsers) {
-                addPreference(new PreferenceHeader(context, currentUser.name));
-            }
-
-            addPreference(mItemApps);
-            addPreference(mItemDcim);
-            addPreference(mItemMusic);
-            addPreference(mItemDownloads);
-            addPreference(mItemCache);
-            addPreference(mItemMisc);
-
-            if (showUsers) {
-                addPreference(new PreferenceHeader(context, R.string.storage_other_users));
-
-                int count = 0;
-                for (UserInfo info : otherUsers) {
-                    final int colorRes = count++ % 2 == 0 ? R.color.memory_user_light
-                            : R.color.memory_user_dark;
-                    final StorageItemPreference userPref = new StorageItemPreference(
-                            getContext(), info.name, colorRes, info.id);
-                    mItemUsers.add(userPref);
-                    addPreference(userPref);
-                }
-            }
-        }
-
-        final boolean isRemovable = mVolume != null ? mVolume.isRemovable() : false;
-        // Always create the preference since many code rely on it existing
-        mMountTogglePreference = new Preference(context);
-        if (isRemovable) {
-            mMountTogglePreference.setTitle(R.string.sd_eject);
-            mMountTogglePreference.setSummary(R.string.sd_eject_summary);
-            addPreference(mMountTogglePreference);
-        }
-
-        final boolean allowFormat = mVolume != null;
-        if (allowFormat) {
-            mFormatPreference = new Preference(context);
-            mFormatPreference.setTitle(R.string.sd_format);
-            mFormatPreference.setSummary(R.string.sd_format_summary);
-            addPreference(mFormatPreference);
-        }
-
-        final IPackageManager pm = ActivityThread.getPackageManager();
-        try {
-            if (pm.isStorageLow()) {
-                mStorageLow = new Preference(context);
-                mStorageLow.setOrder(ORDER_STORAGE_LOW);
-                mStorageLow.setTitle(R.string.storage_low_title);
-                mStorageLow.setSummary(R.string.storage_low_summary);
-                addPreference(mStorageLow);
-            } else if (mStorageLow != null) {
-                removePreference(mStorageLow);
-                mStorageLow = null;
-            }
-        } catch (RemoteException e) {
-        }
-    }
-
-    public StorageVolume getStorageVolume() {
-        return mVolume;
-    }
-
-    private void updatePreferencesFromState() {
-        // Only update for physical volumes
-        if (mVolume == null) return;
-
-        mMountTogglePreference.setEnabled(true);
-
-        final String state = mStorageManager.getVolumeState(mVolume.getPath());
-
-        if (Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
-            mItemAvailable.setTitle(R.string.memory_available_read_only);
-        } else {
-            mItemAvailable.setTitle(R.string.memory_available);
-        }
-
-        if (Environment.MEDIA_MOUNTED.equals(state)
-                || Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
-            mMountTogglePreference.setEnabled(true);
-            mMountTogglePreference.setTitle(mResources.getString(R.string.sd_eject));
-            mMountTogglePreference.setSummary(mResources.getString(R.string.sd_eject_summary));
-            addPreference(mUsageBarPreference);
-            addPreference(mItemTotal);
-            addPreference(mItemAvailable);
-        } else {
-            if (Environment.MEDIA_UNMOUNTED.equals(state) || Environment.MEDIA_NOFS.equals(state)
-                    || Environment.MEDIA_UNMOUNTABLE.equals(state)) {
-                mMountTogglePreference.setEnabled(true);
-                mMountTogglePreference.setTitle(mResources.getString(R.string.sd_mount));
-                mMountTogglePreference.setSummary(mResources.getString(R.string.sd_mount_summary));
-            } else {
-                mMountTogglePreference.setEnabled(false);
-                mMountTogglePreference.setTitle(mResources.getString(R.string.sd_mount));
-                mMountTogglePreference.setSummary(mResources.getString(R.string.sd_insert_summary));
-            }
-
-            removePreference(mUsageBarPreference);
-            removePreference(mItemTotal);
-            removePreference(mItemAvailable);
-        }
-
-        if (mUsbConnected && (UsbManager.USB_FUNCTION_MTP.equals(mUsbFunction) ||
-                UsbManager.USB_FUNCTION_PTP.equals(mUsbFunction))) {
-            mMountTogglePreference.setEnabled(false);
-            if (Environment.MEDIA_MOUNTED.equals(state)
-                    || Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
-                mMountTogglePreference.setSummary(
-                        mResources.getString(R.string.mtp_ptp_mode_summary));
-            }
-
-            if (mFormatPreference != null) {
-                mFormatPreference.setEnabled(false);
-                mFormatPreference.setSummary(mResources.getString(R.string.mtp_ptp_mode_summary));
-            }
-        } else if (mFormatPreference != null) {
-            mFormatPreference.setEnabled(mMountTogglePreference.isEnabled());
-            mFormatPreference.setSummary(mResources.getString(R.string.sd_format_summary));
-        }
-    }
-
-    public void updateApproximate(long totalSize, long availSize) {
-        mItemTotal.setSummary(formatSize(totalSize));
-        mItemAvailable.setSummary(formatSize(availSize));
-
-        mTotalSize = totalSize;
-
-        final long usedSize = totalSize - availSize;
-
-        mUsageBarPreference.clear();
-        mUsageBarPreference.addEntry(0, usedSize / (float) totalSize, android.graphics.Color.GRAY);
-        mUsageBarPreference.commit();
-
-        updatePreferencesFromState();
-    }
-
-    private static long totalValues(HashMap<String, Long> map, String... keys) {
-        long total = 0;
-        for (String key : keys) {
-            if (map.containsKey(key)) {
-                total += map.get(key);
-            }
-        }
-        return total;
-    }
-
-    public void updateDetails(MeasurementDetails details) {
-        final boolean showDetails = mVolume == null || mVolume.isPrimary();
-        if (!showDetails) return;
-
-        // Count caches as available space, since system manages them
-        mItemTotal.setSummary(formatSize(details.totalSize));
-        mItemAvailable.setSummary(formatSize(details.availSize));
-
-        mUsageBarPreference.clear();
-
-        updatePreference(mItemApps, details.appsSize);
-
-        final long dcimSize = totalValues(details.mediaSize, Environment.DIRECTORY_DCIM,
-                Environment.DIRECTORY_MOVIES, Environment.DIRECTORY_PICTURES);
-        updatePreference(mItemDcim, dcimSize);
-
-        final long musicSize = totalValues(details.mediaSize, Environment.DIRECTORY_MUSIC,
-                Environment.DIRECTORY_ALARMS, Environment.DIRECTORY_NOTIFICATIONS,
-                Environment.DIRECTORY_RINGTONES, Environment.DIRECTORY_PODCASTS);
-        updatePreference(mItemMusic, musicSize);
-
-        final long downloadsSize = totalValues(details.mediaSize, Environment.DIRECTORY_DOWNLOADS);
-        updatePreference(mItemDownloads, downloadsSize);
-
-        updatePreference(mItemCache, details.cacheSize);
-        updatePreference(mItemMisc, details.miscSize);
-
-        for (StorageItemPreference userPref : mItemUsers) {
-            final long userSize = details.usersSize.get(userPref.userHandle);
-            updatePreference(userPref, userSize);
-        }
-
-        mUsageBarPreference.commit();
-    }
-
-    private void updatePreference(StorageItemPreference pref, long size) {
-        if (size > 0) {
-            pref.setSummary(formatSize(size));
-            final int order = pref.getOrder();
-            mUsageBarPreference.addEntry(order, size / (float) mTotalSize, pref.color);
-        } else {
-            removePreference(pref);
-        }
-    }
-
-    private void measure() {
-        mMeasure.invalidate();
-        mMeasure.measure();
-    }
-
-    public void onResume() {
-        mMeasure.setReceiver(mReceiver);
-        measure();
-    }
-
-    public void onStorageStateChanged() {
-        init();
-        measure();
-    }
-
-    public void onUsbStateChanged(boolean isUsbConnected, String usbFunction) {
-        mUsbConnected = isUsbConnected;
-        mUsbFunction = usbFunction;
-        measure();
-    }
-
-    public void onMediaScannerFinished() {
-        measure();
-    }
-
-    public void onCacheCleared() {
-        measure();
-    }
-
-    public void onPause() {
-        mMeasure.cleanUp();
-    }
-
-    private String formatSize(long size) {
-        return Formatter.formatFileSize(getContext(), size);
-    }
-
-    private MeasurementReceiver mReceiver = new MeasurementReceiver() {
-        @Override
-        public void updateApproximate(StorageMeasurement meas, long totalSize, long availSize) {
-            mUpdateHandler.obtainMessage(MSG_UI_UPDATE_APPROXIMATE, new long[] {
-                    totalSize, availSize }).sendToTarget();
-        }
-
-        @Override
-        public void updateDetails(StorageMeasurement meas, MeasurementDetails details) {
-            mUpdateHandler.obtainMessage(MSG_UI_UPDATE_DETAILS, details).sendToTarget();
-        }
-    };
-
-    public boolean mountToggleClicked(Preference preference) {
-        return preference == mMountTogglePreference;
-    }
-
-    public Intent intentForClick(Preference pref) {
-        Intent intent = null;
-
-        // TODO The current "delete" story is not fully handled by the respective applications.
-        // When it is done, make sure the intent types below are correct.
-        // If that cannot be done, remove these intents.
-        final String key = pref.getKey();
-        if (pref == mFormatPreference) {
-            intent = new Intent(Intent.ACTION_VIEW);
-            intent.setClass(getContext(), com.android.settings.MediaFormat.class);
-            intent.putExtra(StorageVolume.EXTRA_STORAGE_VOLUME, mVolume);
-        } else if (pref == mItemApps) {
-            intent = new Intent(Intent.ACTION_MANAGE_PACKAGE_STORAGE);
-            intent.setClass(getContext(), Settings.ManageApplicationsActivity.class);
-        } else if (pref == mItemDownloads) {
-            intent = new Intent(DownloadManager.ACTION_VIEW_DOWNLOADS).putExtra(
-                    DownloadManager.INTENT_EXTRAS_SORT_BY_SIZE, true);
-        } else if (pref == mItemMusic) {
-            intent = new Intent(Intent.ACTION_GET_CONTENT);
-            intent.setType("audio/mp3");
-        } else if (pref == mItemDcim) {
-            intent = new Intent(Intent.ACTION_VIEW);
-            intent.putExtra(Intent.EXTRA_LOCAL_ONLY, true);
-            // TODO Create a Videos category, MediaStore.Video.Media.EXTERNAL_CONTENT_URI
-            intent.setData(MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
-        } else if (pref == mItemMisc) {
-            Context context = getContext().getApplicationContext();
-            intent = new Intent(context, MiscFilesHandler.class);
-            intent.putExtra(StorageVolume.EXTRA_STORAGE_VOLUME, mVolume);
-        }
-
-        return intent;
-    }
-
-    public static class PreferenceHeader extends Preference {
-        public PreferenceHeader(Context context, int titleRes) {
-            super(context, null, com.android.internal.R.attr.preferenceCategoryStyle);
-            setTitle(titleRes);
-        }
-
-        public PreferenceHeader(Context context, CharSequence title) {
-            super(context, null, com.android.internal.R.attr.preferenceCategoryStyle);
-            setTitle(title);
-        }
-
-        @Override
-        public boolean isEnabled() {
-            return false;
-        }
-    }
-
-    /**
-     * Return list of other users, excluding the current user.
-     */
-    private List<UserInfo> getUsersExcluding(UserInfo excluding) {
-        final List<UserInfo> users = mUserManager.getUsers();
-        final Iterator<UserInfo> i = users.iterator();
-        while (i.hasNext()) {
-            if (i.next().id == excluding.id) {
-                i.remove();
-            }
-        }
-        return users;
-    }
-}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java
new file mode 100644
index 0000000..4cb48c5
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import android.app.Activity;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.os.storage.DiskInfo;
+import android.os.storage.StorageManager;
+import android.os.storage.VolumeInfo;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.setupwizardlib.SetupWizardLayout;
+import com.android.setupwizardlib.view.NavigationBar;
+import com.android.setupwizardlib.view.NavigationBar.NavigationBarListener;
+
+import java.text.NumberFormat;
+
+public abstract class StorageWizardBase extends Activity implements NavigationBarListener {
+    protected StorageManager mStorage;
+
+    protected VolumeInfo mVolume;
+    protected DiskInfo mDisk;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mStorage = getSystemService(StorageManager.class);
+
+        final String volumeId = getIntent().getStringExtra(VolumeInfo.EXTRA_VOLUME_ID);
+        if (!TextUtils.isEmpty(volumeId)) {
+            mVolume = mStorage.findVolumeById(volumeId);
+        }
+
+        final String diskId = getIntent().getStringExtra(DiskInfo.EXTRA_DISK_ID);
+        if (!TextUtils.isEmpty(diskId)) {
+            mDisk = mStorage.findDiskById(diskId);
+        } else {
+            mDisk = mStorage.findDiskById(mVolume.getDiskId());
+        }
+
+        setTheme(R.style.SuwThemeMaterial_Light);
+    }
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS |
+                WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN |
+                WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR);
+
+        getNavigationBar().setSystemUiVisibility(
+                View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+
+        getWindow().setStatusBarColor(Color.TRANSPARENT);
+
+        getNavigationBar().setNavigationBarListener(this);
+        getBackButton().setVisibility(View.GONE);
+    }
+
+    protected NavigationBar getNavigationBar() {
+        return (NavigationBar) findViewById(R.id.suw_layout_navigation_bar);
+    }
+
+    protected Button getBackButton() {
+        return getNavigationBar().getBackButton();
+    }
+
+    protected Button getNextButton() {
+        return getNavigationBar().getNextButton();
+    }
+
+    protected SetupWizardLayout getSetupWizardLayout() {
+        return (SetupWizardLayout) findViewById(R.id.setup_wizard_layout);
+    }
+
+    protected ProgressBar getProgressBar() {
+        return (ProgressBar) findViewById(R.id.storage_wizard_progress);
+    }
+
+    protected void setCurrentProgress(int progress) {
+        getProgressBar().setProgress(progress);
+        ((TextView) findViewById(R.id.storage_wizard_progress_summary)).setText(
+                NumberFormat.getPercentInstance().format((double) progress / 100));
+    }
+
+    protected void setHeaderText(int resId, String... args) {
+        getSetupWizardLayout().setHeaderText(TextUtils.expandTemplate(getText(resId), args));
+    }
+
+    protected void setBodyText(int resId, String... args) {
+        ((TextView) findViewById(R.id.storage_wizard_body)).setText(
+                TextUtils.expandTemplate(getText(resId), args));
+    }
+
+    protected void setSecondaryBodyText(int resId, String... args) {
+        final TextView secondBody = ((TextView) findViewById(R.id.storage_wizard_second_body));
+        secondBody.setText(TextUtils.expandTemplate(getText(resId), args));
+        secondBody.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void onNavigateBack() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void onNavigateNext() {
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java
new file mode 100644
index 0000000..f4f475f
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.storage.DiskInfo;
+
+import com.android.internal.util.Preconditions;
+import com.android.settings.R;
+
+public class StorageWizardFormatConfirm extends StorageWizardBase {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.storage_wizard_generic);
+
+        Preconditions.checkNotNull(mDisk);
+
+        setHeaderText(R.string.storage_wizard_format_confirm_title);
+        setBodyText(R.string.storage_wizard_format_confirm_body,
+                mDisk.getDescription());
+
+        // TODO: make this a big red scary button
+        getNextButton().setText(R.string.storage_wizard_format_confirm_next);
+    }
+
+    @Override
+    public void onNavigateNext() {
+        final Intent intent = new Intent(this, StorageWizardFormatProgress.class);
+        intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
+        startActivity(intent);
+        finishAffinity();
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
new file mode 100644
index 0000000..2996d45
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import static com.android.settings.deviceinfo.StorageSettings.TAG;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.storage.DiskInfo;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+import com.android.internal.util.Preconditions;
+import com.android.settings.R;
+
+public class StorageWizardFormatProgress extends StorageWizardBase {
+    public static final String EXTRA_FORMAT_PUBLIC = "format_private";
+
+    private boolean mFormatPublic;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.storage_wizard_progress);
+
+        Preconditions.checkNotNull(mDisk);
+
+        mFormatPublic = getIntent().getBooleanExtra(EXTRA_FORMAT_PUBLIC, false);
+
+        setHeaderText(R.string.storage_wizard_format_progress_title, mDisk.getDescription());
+        setBodyText(R.string.storage_wizard_format_progress_body, mDisk.getDescription());
+
+        setCurrentProgress(20);
+
+        getNextButton().setVisibility(View.GONE);
+
+        new PartitionTask().execute();
+    }
+
+    public class PartitionTask extends AsyncTask<Void, Void, Exception> {
+        @Override
+        protected Exception doInBackground(Void... params) {
+            try {
+                if (mFormatPublic) {
+                    mStorage.partitionPublic(mDisk.getId());
+                } else {
+                    mStorage.partitionPrivate(mDisk.getId());
+                }
+                return null;
+            } catch (Exception e) {
+                return e;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(Exception e) {
+            final Context context = StorageWizardFormatProgress.this;
+            if (e == null) {
+                if (!mFormatPublic) {
+                    // TODO: bring back migration once implemented
+//                    final Intent intent = new Intent(context, StorageWizardMigrate.class);
+//                    intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
+//                    startActivity(intent);
+                    final Intent intent = new Intent(context, StorageWizardReady.class);
+                    intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
+                    startActivity(intent);
+                }
+                finishAffinity();
+
+            } else {
+                Log.e(TAG, "Failed to partition", e);
+                Toast.makeText(context, e.getMessage(), Toast.LENGTH_LONG).show();
+                finishAffinity();
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardInit.java b/src/com/android/settings/deviceinfo/StorageWizardInit.java
new file mode 100644
index 0000000..9d59231
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageWizardInit.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.storage.DiskInfo;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.RadioButton;
+
+import com.android.internal.util.Preconditions;
+import com.android.settings.R;
+
+public class StorageWizardInit extends StorageWizardBase {
+    private RadioButton mRadioExternal;
+    private RadioButton mRadioInternal;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.storage_wizard_init);
+
+        Preconditions.checkNotNull(mDisk);
+
+        setHeaderText(R.string.storage_wizard_init_title, mDisk.getDescription());
+
+        mRadioExternal = (RadioButton) findViewById(R.id.storage_wizard_init_external_title);
+        mRadioInternal = (RadioButton) findViewById(R.id.storage_wizard_init_internal_title);
+
+        mRadioExternal.setOnCheckedChangeListener(mRadioListener);
+        mRadioInternal.setOnCheckedChangeListener(mRadioListener);
+
+        findViewById(R.id.storage_wizard_init_external_summary).setPadding(
+                mRadioExternal.getCompoundPaddingLeft(), 0,
+                mRadioExternal.getCompoundPaddingRight(), 0);
+        findViewById(R.id.storage_wizard_init_internal_summary).setPadding(
+                mRadioExternal.getCompoundPaddingLeft(), 0,
+                mRadioExternal.getCompoundPaddingRight(), 0);
+
+        getNextButton().setEnabled(false);
+    }
+
+    private final OnCheckedChangeListener mRadioListener = new OnCheckedChangeListener() {
+        @Override
+        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+            if (isChecked) {
+                if (buttonView == mRadioExternal) {
+                    mRadioInternal.setChecked(false);
+                } else if (buttonView == mRadioInternal) {
+                    mRadioExternal.setChecked(false);
+                }
+                getNextButton().setEnabled(true);
+            }
+        }
+    };
+
+    @Override
+    public void onNavigateNext() {
+        if (mRadioExternal.isChecked()) {
+            // Remember that user made decision
+            mStorage.setVolumeInited(mVolume.getId(), true);
+
+            final Intent intent = new Intent(this, StorageWizardReady.class);
+            intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
+            startActivity(intent);
+        } else if (mRadioInternal.isChecked()) {
+            final Intent intent = new Intent(this, StorageWizardFormatConfirm.class);
+            intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
+            startActivity(intent);
+        }
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrate.java b/src/com/android/settings/deviceinfo/StorageWizardMigrate.java
new file mode 100644
index 0000000..4d42613
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageWizardMigrate.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.storage.DiskInfo;
+import android.text.format.DateUtils;
+import android.text.format.Formatter;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.RadioButton;
+
+import com.android.internal.util.Preconditions;
+import com.android.settings.R;
+
+public class StorageWizardMigrate extends StorageWizardBase {
+    private RadioButton mRadioNow;
+    private RadioButton mRadioLater;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.storage_wizard_migrate);
+
+        Preconditions.checkNotNull(mDisk);
+
+        final String time = DateUtils.formatDuration(0).toString();
+        final String size = Formatter.formatFileSize(this, 0);
+
+        setHeaderText(R.string.storage_wizard_migrate_title, mDisk.getDescription());
+        setBodyText(R.string.storage_wizard_migrate_body, mDisk.getDescription(), time, size);
+
+        mRadioNow = (RadioButton) findViewById(R.id.storage_wizard_migrate_now);
+        mRadioLater = (RadioButton) findViewById(R.id.storage_wizard_migrate_later);
+
+        mRadioNow.setOnCheckedChangeListener(mRadioListener);
+        mRadioLater.setOnCheckedChangeListener(mRadioListener);
+
+        mRadioNow.setChecked(true);
+    }
+
+    private final OnCheckedChangeListener mRadioListener = new OnCheckedChangeListener() {
+        @Override
+        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+            if (isChecked) {
+                if (buttonView == mRadioNow) {
+                    mRadioLater.setChecked(false);
+                } else if (buttonView == mRadioLater) {
+                    mRadioNow.setChecked(false);
+                }
+            }
+        }
+    };
+
+    @Override
+    public void onNavigateNext() {
+        if (mRadioNow.isChecked()) {
+            final Intent intent = new Intent(this, StorageWizardMigrateConfirm.class);
+            intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
+            startActivity(intent);
+        } else if (mRadioLater.isChecked()) {
+            final Intent intent = new Intent(this, StorageWizardReady.class);
+            intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
+            startActivity(intent);
+        }
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
new file mode 100644
index 0000000..9aa1441
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.storage.DiskInfo;
+import android.text.format.DateUtils;
+import android.text.format.Formatter;
+
+import com.android.internal.util.Preconditions;
+import com.android.settings.R;
+
+public class StorageWizardMigrateConfirm extends StorageWizardBase {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.storage_wizard_generic);
+
+        Preconditions.checkNotNull(mDisk);
+
+        final String time = DateUtils.formatDuration(0).toString();
+        final String size = Formatter.formatFileSize(this, 0);
+
+        setHeaderText(R.string.storage_wizard_migrate_confirm_title, mDisk.getDescription());
+        setBodyText(R.string.storage_wizard_migrate_confirm_body, time, size);
+        setSecondaryBodyText(R.string.storage_wizard_migrate_details, mDisk.getDescription());
+
+        getNextButton().setText(R.string.storage_wizard_migrate_confirm_next);
+    }
+
+    @Override
+    public void onNavigateNext() {
+        final Intent intent = new Intent(this, StorageWizardMigrateProgress.class);
+        intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
+        startActivity(intent);
+        finishAffinity();
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java b/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java
new file mode 100644
index 0000000..b53b250
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import static com.android.settings.deviceinfo.StorageSettings.TAG;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.SystemClock;
+import android.os.storage.DiskInfo;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+import com.android.internal.util.Preconditions;
+import com.android.settings.R;
+
+public class StorageWizardMigrateProgress extends StorageWizardBase {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.storage_wizard_progress);
+
+        Preconditions.checkNotNull(mDisk);
+
+        setHeaderText(R.string.storage_wizard_migrate_progress_title, mDisk.getDescription());
+        setBodyText(R.string.storage_wizard_migrate_details, mDisk.getDescription());
+
+        setCurrentProgress(20);
+
+        getNextButton().setVisibility(View.GONE);
+
+        new MigrateTask().execute();
+    }
+
+    public class MigrateTask extends AsyncTask<Void, Void, Exception> {
+        @Override
+        protected Exception doInBackground(Void... params) {
+            // TODO: wire up migration
+            SystemClock.sleep(2000);
+            return null;
+        }
+
+        @Override
+        protected void onPostExecute(Exception e) {
+            final Context context = StorageWizardMigrateProgress.this;
+            if (e == null) {
+                final Intent intent = new Intent(context, StorageWizardReady.class);
+                intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
+                startActivity(intent);
+                finishAffinity();
+
+            } else {
+                Log.e(TAG, "Failed to migrate", e);
+                Toast.makeText(context, e.getMessage(), Toast.LENGTH_LONG).show();
+                finishAffinity();
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
new file mode 100644
index 0000000..36750c0
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.Bundle;
+import android.os.storage.VolumeInfo;
+
+import com.android.internal.util.Preconditions;
+import com.android.settings.R;
+
+public class StorageWizardMoveConfirm extends StorageWizardBase {
+    private String mPackageName;
+    private ApplicationInfo mApp;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.storage_wizard_generic);
+
+        try {
+            mPackageName = getIntent().getStringExtra(Intent.EXTRA_PACKAGE_NAME);
+            mApp = getPackageManager().getApplicationInfo(mPackageName, 0);
+        } catch (NameNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+
+        Preconditions.checkNotNull(mVolume);
+        Preconditions.checkNotNull(mApp);
+
+        // Sanity check that target volume is candidate
+        Preconditions.checkState(
+                getPackageManager().getApplicationCandidateVolumes(mApp).contains(mVolume));
+
+        final String appName = getPackageManager().getApplicationLabel(mApp).toString();
+        final String volumeName = mStorage.getBestVolumeDescription(mVolume);
+
+        setHeaderText(R.string.storage_wizard_move_confirm_title, appName);
+        setBodyText(R.string.storage_wizard_move_confirm_body, appName, volumeName);
+
+        getNextButton().setText(R.string.move_app);
+    }
+
+    @Override
+    public void onNavigateNext() {
+        final Intent intent = new Intent(this, StorageWizardMoveProgress.class);
+        intent.putExtra(VolumeInfo.EXTRA_VOLUME_ID, mVolume.getId());
+        intent.putExtra(Intent.EXTRA_PACKAGE_NAME, mPackageName);
+        startActivity(intent);
+        finishAffinity();
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java b/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java
new file mode 100644
index 0000000..2023335
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import static com.android.settings.deviceinfo.StorageSettings.TAG;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.IPackageMoveObserver;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.storage.VolumeInfo;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+import com.android.internal.util.Preconditions;
+import com.android.settings.R;
+
+import java.util.concurrent.CountDownLatch;
+
+public class StorageWizardMoveProgress extends StorageWizardBase {
+    private String mPackageName;
+    private ApplicationInfo mApp;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.storage_wizard_progress);
+
+        try {
+            mPackageName = getIntent().getStringExtra(Intent.EXTRA_PACKAGE_NAME);
+            mApp = getPackageManager().getApplicationInfo(mPackageName, 0);
+        } catch (NameNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+
+        Preconditions.checkNotNull(mVolume);
+        Preconditions.checkNotNull(mApp);
+
+        final String appName = getPackageManager().getApplicationLabel(mApp).toString();
+        final String volumeName = mStorage.getBestVolumeDescription(mVolume);
+
+        setHeaderText(R.string.storage_wizard_move_progress_title, appName);
+        setBodyText(R.string.storage_wizard_move_progress_body, volumeName, appName);
+
+        setCurrentProgress(20);
+
+        getNextButton().setVisibility(View.GONE);
+
+        new MoveTask().execute();
+    }
+
+    private CharSequence moveStatusToMessage(int returnCode) {
+        switch (returnCode) {
+            case PackageManager.MOVE_FAILED_INSUFFICIENT_STORAGE:
+                return getString(R.string.insufficient_storage);
+            case PackageManager.MOVE_FAILED_DOESNT_EXIST:
+                return getString(R.string.does_not_exist);
+            case PackageManager.MOVE_FAILED_FORWARD_LOCKED:
+                return getString(R.string.app_forward_locked);
+            case PackageManager.MOVE_FAILED_INVALID_LOCATION:
+                return getString(R.string.invalid_location);
+            case PackageManager.MOVE_FAILED_SYSTEM_PACKAGE:
+                return getString(R.string.system_package);
+            case PackageManager.MOVE_FAILED_INTERNAL_ERROR:
+            default:
+                return getString(R.string.insufficient_storage);
+        }
+    }
+
+    private class LocalPackageMoveObserver extends IPackageMoveObserver.Stub {
+        public int returnCode;
+        public CountDownLatch finished = new CountDownLatch(1);
+
+        @Override
+        public void packageMoved(String packageName, int returnCode) throws RemoteException {
+            this.returnCode = returnCode;
+            this.finished.countDown();
+        }
+    }
+
+    public class MoveTask extends AsyncTask<Void, Void, Integer> {
+        @Override
+        protected Integer doInBackground(Void... params) {
+            try {
+                final LocalPackageMoveObserver observer = new LocalPackageMoveObserver();
+
+                if (mApp.isExternalAsec()) {
+                    getPackageManager().movePackage(mPackageName, observer,
+                            PackageManager.MOVE_INTERNAL);
+                } else if (mVolume.getType() == VolumeInfo.TYPE_PUBLIC) {
+                    getPackageManager().movePackage(mPackageName, observer,
+                            PackageManager.MOVE_EXTERNAL_MEDIA);
+                } else {
+                    getPackageManager().movePackageAndData(mPackageName, mVolume.fsUuid, observer);
+                }
+
+                observer.finished.await();
+                return observer.returnCode;
+            } catch (Exception e) {
+                Log.e(TAG, "Failed to move", e);
+                return PackageManager.MOVE_FAILED_INTERNAL_ERROR;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(Integer returnCode) {
+            final Context context = StorageWizardMoveProgress.this;
+            if (returnCode == PackageManager.MOVE_SUCCEEDED) {
+                finishAffinity();
+
+            } else {
+                Log.w(TAG, "Move failed with status " + returnCode);
+                Toast.makeText(context, moveStatusToMessage(returnCode), Toast.LENGTH_LONG).show();
+                finishAffinity();
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardReady.java b/src/com/android/settings/deviceinfo/StorageWizardReady.java
new file mode 100644
index 0000000..26038ce
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageWizardReady.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import android.os.Bundle;
+import android.os.storage.VolumeInfo;
+
+import com.android.internal.util.Preconditions;
+import com.android.settings.R;
+
+import java.util.List;
+import java.util.Objects;
+
+public class StorageWizardReady extends StorageWizardBase {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.storage_wizard_generic);
+
+        Preconditions.checkNotNull(mDisk);
+
+        setHeaderText(R.string.storage_wizard_ready_title, mDisk.getDescription());
+
+        // TODO: handle mixed partition cases instead of just guessing based on
+        // first volume type we encounter
+        final List<VolumeInfo> vols = mStorage.getVolumes();
+        for (VolumeInfo vol : vols) {
+            if (!Objects.equals(mDisk.getId(), vol.getDiskId())) continue;
+
+            if (vol.getType() == VolumeInfo.TYPE_PUBLIC) {
+                setBodyText(R.string.storage_wizard_ready_external_body,
+                        mDisk.getDescription());
+                break;
+            } else if (vol.getType() == VolumeInfo.TYPE_PRIVATE) {
+                setBodyText(R.string.storage_wizard_ready_internal_body,
+                        mDisk.getDescription());
+                break;
+            }
+        }
+
+        getNextButton().setText(R.string.done);
+    }
+
+    @Override
+    public void onNavigateNext() {
+        finishAffinity();
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/BatterySaverModeVoiceActivity.java b/src/com/android/settings/fuelgauge/BatterySaverModeVoiceActivity.java
new file mode 100644
index 0000000..3fa0e02
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatterySaverModeVoiceActivity.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.fuelgauge;
+
+import static android.provider.Settings.EXTRA_BATTERY_SAVER_MODE_ENABLED;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.PowerManager;
+import android.util.Log;
+
+import com.android.settings.utils.VoiceSettingsActivity;
+
+/**
+ * Activity for modifying the {@link android.os.PowerManager} power save mode
+ * setting using the Voice Interaction API.
+ */
+public class BatterySaverModeVoiceActivity extends VoiceSettingsActivity {
+    private static final String TAG = "BatterySaverModeVoiceActivity";
+
+    @Override
+    protected boolean onVoiceSettingInteraction(Intent intent) {
+        if (intent.hasExtra(EXTRA_BATTERY_SAVER_MODE_ENABLED)) {
+            PowerManager powerManager = (PowerManager) getSystemService(Context.POWER_SERVICE);
+            if (powerManager.setPowerSaveMode(
+                    intent.getBooleanExtra(EXTRA_BATTERY_SAVER_MODE_ENABLED, false))) {
+                notifySuccess(null);
+            } else {
+                Log.v(TAG, "Unable to set power mode");
+                notifyFailure(null);
+            }
+        } else {
+            Log.v(TAG, "Missing battery saver mode extra");
+        }
+        return true;
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index 3bc1a23..1f13e8e 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -260,14 +260,8 @@
         args.putIntArray(PowerUsageDetail.EXTRA_DETAIL_TYPES, types);
         args.putDoubleArray(PowerUsageDetail.EXTRA_DETAIL_VALUES, values);
 
-        // This is a workaround, see b/17523189
-        if (userId == UserHandle.myUserId()) {
-            caller.startPreferencePanel(PowerUsageDetail.class.getName(), args,
-                    R.string.details_title, null, null, 0);
-        } else {
-            caller.startPreferencePanelAsUser(PowerUsageDetail.class.getName(), args,
-                    R.string.details_title, null, new UserHandle(userId));
-        }
+        caller.startPreferencePanelAsUser(PowerUsageDetail.class.getName(), args,
+                R.string.details_title, null, new UserHandle(userId));
     }
 
     public static final int ACTION_DISPLAY_SETTINGS = 1;
diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java
index 6267570..a907ea1 100644
--- a/src/com/android/settings/nfc/AndroidBeam.java
+++ b/src/com/android/settings/nfc/AndroidBeam.java
@@ -17,17 +17,19 @@
 package com.android.settings.nfc;
 
 import android.app.ActionBar;
-import android.app.Fragment;
 import android.content.Context;
 import android.nfc.NfcAdapter;
 import android.os.Bundle;
 import android.os.UserManager;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Switch;
 
 import com.android.internal.logging.MetricsLogger;
+import com.android.settings.HelpUtils;
 import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
@@ -53,6 +55,13 @@
         mNfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
         mBeamDisallowed = ((UserManager) getActivity().getSystemService(Context.USER_SERVICE))
                 .hasUserRestriction(UserManager.DISALLOW_OUTGOING_BEAM);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        HelpUtils.prepareHelpMenuItem(getActivity(), menu, R.string.help_uri_beam);
     }
 
     @Override
diff --git a/src/com/android/settings/notification/ConditionProviderSettings.java b/src/com/android/settings/notification/ConditionProviderSettings.java
deleted file mode 100644
index 259e53c..0000000
--- a/src/com/android/settings/notification/ConditionProviderSettings.java
+++ /dev/null
@@ -1,55 +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.
- */
-
-package com.android.settings.notification;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.provider.Settings;
-import android.service.notification.ConditionProviderService;
-
-import com.android.settings.R;
-
-public class ConditionProviderSettings extends ManagedServiceSettings {
-    private static final String TAG = ConditionProviderSettings.class.getSimpleName();
-    private static final Config CONFIG = getConditionProviderConfig();
-
-    private static Config getConditionProviderConfig() {
-        final Config c = new Config();
-        c.tag = TAG;
-        c.setting = Settings.Secure.ENABLED_CONDITION_PROVIDERS;
-        c.intentAction = ConditionProviderService.SERVICE_INTERFACE;
-        c.permission = android.Manifest.permission.BIND_CONDITION_PROVIDER_SERVICE;
-        c.noun = "condition provider";
-        c.warningDialogTitle = R.string.condition_provider_security_warning_title;
-        c.warningDialogSummary = R.string.condition_provider_security_warning_summary;
-        c.emptyText = R.string.no_condition_providers;
-        return c;
-    }
-
-    @Override
-    protected Config getConfig() {
-        return CONFIG;
-    }
-
-    public static int getProviderCount(PackageManager pm) {
-        return getServicesCount(CONFIG, pm);
-    }
-
-    public static int getEnabledProviderCount(Context context) {
-        return getEnabledServicesCount(CONFIG, context);
-    }
-}
diff --git a/src/com/android/settings/notification/ManagedServiceSettings.java b/src/com/android/settings/notification/ManagedServiceSettings.java
index 7be644e..cc9e734 100644
--- a/src/com/android/settings/notification/ManagedServiceSettings.java
+++ b/src/com/android/settings/notification/ManagedServiceSettings.java
@@ -16,28 +16,17 @@
 
 package com.android.settings.notification;
 
-import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.app.ListFragment;
-import android.content.BroadcastReceiver;
 import android.content.ComponentName;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.pm.PackageItemInfo;
 import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
-import android.database.ContentObserver;
-import android.net.Uri;
 import android.os.Bundle;
-import android.os.Handler;
-import android.provider.Settings;
-import android.util.Slog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -49,17 +38,15 @@
 
 import com.android.settings.R;
 
-import java.util.HashSet;
 import java.util.List;
 
 public abstract class ManagedServiceSettings extends ListFragment {
     private static final boolean SHOW_PACKAGE_NAME = false;
 
     private final Config mConfig;
-    private PackageManager mPM;
-    private ContentResolver mCR;
 
-    private final HashSet<ComponentName> mEnabledServices = new HashSet<ComponentName>();
+    private PackageManager mPM;
+    private ServiceListing mServiceListing;
     private ServiceListAdapter mListAdapter;
 
     abstract protected Config getConfig();
@@ -68,19 +55,65 @@
         mConfig = getConfig();
     }
 
-    private final ContentObserver mSettingsObserver = new ContentObserver(new Handler()) {
-        @Override
-        public void onChange(boolean selfChange, Uri uri) {
-            updateList();
-        }
-    };
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
 
-    private final BroadcastReceiver mPackageReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            updateList();
+        mPM = getActivity().getPackageManager();
+        mServiceListing = new ServiceListing(getActivity(), mConfig);
+        mServiceListing.addCallback(new ServiceListing.Callback() {
+            @Override
+            public void onServicesReloaded(List<ServiceInfo> services) {
+                updateList(services);
+            }
+        });
+        mListAdapter = new ServiceListAdapter(getActivity());
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        View v =  inflater.inflate(R.layout.managed_service_settings, container, false);
+        TextView empty = (TextView) v.findViewById(android.R.id.empty);
+        empty.setText(mConfig.emptyText);
+        return v;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mServiceListing.reload();
+        mServiceListing.setListening(true);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mServiceListing.setListening(false);
+    }
+
+    private void updateList(List<ServiceInfo> services) {
+        mListAdapter.clear();
+        mListAdapter.addAll(services);
+        mListAdapter.sort(new PackageItemInfo.DisplayNameComparator(mPM));
+
+        getListView().setAdapter(mListAdapter);
+    }
+
+    @Override
+    public void onListItemClick(ListView l, View v, int position, long id) {
+        ServiceInfo info = mListAdapter.getItem(position);
+        final ComponentName cn = new ComponentName(info.packageName, info.name);
+        if (mServiceListing.isEnabled(cn)) {
+            // the simple version: disabling
+            mServiceListing.setEnabled(cn, false);
+        } else {
+            // show a scary dialog
+            new ScaryWarningDialogFragment()
+                .setServiceInfo(cn, info.loadLabel(mPM).toString())
+                .show(getFragmentManager(), "dialog");
         }
-    };
+    }
 
     public class ScaryWarningDialogFragment extends DialogFragment {
         static final String KEY_COMPONENT = "c";
@@ -99,7 +132,8 @@
             super.onCreate(savedInstanceState);
             final Bundle args = getArguments();
             final String label = args.getString(KEY_LABEL);
-            final ComponentName cn = ComponentName.unflattenFromString(args.getString(KEY_COMPONENT));
+            final ComponentName cn = ComponentName.unflattenFromString(args
+                    .getString(KEY_COMPONENT));
 
             final String title = getResources().getString(mConfig.warningDialogTitle, label);
             final String summary = getResources().getString(mConfig.warningDialogSummary, label);
@@ -110,8 +144,7 @@
                     .setPositiveButton(android.R.string.ok,
                             new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialog, int id) {
-                                    mEnabledServices.add(cn);
-                                    saveEnabledServices();
+                                    mServiceListing.setEnabled(cn, true);
                                 }
                             })
                     .setNegativeButton(android.R.string.cancel,
@@ -124,151 +157,6 @@
         }
     }
 
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        mPM = getActivity().getPackageManager();
-        mCR = getActivity().getContentResolver();
-        mListAdapter = new ServiceListAdapter(getActivity());
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        View v =  inflater.inflate(R.layout.managed_service_settings, container, false);
-        TextView empty = (TextView) v.findViewById(android.R.id.empty);
-        empty.setText(mConfig.emptyText);
-        return v;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        updateList();
-
-        // listen for package changes
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(Intent.ACTION_PACKAGE_ADDED);
-        filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
-        filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
-        filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
-        filter.addDataScheme("package");
-        getActivity().registerReceiver(mPackageReceiver, filter);
-
-        mCR.registerContentObserver(Settings.Secure.getUriFor(mConfig.setting),
-                false, mSettingsObserver);
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-
-        getActivity().unregisterReceiver(mPackageReceiver);
-        mCR.unregisterContentObserver(mSettingsObserver);
-    }
-
-    private void loadEnabledServices() {
-        mEnabledServices.clear();
-        final String flat = Settings.Secure.getString(mCR, mConfig.setting);
-        if (flat != null && !"".equals(flat)) {
-            final String[] names = flat.split(":");
-            for (int i = 0; i < names.length; i++) {
-                final ComponentName cn = ComponentName.unflattenFromString(names[i]);
-                if (cn != null) {
-                    mEnabledServices.add(cn);
-                }
-            }
-        }
-    }
-
-    private void saveEnabledServices() {
-        StringBuilder sb = null;
-        for (ComponentName cn : mEnabledServices) {
-            if (sb == null) {
-                sb = new StringBuilder();
-            } else {
-                sb.append(':');
-            }
-            sb.append(cn.flattenToString());
-        }
-        Settings.Secure.putString(mCR,
-                mConfig.setting,
-                sb != null ? sb.toString() : "");
-    }
-
-    private void updateList() {
-        loadEnabledServices();
-
-        getServices(mConfig, mListAdapter, mPM);
-        mListAdapter.sort(new PackageItemInfo.DisplayNameComparator(mPM));
-
-        getListView().setAdapter(mListAdapter);
-    }
-
-    protected static int getEnabledServicesCount(Config config, Context context) {
-        final String flat = Settings.Secure.getString(context.getContentResolver(), config.setting);
-        if (flat == null || "".equals(flat)) return 0;
-        final String[] components = flat.split(":");
-        return components.length;
-    }
-
-    protected static int getServicesCount(Config c, PackageManager pm) {
-        return getServices(c, null, pm);
-    }
-
-    private static int getServices(Config c, ArrayAdapter<ServiceInfo> adapter, PackageManager pm) {
-        int services = 0;
-        if (adapter != null) {
-            adapter.clear();
-        }
-        final int user = ActivityManager.getCurrentUser();
-
-        List<ResolveInfo> installedServices = pm.queryIntentServicesAsUser(
-                new Intent(c.intentAction),
-                PackageManager.GET_SERVICES | PackageManager.GET_META_DATA,
-                user);
-
-        for (int i = 0, count = installedServices.size(); i < count; i++) {
-            ResolveInfo resolveInfo = installedServices.get(i);
-            ServiceInfo info = resolveInfo.serviceInfo;
-
-            if (!c.permission.equals(info.permission)) {
-                Slog.w(c.tag, "Skipping " + c.noun + " service "
-                        + info.packageName + "/" + info.name
-                        + ": it does not require the permission "
-                        + c.permission);
-                continue;
-            }
-            if (adapter != null) {
-                adapter.add(info);
-            }
-            services++;
-        }
-        return services;
-    }
-
-    private boolean isServiceEnabled(ServiceInfo info) {
-        final ComponentName cn = new ComponentName(info.packageName, info.name);
-        return mEnabledServices.contains(cn);
-    }
-
-    @Override
-    public void onListItemClick(ListView l, View v, int position, long id) {
-        ServiceInfo info = mListAdapter.getItem(position);
-        final ComponentName cn = new ComponentName(info.packageName, info.name);
-        if (mEnabledServices.contains(cn)) {
-            // the simple version: disabling
-            mEnabledServices.remove(cn);
-            saveEnabledServices();
-        } else {
-            // show a scary dialog
-            new ScaryWarningDialogFragment()
-                .setServiceInfo(cn, info.loadLabel(mPM).toString())
-                .show(getFragmentManager(), "dialog");
-        }
-    }
-
     private static class ViewHolder {
         ImageView icon;
         TextView name;
@@ -327,7 +215,8 @@
             } else {
                 vh.description.setVisibility(View.GONE);
             }
-            vh.checkbox.setChecked(isServiceEnabled(info));
+            final ComponentName cn = new ComponentName(info.packageName, info.name);
+            vh.checkbox.setChecked(mServiceListing.isEnabled(cn));
         }
     }
 
diff --git a/src/com/android/settings/notification/NotificationAccessSettings.java b/src/com/android/settings/notification/NotificationAccessSettings.java
index ced71a4..5104d4a 100644
--- a/src/com/android/settings/notification/NotificationAccessSettings.java
+++ b/src/com/android/settings/notification/NotificationAccessSettings.java
@@ -46,10 +46,10 @@
     }
 
     public static int getListenersCount(PackageManager pm) {
-        return getServicesCount(CONFIG, pm);
+        return ServiceListing.getServicesCount(CONFIG, pm);
     }
 
     public static int getEnabledListenersCount(Context context) {
-        return getEnabledServicesCount(CONFIG, context);
+        return ServiceListing.getEnabledServicesCount(CONFIG, context);
     }
 }
diff --git a/src/com/android/settings/notification/NotificationSettings.java b/src/com/android/settings/notification/NotificationSettings.java
index ce7ba14..581b707 100644
--- a/src/com/android/settings/notification/NotificationSettings.java
+++ b/src/com/android/settings/notification/NotificationSettings.java
@@ -128,7 +128,7 @@
 
         final PreferenceCategory sound = (PreferenceCategory) findPreference(KEY_SOUND);
         initVolumePreference(KEY_MEDIA_VOLUME, AudioManager.STREAM_MUSIC,
-                com.android.internal.R.drawable.ic_audio_vol_mute);
+                com.android.internal.R.drawable.ic_audio_media_mute);
         initVolumePreference(KEY_ALARM_VOLUME, AudioManager.STREAM_ALARM,
                 com.android.internal.R.drawable.ic_audio_alarm_mute);
         if (mVoiceCapable) {
diff --git a/src/com/android/settings/notification/OtherSoundSettings.java b/src/com/android/settings/notification/OtherSoundSettings.java
index b765b35..c226906 100644
--- a/src/com/android/settings/notification/OtherSoundSettings.java
+++ b/src/com/android/settings/notification/OtherSoundSettings.java
@@ -172,6 +172,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_uri_other_sounds;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
diff --git a/src/com/android/settings/notification/ServiceListing.java b/src/com/android/settings/notification/ServiceListing.java
new file mode 100644
index 0000000..d296139
--- /dev/null
+++ b/src/com/android/settings/notification/ServiceListing.java
@@ -0,0 +1,206 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import android.app.ActivityManager;
+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.ResolveInfo;
+import android.content.pm.ServiceInfo;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.provider.Settings;
+import android.util.Slog;
+
+import com.android.settings.notification.ManagedServiceSettings.Config;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+
+public class ServiceListing {
+    private final ContentResolver mContentResolver;
+    private final Context mContext;
+    private final Config mConfig;
+    private final HashSet<ComponentName> mEnabledServices = new HashSet<ComponentName>();
+    private final List<ServiceInfo> mServices = new ArrayList<ServiceInfo>();
+    private final List<Callback> mCallbacks = new ArrayList<Callback>();
+
+    private boolean mListening;
+
+    public ServiceListing(Context context, Config config) {
+        mContext = context;
+        mConfig = config;
+        mContentResolver = context.getContentResolver();
+    }
+
+    public void addCallback(Callback callback) {
+        mCallbacks.add(callback);
+    }
+
+    public void removeCallback(Callback callback) {
+        mCallbacks.remove(callback);
+    }
+
+    public void setListening(boolean listening) {
+        if (mListening == listening) return;
+        mListening = listening;
+        if (mListening) {
+            // listen for package changes
+            IntentFilter filter = new IntentFilter();
+            filter.addAction(Intent.ACTION_PACKAGE_ADDED);
+            filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
+            filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
+            filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
+            filter.addDataScheme("package");
+            mContext.registerReceiver(mPackageReceiver, filter);
+            mContentResolver.registerContentObserver(Settings.Secure.getUriFor(mConfig.setting),
+                    false, mSettingsObserver);
+        } else {
+            mContext.unregisterReceiver(mPackageReceiver);
+            mContentResolver.unregisterContentObserver(mSettingsObserver);
+        }
+    }
+
+    public static int getEnabledServicesCount(Config config, Context context) {
+        final String flat = Settings.Secure.getString(context.getContentResolver(), config.setting);
+        if (flat == null || "".equals(flat)) return 0;
+        final String[] components = flat.split(":");
+        return components.length;
+    }
+
+    public static int getServicesCount(Config c, PackageManager pm) {
+        return getServices(c, null, pm);
+    }
+
+    public static ServiceInfo findService(Context context, Config config, final ComponentName cn) {
+        final ServiceListing listing = new ServiceListing(context, config);
+        final List<ServiceInfo> services = listing.reload();
+        for (ServiceInfo service : services) {
+            final ComponentName serviceCN = new ComponentName(service.packageName, service.name);
+            if (serviceCN.equals(cn)) {
+                return service;
+            }
+        }
+        return null;
+    }
+
+    private static int getServices(Config c, List<ServiceInfo> list, PackageManager pm) {
+        int services = 0;
+        if (list != null) {
+            list.clear();
+        }
+        final int user = ActivityManager.getCurrentUser();
+
+        List<ResolveInfo> installedServices = pm.queryIntentServicesAsUser(
+                new Intent(c.intentAction),
+                PackageManager.GET_SERVICES | PackageManager.GET_META_DATA,
+                user);
+
+        for (int i = 0, count = installedServices.size(); i < count; i++) {
+            ResolveInfo resolveInfo = installedServices.get(i);
+            ServiceInfo info = resolveInfo.serviceInfo;
+
+            if (!c.permission.equals(info.permission)) {
+                Slog.w(c.tag, "Skipping " + c.noun + " service "
+                        + info.packageName + "/" + info.name
+                        + ": it does not require the permission "
+                        + c.permission);
+                continue;
+            }
+            if (list != null) {
+                list.add(info);
+            }
+            services++;
+        }
+        return services;
+    }
+
+    private void saveEnabledServices() {
+        StringBuilder sb = null;
+        for (ComponentName cn : mEnabledServices) {
+            if (sb == null) {
+                sb = new StringBuilder();
+            } else {
+                sb.append(':');
+            }
+            sb.append(cn.flattenToString());
+        }
+        Settings.Secure.putString(mContentResolver, mConfig.setting,
+                sb != null ? sb.toString() : "");
+    }
+
+    private void loadEnabledServices() {
+        mEnabledServices.clear();
+        final String flat = Settings.Secure.getString(mContentResolver, mConfig.setting);
+        if (flat != null && !"".equals(flat)) {
+            final String[] names = flat.split(":");
+            for (int i = 0; i < names.length; i++) {
+                final ComponentName cn = ComponentName.unflattenFromString(names[i]);
+                if (cn != null) {
+                    mEnabledServices.add(cn);
+                }
+            }
+        }
+    }
+
+    public List<ServiceInfo> reload() {
+        loadEnabledServices();
+        getServices(mConfig, mServices, mContext.getPackageManager());
+        for (Callback callback : mCallbacks) {
+            callback.onServicesReloaded(mServices);
+        }
+        return mServices;
+    }
+
+    public boolean isEnabled(ComponentName cn) {
+        return mEnabledServices.contains(cn);
+    }
+
+    public void setEnabled(ComponentName cn, boolean enabled) {
+        if (enabled) {
+            mEnabledServices.add(cn);
+        } else {
+            mEnabledServices.remove(cn);
+        }
+        saveEnabledServices();
+    }
+
+    private final ContentObserver mSettingsObserver = new ContentObserver(new Handler()) {
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            reload();
+        }
+    };
+
+    private final BroadcastReceiver mPackageReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            reload();
+        }
+    };
+
+    public interface Callback {
+        void onServicesReloaded(List<ServiceInfo> services);
+    }
+}
diff --git a/src/com/android/settings/notification/ZenModeAutomaticConditionSelection.java b/src/com/android/settings/notification/ZenModeAutomaticConditionSelection.java
deleted file mode 100644
index 0e77632..0000000
--- a/src/com/android/settings/notification/ZenModeAutomaticConditionSelection.java
+++ /dev/null
@@ -1,157 +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.
- */
-
-package com.android.settings.notification;
-
-import android.animation.LayoutTransition;
-import android.app.INotificationManager;
-import android.content.Context;
-import android.net.Uri;
-import android.os.Handler;
-import android.os.Message;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.service.notification.Condition;
-import android.service.notification.IConditionListener;
-import android.util.ArraySet;
-import android.util.Log;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.LinearLayout;
-
-import com.android.settings.R;
-
-public class ZenModeAutomaticConditionSelection extends LinearLayout {
-    private static final String TAG = "ZenModeAutomaticConditionSelection";
-    private static final boolean DEBUG = true;
-
-    private final INotificationManager mNoMan;
-    private final H mHandler = new H();
-    private final Context mContext;
-    private final ArraySet<Uri> mSelectedConditions = new ArraySet<Uri>();
-
-    public ZenModeAutomaticConditionSelection(Context context) {
-        super(context);
-        mContext = context;
-        setOrientation(VERTICAL);
-        setLayoutTransition(new LayoutTransition());
-        final int p = mContext.getResources().getDimensionPixelSize(R.dimen.content_margin_left);
-        setPadding(p, p, p, 0);
-        mNoMan = INotificationManager.Stub.asInterface(
-                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
-        refreshSelectedConditions();
-    }
-
-    private void refreshSelectedConditions() {
-        try {
-            final Condition[] automatic = mNoMan.getAutomaticZenModeConditions();
-            mSelectedConditions.clear();
-            if (automatic != null) {
-                for (Condition c : automatic) {
-                    mSelectedConditions.add(c.id);
-                }
-            }
-        } catch (RemoteException e) {
-            Log.w(TAG, "Error calling getAutomaticZenModeConditions", e);
-        }
-    }
-
-    private CheckBox newCheckBox(Object tag) {
-        final CheckBox button = new CheckBox(mContext);
-        button.setTag(tag);
-        button.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                 setSelectedCondition((Uri)button.getTag(), isChecked);
-            }
-        });
-        addView(button);
-        return button;
-    }
-
-    private void setSelectedCondition(Uri conditionId, boolean selected) {
-        if (DEBUG) Log.d(TAG, "setSelectedCondition conditionId=" + conditionId
-                + " selected=" + selected);
-        if (selected) {
-            mSelectedConditions.add(conditionId);
-        } else {
-            mSelectedConditions.remove(conditionId);
-        }
-        final Uri[] automatic = new Uri[mSelectedConditions.size()];
-        for (int i = 0; i < automatic.length; i++) {
-            automatic[i] = mSelectedConditions.valueAt(i);
-        }
-        try {
-            mNoMan.setAutomaticZenModeConditions(automatic);
-        } catch (RemoteException e) {
-            Log.w(TAG, "Error calling setAutomaticZenModeConditions", e);
-        }
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        requestZenModeConditions(Condition.FLAG_RELEVANT_ALWAYS);
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        requestZenModeConditions(0 /*none*/);
-    }
-
-    protected void requestZenModeConditions(int relevance) {
-        if (DEBUG) Log.d(TAG, "requestZenModeConditions " + Condition.relevanceToString(relevance));
-        try {
-            mNoMan.requestZenModeConditions(mListener, relevance);
-        } catch (RemoteException e) {
-            Log.w(TAG, "Error calling requestZenModeConditions", e);
-        }
-    }
-
-    protected void handleConditions(Condition[] conditions) {
-        for (final Condition c : conditions) {
-            CheckBox v = (CheckBox) findViewWithTag(c.id);
-            if (c.state != Condition.STATE_ERROR) {
-                if (v == null) {
-                    v = newCheckBox(c.id);
-                }
-            }
-            if (v != null) {
-                v.setText(c.summary);
-                v.setEnabled(c.state != Condition.STATE_ERROR);
-                v.setChecked(mSelectedConditions.contains(c.id));
-            }
-        }
-    }
-
-    private final IConditionListener mListener = new IConditionListener.Stub() {
-        @Override
-        public void onConditionsReceived(Condition[] conditions) {
-            if (conditions == null || conditions.length == 0) return;
-            mHandler.obtainMessage(H.CONDITIONS, conditions).sendToTarget();
-        }
-    };
-
-    private final class H extends Handler {
-        private static final int CONDITIONS = 1;
-
-        @Override
-        public void handleMessage(Message msg) {
-            if (msg.what == CONDITIONS) handleConditions((Condition[])msg.obj);
-        }
-    }
-}
diff --git a/src/com/android/settings/notification/ZenModeAutomationSettings.java b/src/com/android/settings/notification/ZenModeAutomationSettings.java
index 32ad3ce..6636b33 100644
--- a/src/com/android/settings/notification/ZenModeAutomationSettings.java
+++ b/src/com/android/settings/notification/ZenModeAutomationSettings.java
@@ -16,247 +16,76 @@
 
 package com.android.settings.notification;
 
-import static com.android.settings.notification.ZenModeDowntimeDaysSelection.DAYS;
+import static android.service.notification.ZenModeConfig.ALL_DAYS;
 
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.FragmentManager;
-import android.app.INotificationManager;
-import android.app.TimePickerDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnDismissListener;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.pm.ServiceInfo;
 import android.os.Bundle;
-import android.os.ServiceManager;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
-import android.service.notification.Condition;
+import android.provider.Settings;
+import android.provider.Settings.Global;
+import android.service.notification.ConditionProviderService;
 import android.service.notification.ZenModeConfig;
+import android.service.notification.ZenModeConfig.ScheduleInfo;
+import android.service.notification.ZenModeConfig.ZenRule;
 import android.text.format.DateFormat;
 import android.util.Log;
-import android.util.SparseArray;
-import android.widget.TimePicker;
+import android.view.View;
+import android.view.View.OnClickListener;
 
 import com.android.internal.logging.MetricsLogger;
-import com.android.settings.DropDownPreference;
 import com.android.settings.R;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-import com.android.settings.search.SearchIndexableRaw;
+import com.android.settings.notification.ManagedServiceSettings.Config;
+import com.android.settings.notification.ZenRuleNameDialog.RuleInfo;
+import com.android.settings.widget.FloatingActionButton;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
-import java.util.Objects;
+import java.util.TreeSet;
 
-public class ZenModeAutomationSettings extends ZenModeSettingsBase implements Indexable {
-    private static final String KEY_DOWNTIME = "downtime";
-    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";
-    private static final String KEY_CONDITION_PROVIDERS = "manage_condition_providers";
-
+public class ZenModeAutomationSettings extends ZenModeSettingsBase {
     private static final SimpleDateFormat DAY_FORMAT = new SimpleDateFormat("EEE");
 
-    private PackageManager mPM;
-    private boolean mDisableListeners;
-    private boolean mDowntimeSupported;
+    static final Config CONFIG = getConditionProviderConfig();
 
-    private Preference mDays;
-    private TimePickerPreference mStart;
-    private TimePickerPreference mEnd;
-    private DropDownPreference mDowntimeMode;
-    private PreferenceCategory mAutomationCategory;
-    private Preference mEntry;
-    private Preference mConditionProviders;
+    private final Calendar mCalendar = Calendar.getInstance();
+
+    private ServiceListing mServiceListing;
 
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        mPM = mContext.getPackageManager();
-
         addPreferencesFromResource(R.xml.zen_mode_automation_settings);
-        final PreferenceScreen root = getPreferenceScreen();
-
-        onCreateDowntimeSettings(root);
-
-        mAutomationCategory = (PreferenceCategory) findPreference(KEY_AUTOMATION);
-        mEntry = findPreference(KEY_ENTRY);
-        mEntry.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-            @Override
-            public boolean onPreferenceClick(Preference preference) {
-                new AlertDialog.Builder(mContext)
-                    .setTitle(R.string.zen_mode_entry_conditions_title)
-                    .setView(new ZenModeAutomaticConditionSelection(mContext))
-                    .setOnDismissListener(new OnDismissListener() {
-                        @Override
-                        public void onDismiss(DialogInterface dialog) {
-                            refreshAutomationSection();
-                        }
-                    })
-                    .setPositiveButton(R.string.dlg_ok, null)
-                    .show();
-                return true;
-            }
-        });
-        mConditionProviders = findPreference(KEY_CONDITION_PROVIDERS);
+        mServiceListing = new ServiceListing(mContext, CONFIG);
+        mServiceListing.addCallback(mServiceListingCallback);
+        mServiceListing.reload();
+        mServiceListing.setListening(true);
     }
 
-    private void onCreateDowntimeSettings(PreferenceScreen root) {
-        mDowntimeSupported = isDowntimeSupported(mContext);
-        if (!mDowntimeSupported) {
-            removePreference(KEY_DOWNTIME);
-            return;
-        }
-        mDays = root.findPreference(KEY_DAYS);
-        mDays.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        final FloatingActionButton fab = getFloatingActionButton();
+        fab.setVisibility(View.VISIBLE);
+        fab.setImageResource(R.drawable.ic_menu_add_white);
+        fab.setContentDescription(getString(R.string.zen_mode_time_add_rule));
+        fab.setOnClickListener(new OnClickListener() {
             @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;
+            public void onClick(View v) {
+                showAddRuleDialog();
             }
         });
-
-        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);
-            }
-        });
-        root.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);
-            }
-        });
-        root.addPreference(mEnd);
-        mEnd.setDependency(mDays.getKey());
-
-        mDowntimeMode = (DropDownPreference) root.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());
     }
 
-    private void updateDays() {
-        // Compute an ordered, delimited list of day names based on the persisted user config.
-        if (mConfig != null) {
-            final int[] days = ZenModeConfig.tryParseDays(mConfig.sleepMode);
-            if (days != null && days.length != 0) {
-                final StringBuilder sb = new StringBuilder();
-                final Calendar c = Calendar.getInstance();
-                for (int i = 0; i < DAYS.length; i++) {
-                    final int day = DAYS[i];
-                    for (int j = 0; j < days.length; j++) {
-                        if (day == days[j]) {
-                            c.set(Calendar.DAY_OF_WEEK, day);
-                            if (sb.length() > 0) {
-                                sb.append(mContext.getString(R.string.summary_divider_text));
-                            }
-                            sb.append(DAY_FORMAT.format(c.getTime()));
-                            break;
-                        }
-                    }
-                }
-                if (sb.length() > 0) {
-                    mDays.setSummary(sb);
-                    mDays.notifyDependencyChange(false);
-                    return;
-                }
-            }
-        }
-        mDays.setSummary(R.string.zen_mode_downtime_days_none);
-        mDays.notifyDependencyChange(true);
-    }
-
-    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;
-        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);
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        mServiceListing.setListening(false);
+        mServiceListing.removeCallback(mServiceListingCallback);
     }
 
     @Override
@@ -265,17 +94,67 @@
     }
 
     @Override
-    protected void updateControls() {
-        mDisableListeners = true;
-        if (mDowntimeSupported) {
-            updateDays();
-            mStart.setTime(mConfig.sleepStartHour, mConfig.sleepStartMinute);
-            mEnd.setTime(mConfig.sleepEndHour, mConfig.sleepEndMinute);
-            mDowntimeMode.setSelectedValue(mConfig.sleepNone);
+    protected void onZenModeConfigChanged() {
+        updateControls();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateControls();
+    }
+
+    private void showAddRuleDialog() {
+        new ZenRuleNameDialog(mContext, mServiceListing, null, mConfig.getAutomaticRuleNames()) {
+            @Override
+            public void onOk(String ruleName, RuleInfo ri) {
+                final ZenRule rule = new ZenRule();
+                rule.name = ruleName;
+                rule.enabled = true;
+                rule.zenMode = Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
+                rule.conditionId = ri.defaultConditionId;
+                rule.component = ri.serviceComponent;
+                final ZenModeConfig newConfig = mConfig.copy();
+                final String ruleId = newConfig.newRuleId();
+                newConfig.automaticRules.put(ruleId, rule);
+                if (setZenModeConfig(newConfig)) {
+                    showRule(ri.settingsAction, ri.configurationActivity, ruleId, rule.name);
+                }
+            }
+        }.show();
+    }
+
+    private void showRule(String settingsAction, ComponentName configurationActivity,
+            String ruleId, String ruleName) {
+        if (DEBUG) Log.d(TAG, "showRule " + ruleId + " name=" + ruleName);
+        mContext.startActivity(new Intent(settingsAction)
+                .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+                .putExtra(ZenModeRuleSettingsBase.EXTRA_RULE_ID, ruleId));
+    }
+
+    private void updateControls() {
+        final PreferenceScreen root = getPreferenceScreen();
+        root.removeAll();
+        if (mConfig == null) return;
+        for (int i = 0; i < mConfig.automaticRules.size(); i++) {
+            final String id = mConfig.automaticRules.keyAt(i);
+            final ZenRule rule = mConfig.automaticRules.valueAt(i);
+            final boolean isSchedule = ZenModeConfig.isValidScheduleConditionId(rule.conditionId);
+            final Preference p = new Preference(mContext);
+            p.setTitle(rule.name);
+            p.setSummary(computeRuleSummary(rule));
+            p.setPersistent(false);
+            p.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+                @Override
+                public boolean onPreferenceClick(Preference preference) {
+                    final String action = isSchedule ? ZenModeScheduleRuleSettings.ACTION
+                            : ZenModeExternalRuleSettings.ACTION;
+                    showRule(action, null, id, rule.name);
+                    return true;
+                }
+            });
+            root.addPreference(p);
         }
-        mDisableListeners = false;
-        refreshAutomationSection();
-        updateEndSummary();
     }
 
     @Override
@@ -283,171 +162,89 @@
         return MetricsLogger.NOTIFICATION_ZEN_MODE_AUTOMATION;
     }
 
-    private void refreshAutomationSection() {
-        if (mConditionProviders != null) {
-            final int total = ConditionProviderSettings.getProviderCount(mPM);
-            if (total == 0) {
-                getPreferenceScreen().removePreference(mAutomationCategory);
-            } else {
-                final int n = ConditionProviderSettings.getEnabledProviderCount(mContext);
-                if (n == 0) {
-                    mConditionProviders.setSummary(getResources().getString(
-                            R.string.manage_condition_providers_summary_zero));
-                } else {
-                    mConditionProviders.setSummary(String.format(getResources().getQuantityString(
-                            R.plurals.manage_condition_providers_summary_nonzero,
-                            n, n)));
-                }
-                final String entrySummary = getEntryConditionSummary();
-                if (n == 0 || entrySummary == null) {
-                    mEntry.setSummary(R.string.zen_mode_entry_conditions_summary_none);
-                } else {
-                    mEntry.setSummary(entrySummary);
-                }
-            }
+    private String computeRuleSummary(ZenRule rule) {
+        if (rule == null || !rule.enabled) return getString(R.string.switch_off_text);
+        final ScheduleInfo schedule = ZenModeConfig.tryParseScheduleConditionId(rule.conditionId);
+        final String mode = ZenModeSettings.computeZenModeCaption(getResources(), rule.zenMode);
+        String summary = getString(R.string.switch_on_text);
+        if (schedule != null) {
+            final String days = computeContiguousDayRanges(schedule.days);
+            final String start = getTime(schedule.startHour, schedule.startMinute);
+            final String end = getTime(schedule.endHour, schedule.endMinute);
+            final String time = getString(R.string.summary_range_verbal_combination, start, end);
+            summary = getString(R.string.zen_mode_rule_summary_combination, days, time);
         }
+        return getString(R.string.zen_mode_rule_summary_combination, summary, mode);
     }
 
-    private String getEntryConditionSummary() {
-        final INotificationManager nm = INotificationManager.Stub.asInterface(
-                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
-        try {
-            final Condition[] automatic = nm.getAutomaticZenModeConditions();
-            if (automatic == null || automatic.length == 0) {
-                return null;
-            }
-            final String divider = getString(R.string.summary_divider_text);
-            final StringBuilder sb = new StringBuilder();
-            for (int i = 0; i < automatic.length; i++) {
-                if (i > 0) sb.append(divider);
-                sb.append(automatic[i].summary);
-            }
-            return sb.toString();
-        } catch (Exception e) {
-            Log.w(TAG, "Error calling getAutomaticZenModeConditions", e);
-            return null;
-        }
+    private String getTime(int hour, int minute) {
+        mCalendar.set(Calendar.HOUR_OF_DAY, hour);
+        mCalendar.set(Calendar.MINUTE, minute);
+        return DateFormat.getTimeFormat(mContext).format(mCalendar.getTime());
     }
 
-    private static SparseArray<String> allKeyTitles(Context context) {
-        final SparseArray<String> rt = new SparseArray<String>();
-        rt.put(R.string.zen_mode_downtime_category, KEY_DOWNTIME);
-        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);
+    private String computeContiguousDayRanges(int[] days) {
+        final TreeSet<Integer> daySet = new TreeSet<>();
+        for (int i = 0; days != null && i < days.length; i++) {
+            daySet.add(days[i]);
+        }
+        if (daySet.isEmpty()) {
+            return getString(R.string.zen_mode_schedule_rule_days_none);
+        }
+        final int N = ALL_DAYS.length;
+        if (daySet.size() == N) {
+            return getString(R.string.zen_mode_schedule_rule_days_all);
+        }
+        String rt = null;
+        for (int i = 0; i < N; i++) {
+            final int startDay = ALL_DAYS[i];
+            final boolean active = daySet.contains(startDay);
+            if (!active) continue;
+            int end = 0;
+            while (daySet.contains(ALL_DAYS[(i + end + 1) % N])) {
+                end++;
+            }
+            if (!(i == 0 && daySet.contains(ALL_DAYS[N - 1]))) {
+                final String v = end == 0 ? dayString(startDay)
+                        : getString(R.string.summary_range_symbol_combination,
+                                dayString(startDay),
+                                dayString(ALL_DAYS[(i + end) % N]));
+                rt = rt == null ? v : getString(R.string.summary_divider_text, rt, v);
+            }
+            i += end;
+        }
         return rt;
     }
 
-    // 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);
-                final int N = keyTitles.size();
-                final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>(N);
-                final Resources res = context.getResources();
-                for (int i = 0; i < N; i++) {
-                    final SearchIndexableRaw data = new SearchIndexableRaw(context);
-                    data.key = keyTitles.valueAt(i);
-                    data.title = res.getString(keyTitles.keyAt(i));
-                    data.screenTitle = res.getString(R.string.zen_mode_automation_settings_title);
-                    result.add(data);
-                }
-                return result;
-            }
-
-            @Override
-            public List<String> getNonIndexableKeys(Context context) {
-                final ArrayList<String> rt = new ArrayList<String>();
-                if (!isDowntimeSupported(context)) {
-                    rt.add(KEY_DOWNTIME);
-                    rt.add(KEY_DAYS);
-                    rt.add(KEY_START_TIME);
-                    rt.add(KEY_END_TIME);
-                    rt.add(KEY_DOWNTIME_MODE);
-                }
-                return rt;
-            }
-        };
-
-    private static class TimePickerPreference extends Preference {
-        private final Context mContext;
-
-        private int mSummaryFormat;
-        private int mHourOfDay;
-        private int mMinute;
-        private Callback mCallback;
-
-        public TimePickerPreference(Context context, final FragmentManager mgr) {
-            super(context);
-            mContext = context;
-            setPersistent(false);
-            setOnPreferenceClickListener(new OnPreferenceClickListener(){
-                @Override
-                public boolean onPreferenceClick(Preference preference) {
-                    final TimePickerFragment frag = new TimePickerFragment();
-                    frag.pref = TimePickerPreference.this;
-                    frag.show(mgr, TimePickerPreference.class.getName());
-                    return true;
-                }
-            });
-        }
-
-        public void setCallback(Callback callback) {
-            mCallback = callback;
-        }
-
-        public void setSummaryFormat(int resId) {
-            mSummaryFormat = resId;
-            updateSummary();
-        }
-
-        public void setTime(int hourOfDay, int minute) {
-            if (mCallback != null && !mCallback.onSetTime(hourOfDay, minute)) return;
-            mHourOfDay = hourOfDay;
-            mMinute = minute;
-            updateSummary();
-        }
-
-        private void updateSummary() {
-            final Calendar c = Calendar.getInstance();
-            c.set(Calendar.HOUR_OF_DAY, mHourOfDay);
-            c.set(Calendar.MINUTE, mMinute);
-            String time = DateFormat.getTimeFormat(mContext).format(c.getTime());
-            if (mSummaryFormat != 0) {
-                time = mContext.getResources().getString(mSummaryFormat, time);
-            }
-            setSummary(time);
-        }
-
-        public static class TimePickerFragment extends DialogFragment implements
-                TimePickerDialog.OnTimeSetListener {
-            public TimePickerPreference pref;
-
-            @Override
-            public Dialog onCreateDialog(Bundle savedInstanceState) {
-                final boolean usePref = pref != null && pref.mHourOfDay >= 0 && pref.mMinute >= 0;
-                final Calendar c = Calendar.getInstance();
-                final int hour = usePref ? pref.mHourOfDay : c.get(Calendar.HOUR_OF_DAY);
-                final int minute = usePref ? pref.mMinute : c.get(Calendar.MINUTE);
-                return new TimePickerDialog(getActivity(), this, hour, minute,
-                        DateFormat.is24HourFormat(getActivity()));
-            }
-
-            public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
-                if (pref != null) {
-                    pref.setTime(hourOfDay, minute);
-                }
-            }
-        }
-
-        public interface Callback {
-            boolean onSetTime(int hour, int minute);
-        }
+    private String dayString(int day) {
+        mCalendar.set(Calendar.DAY_OF_WEEK, day);
+        return DAY_FORMAT.format(mCalendar.getTime());
     }
+
+    private static Config getConditionProviderConfig() {
+        final Config c = new Config();
+        c.tag = TAG;
+        c.setting = Settings.Secure.ENABLED_CONDITION_PROVIDERS;
+        c.intentAction = ConditionProviderService.SERVICE_INTERFACE;
+        c.permission = android.Manifest.permission.BIND_CONDITION_PROVIDER_SERVICE;
+        c.noun = "condition provider";
+        return c;
+    }
+
+    private final ServiceListing.Callback mServiceListingCallback = new ServiceListing.Callback() {
+        @Override
+        public void onServicesReloaded(List<ServiceInfo> services) {
+            for (ServiceInfo service : services) {
+                final RuleInfo ri = ZenModeExternalRuleSettings.getRuleInfo(service);
+                if (ri != null && ri.serviceComponent != null
+                        && ri.settingsAction == ZenModeExternalRuleSettings.ACTION) {
+                    if (!mServiceListing.isEnabled(ri.serviceComponent)) {
+                        Log.i(TAG, "Enabling external condition provider: " + ri.serviceComponent);
+                        mServiceListing.setEnabled(ri.serviceComponent, true);
+                    }
+                }
+            }
+        }
+    };
+
 }
diff --git a/src/com/android/settings/notification/ZenModeConditionSelection.java b/src/com/android/settings/notification/ZenModeConditionSelection.java
index 87f55a3..481bd88 100644
--- a/src/com/android/settings/notification/ZenModeConditionSelection.java
+++ b/src/com/android/settings/notification/ZenModeConditionSelection.java
@@ -27,7 +27,6 @@
 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;
@@ -46,11 +45,14 @@
     private final H mHandler = new H();
     private final Context mContext;
     private final List<Condition> mConditions;
+    private final int mZenMode;
+
     private Condition mCondition;
 
-    public ZenModeConditionSelection(Context context) {
+    public ZenModeConditionSelection(Context context, int zenMode) {
         super(context);
         mContext = context;
+        mZenMode = zenMode;
         mConditions = new ArrayList<Condition>();
         setLayoutTransition(new LayoutTransition());
         final int p = mContext.getResources().getDimensionPixelSize(R.dimen.content_margin_left);
@@ -117,7 +119,7 @@
             }
         }
         if (v != null) {
-            v.setText(!TextUtils.isEmpty(c.line1) ? c.line1 : c.summary);
+            v.setText(ZenModeSettings.computeConditionText(c));
             v.setEnabled(c.state == Condition.STATE_TRUE);
         }
         mConditions.add(c);
@@ -131,7 +133,7 @@
     public void confirmCondition() {
         if (DEBUG) Log.d(TAG, "confirmCondition " + mCondition);
         try {
-            mNoMan.setZenModeCondition(mCondition);
+            mNoMan.setZenMode(mZenMode, mCondition != null ? mCondition.id : null, TAG);
         } catch (RemoteException e) {
             // noop
         }
diff --git a/src/com/android/settings/notification/ZenModeExternalRuleSettings.java b/src/com/android/settings/notification/ZenModeExternalRuleSettings.java
new file mode 100644
index 0000000..9f9dc8a
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeExternalRuleSettings.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.pm.ServiceInfo;
+import android.net.Uri;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+import android.service.notification.ZenModeConfig.ZenRule;
+import android.util.Log;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.R;
+import com.android.settings.notification.ZenRuleNameDialog.RuleInfo;
+
+public class ZenModeExternalRuleSettings extends ZenModeRuleSettingsBase {
+    private static final String KEY_TYPE = "type";
+    private static final String KEY_CONFIGURE = "configure";
+
+    public static final String ACTION = Settings.ACTION_ZEN_MODE_EXTERNAL_RULE_SETTINGS;
+    private static final int REQUEST_CODE_CONFIGURE = 1;
+
+    private static final String MD_RULE_TYPE = "automatic.ruleType";
+    private static final String MD_DEFAULT_CONDITION_ID = "automatic.defaultConditionId";
+    private static final String MD_CONFIGURATION_ACTIVITY = "automatic.configurationActivity";
+    private static final String EXTRA_CONDITION_ID = "automatic.conditionId";
+
+    private Preference mType;
+    private Preference mConfigure;
+
+    @Override
+    protected boolean setRule(ZenRule rule) {
+        return rule != null;
+    }
+
+    @Override
+    protected String getZenModeDependency() {
+        return null;
+    }
+
+    @Override
+    protected void onCreateInternal() {
+        addPreferencesFromResource(R.xml.zen_mode_external_rule_settings);
+        final PreferenceScreen root = getPreferenceScreen();
+        final ServiceInfo si = ServiceListing.findService(mContext,
+                ZenModeAutomationSettings.CONFIG, mRule.component);
+        if (DEBUG) Log.d(TAG, "ServiceInfo: " + si);
+        final RuleInfo ri = getRuleInfo(si);
+        if (DEBUG) Log.d(TAG, "RuleInfo: " + ri);
+        mType = root.findPreference(KEY_TYPE);
+        if (ri == null) {
+            mType.setSummary(R.string.zen_mode_rule_type_unknown);
+        } else {
+            mType.setSummary(ri.caption);
+        }
+
+        mConfigure = root.findPreference(KEY_CONFIGURE);
+        if (ri == null || ri.configurationActivity == null) {
+            mConfigure.setEnabled(false);
+        } else {
+            mConfigure.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+                @Override
+                public boolean onPreferenceClick(Preference preference) {
+                    startActivityForResult(new Intent().setComponent(ri.configurationActivity),
+                            REQUEST_CODE_CONFIGURE);
+                    return true;
+                }
+            });
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == REQUEST_CODE_CONFIGURE) {
+            if (resultCode == Activity.RESULT_OK && data != null) {
+                final Uri conditionId = data.getParcelableExtra(EXTRA_CONDITION_ID);
+                if (conditionId != null && !conditionId.equals(mRule.conditionId)) {
+                    updateRule(conditionId);
+                }
+            }
+        }
+    }
+
+    public static RuleInfo getRuleInfo(ServiceInfo si) {
+        if (si == null || si.metaData == null) return null;
+        final String ruleType = si.metaData.getString(MD_RULE_TYPE);
+        final String defaultConditionId = si.metaData.getString(MD_DEFAULT_CONDITION_ID);
+        final String configurationActivity = si.metaData.getString(MD_CONFIGURATION_ACTIVITY);
+        if (ruleType != null && !ruleType.trim().isEmpty() && defaultConditionId != null) {
+            final RuleInfo ri = new RuleInfo();
+            ri.serviceComponent = new ComponentName(si.packageName, si.name);
+            ri.settingsAction = ZenModeExternalRuleSettings.ACTION;
+            ri.caption = ruleType;
+            ri.defaultConditionId = Uri.parse(defaultConditionId);
+            if (configurationActivity != null) {
+                ri.configurationActivity = ComponentName.unflattenFromString(configurationActivity);
+            }
+            return ri;
+        }
+        return null;
+    }
+
+    @Override
+    protected void updateControlsInternal() {
+        // everything done up front
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NOTIFICATION_ZEN_MODE_EXTERNAL_RULE;
+    }
+
+}
diff --git a/src/com/android/settings/notification/ZenModePrioritySettings.java b/src/com/android/settings/notification/ZenModePrioritySettings.java
index 062c12a..89e9ea3 100644
--- a/src/com/android/settings/notification/ZenModePrioritySettings.java
+++ b/src/com/android/settings/notification/ZenModePrioritySettings.java
@@ -35,6 +35,7 @@
     private static final String KEY_MESSAGES = "messages";
     private static final String KEY_CALLS = "calls";
     private static final String KEY_STARRED = "starred";
+    private static final String KEY_REPEAT_CALLERS = "repeat_callers";
 
     private boolean mDisableListeners;
     private SwitchPreference mReminders;
@@ -42,6 +43,7 @@
     private SwitchPreference mMessages;
     private SwitchPreference mCalls;
     private DropDownPreference mStarred;
+    private SwitchPreference mRepeatCallers;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -123,6 +125,23 @@
             }
         });
 
+        mRepeatCallers = (SwitchPreference) root.findPreference(KEY_REPEAT_CALLERS);
+        mRepeatCallers.setSummary(mContext.getString(R.string.zen_mode_repeat_callers_summary,
+                mContext.getResources().getInteger(com.android.internal.R.integer
+                        .config_zen_repeat_callers_threshold)));
+        mRepeatCallers.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                if (mDisableListeners) return true;
+                final boolean val = (Boolean) newValue;
+                if (val == mConfig.allowRepeatCallers) return true;
+                if (DEBUG) Log.d(TAG, "onPrefChange allowRepeatCallers=" + val);
+                final ZenModeConfig newConfig = mConfig.copy();
+                newConfig.allowRepeatCallers = val;
+                return setZenModeConfig(newConfig);
+            }
+        });
+
         updateControls();
     }
 
@@ -132,16 +151,23 @@
     }
 
     @Override
-    protected void updateControls() {
+    protected void onZenModeConfigChanged() {
+        updateControls();
+    }
+
+    private void updateControls() {
         mDisableListeners = true;
         if (mCalls != null) {
             mCalls.setChecked(mConfig.allowCalls);
         }
         mMessages.setChecked(mConfig.allowMessages);
         mStarred.setSelectedValue(mConfig.allowFrom);
+        mStarred.setEnabled(mConfig.allowCalls || mConfig.allowMessages);
         mReminders.setChecked(mConfig.allowReminders);
         mEvents.setChecked(mConfig.allowEvents);
-        updateStarredEnabled();
+        mRepeatCallers.setChecked(mConfig.allowRepeatCallers);
+        mRepeatCallers.setEnabled(!mConfig.allowCalls
+                || mConfig.allowFrom != ZenModeConfig.SOURCE_ANYONE);
         mDisableListeners = false;
     }
 
@@ -150,8 +176,4 @@
         return MetricsLogger.NOTIFICATION_ZEN_MODE_PRIORITY;
     }
 
-    private void updateStarredEnabled() {
-        mStarred.setEnabled(mConfig.allowCalls || mConfig.allowMessages);
-    }
-
 }
diff --git a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java
new file mode 100644
index 0000000..f6bc75f
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java
@@ -0,0 +1,256 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceScreen;
+import android.provider.Settings.Global;
+import android.service.notification.ZenModeConfig;
+import android.service.notification.ZenModeConfig.ZenRule;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.widget.Switch;
+import android.widget.Toast;
+
+import com.android.settings.DropDownPreference;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.widget.SwitchBar;
+
+public abstract class ZenModeRuleSettingsBase extends ZenModeSettingsBase
+        implements SwitchBar.OnSwitchChangeListener {
+    protected static final String TAG = ZenModeSettingsBase.TAG;
+    protected static final boolean DEBUG = ZenModeSettingsBase.DEBUG;
+
+    public static final String EXTRA_RULE_ID = "rule_id";
+    private static final String KEY_RULE_NAME = "rule_name";
+    private static final String KEY_ZEN_MODE = "zen_mode";
+
+    protected Context mContext;
+    protected boolean mDisableListeners;
+    protected ZenRule mRule;
+
+    private String mRuleId;
+    private boolean mDeleting;
+    private Preference mRuleName;
+    private SwitchBar mSwitchBar;
+    private DropDownPreference mZenMode;
+
+    abstract protected void onCreateInternal();
+    abstract protected boolean setRule(ZenRule rule);
+    abstract protected String getZenModeDependency();
+    abstract protected void updateControlsInternal();
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mContext = getActivity();
+
+        final Intent intent = getActivity().getIntent();
+        if (DEBUG) Log.d(TAG, "onCreate getIntent()=" + intent);
+        if (intent == null) {
+            Log.w(TAG, "No intent");
+            toastAndFinish();
+            return;
+        }
+
+        mRuleId = intent.getStringExtra(EXTRA_RULE_ID);
+        if (DEBUG) Log.d(TAG, "mRuleId=" + mRuleId);
+        if (refreshRuleOrFinish()) {
+            return;
+        }
+
+        setHasOptionsMenu(true);
+
+        onCreateInternal();
+
+        final PreferenceScreen root = getPreferenceScreen();
+        mRuleName = root.findPreference(KEY_RULE_NAME);
+        mRuleName.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                showRuleNameDialog();
+                return true;
+            }
+        });
+
+        mZenMode = (DropDownPreference) root.findPreference(KEY_ZEN_MODE);
+        mZenMode.addItem(R.string.zen_mode_option_important_interruptions,
+                Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+        mZenMode.addItem(R.string.zen_mode_option_alarms, Global.ZEN_MODE_ALARMS);
+        mZenMode.addItem(R.string.zen_mode_option_no_interruptions,
+                Global.ZEN_MODE_NO_INTERRUPTIONS);
+        mZenMode.setCallback(new DropDownPreference.Callback() {
+            @Override
+            public boolean onItemSelected(int pos, Object value) {
+                if (mDisableListeners) return true;
+                final int zenMode = (Integer) value;
+                if (zenMode == mRule.zenMode) return true;
+                if (DEBUG) Log.d(TAG, "onPrefChange zenMode=" + zenMode);
+                mRule.zenMode = zenMode;
+                setZenModeConfig(mConfig);
+                return true;
+            }
+        });
+        mZenMode.setOrder(10);  // sort at the bottom of the category
+        mZenMode.setDependency(getZenModeDependency());
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateControls();
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        final SettingsActivity activity = (SettingsActivity) getActivity();
+        mSwitchBar = activity.getSwitchBar();
+        mSwitchBar.addOnSwitchChangeListener(this);
+        mSwitchBar.show();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        mSwitchBar.removeOnSwitchChangeListener(this);
+        mSwitchBar.hide();
+    }
+
+    @Override
+    public void onSwitchChanged(Switch switchView, boolean isChecked) {
+        if (DEBUG) Log.d(TAG, "onSwitchChanged " + isChecked);
+        if (mDisableListeners) return;
+        final boolean enabled = isChecked;
+        if (enabled == mRule.enabled) return;
+        if (DEBUG) Log.d(TAG, "onSwitchChanged enabled=" + enabled);
+        mRule.enabled = enabled;
+        mRule.snoozing = false;
+        setZenModeConfig(mConfig);
+    }
+
+    protected void updateRule(Uri newConditionId) {
+        mRule.conditionId = newConditionId;
+        mRule.condition = null;
+        mRule.snoozing = false;
+        setZenModeConfig(mConfig);
+    }
+
+    @Override
+    protected void onZenModeChanged() {
+        // noop
+    }
+
+    @Override
+    protected void onZenModeConfigChanged() {
+        if (!refreshRuleOrFinish()) {
+            updateControls();
+        }
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        if (DEBUG) Log.d(TAG, "onCreateOptionsMenu");
+        inflater.inflate(R.menu.zen_mode_rule, menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (DEBUG) Log.d(TAG, "onOptionsItemSelected " + item.getItemId());
+        if (item.getItemId() == R.id.delete) {
+            showDeleteRuleDialog();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void showRuleNameDialog() {
+        new ZenRuleNameDialog(mContext, null, mRule.name, mConfig.getAutomaticRuleNames()) {
+            @Override
+            public void onOk(String ruleName, RuleInfo type) {
+                final ZenModeConfig newConfig = mConfig.copy();
+                final ZenRule rule = newConfig.automaticRules.get(mRuleId);
+                if (rule == null) return;
+                rule.name = ruleName;
+                setZenModeConfig(newConfig);
+            }
+        }.show();
+    }
+
+    private boolean refreshRuleOrFinish() {
+        mRule = mConfig.automaticRules.get(mRuleId);
+        if (DEBUG) Log.d(TAG, "mRule=" + mRule);
+        if (!setRule(mRule)) {
+            toastAndFinish();
+            return true;
+        }
+        return false;
+    }
+
+    private void showDeleteRuleDialog() {
+        new AlertDialog.Builder(mContext)
+                .setMessage(getString(R.string.zen_mode_delete_rule_confirmation, mRule.name))
+                .setNegativeButton(R.string.cancel, null)
+                .setPositiveButton(R.string.zen_mode_delete_rule_button, new OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        mDeleting = true;
+                        mConfig.automaticRules.remove(mRuleId);
+                        setZenModeConfig(mConfig);
+                    }
+                })
+                .show();
+    }
+
+    private void toastAndFinish() {
+        if (!mDeleting) {
+            Toast.makeText(mContext, R.string.zen_mode_rule_not_found_text, Toast.LENGTH_SHORT)
+                    .show();
+        }
+        getActivity().finish();
+    }
+
+    private void updateRuleName() {
+        getActivity().setTitle(mRule.name);
+        mRuleName.setSummary(mRule.name);
+    }
+
+    private void updateControls() {
+        mDisableListeners = true;
+        updateRuleName();
+        updateControlsInternal();
+        mZenMode.setSelectedValue(mRule.zenMode);
+        mDisableListeners = false;
+        if (mSwitchBar != null) {
+            mSwitchBar.setChecked(mRule.enabled);
+        }
+    }
+
+}
diff --git a/src/com/android/settings/notification/ZenModeDowntimeDaysSelection.java b/src/com/android/settings/notification/ZenModeScheduleDaysSelection.java
similarity index 73%
rename from src/com/android/settings/notification/ZenModeDowntimeDaysSelection.java
rename to src/com/android/settings/notification/ZenModeScheduleDaysSelection.java
index 3361ad0..6d11ffb 100644
--- a/src/com/android/settings/notification/ZenModeDowntimeDaysSelection.java
+++ b/src/com/android/settings/notification/ZenModeScheduleDaysSelection.java
@@ -17,37 +17,42 @@
 package com.android.settings.notification;
 
 import android.content.Context;
-import android.service.notification.ZenModeConfig;
 import android.util.SparseBooleanArray;
 import android.view.LayoutInflater;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
-import android.widget.ScrollView;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.LinearLayout;
+import android.widget.ScrollView;
 
 import com.android.settings.R;
 
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Calendar;
 
-public class ZenModeDowntimeDaysSelection extends ScrollView {
+public class ZenModeScheduleDaysSelection extends ScrollView {
     public static final int[] DAYS = {
-        Calendar.MONDAY, Calendar.TUESDAY, Calendar.WEDNESDAY, Calendar.THURSDAY, Calendar.FRIDAY,
-        Calendar.SATURDAY, Calendar.SUNDAY
+        Calendar.SUNDAY,
+        Calendar.MONDAY,
+        Calendar.TUESDAY,
+        Calendar.WEDNESDAY,
+        Calendar.THURSDAY,
+        Calendar.FRIDAY,
+        Calendar.SATURDAY,
     };
     private static final SimpleDateFormat DAY_FORMAT = new SimpleDateFormat("EEEE");
 
     private final SparseBooleanArray mDays = new SparseBooleanArray();
     private final LinearLayout mLayout;
 
-    public ZenModeDowntimeDaysSelection(Context context, String mode) {
+    public ZenModeScheduleDaysSelection(Context context, int[] days) {
         super(context);
         mLayout = new LinearLayout(mContext);
-        final int hPad = context.getResources().getDimensionPixelSize(R.dimen.zen_downtime_margin);
+        final int hPad = context.getResources()
+                .getDimensionPixelSize(R.dimen.zen_schedule_day_margin);
         mLayout.setPadding(hPad, 0, hPad, 0);
         addView(mLayout);
-        final int[] days = ZenModeConfig.tryParseDays(mode);
         if (days != null) {
             for (int i = 0; i < days.length; i++) {
                 mDays.put(days[i], true);
@@ -58,7 +63,7 @@
         final LayoutInflater inflater = LayoutInflater.from(context);
         for (int i = 0; i < DAYS.length; i++) {
             final int day = DAYS[i];
-            final CheckBox checkBox = (CheckBox) inflater.inflate(R.layout.zen_downtime_day,
+            final CheckBox checkBox = (CheckBox) inflater.inflate(R.layout.zen_schedule_rule_day,
                     this, false);
             c.set(Calendar.DAY_OF_WEEK, day);
             checkBox.setText(DAY_FORMAT.format(c.getTime()));
@@ -67,30 +72,29 @@
                 @Override
                 public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                     mDays.put(day, isChecked);
-                    onChanged(getMode());
+                    onChanged(getDays());
                 }
             });
             mLayout.addView(checkBox);
         }
     }
 
-    private String getMode() {
-        final StringBuilder sb = new StringBuilder(ZenModeConfig.SLEEP_MODE_DAYS_PREFIX);
-        boolean empty = true;
+    private int[] getDays() {
+        final SparseBooleanArray rt = new SparseBooleanArray(mDays.size());
         for (int i = 0; i < mDays.size(); i++) {
             final int day = mDays.keyAt(i);
             if (!mDays.valueAt(i)) continue;
-            if (empty) {
-                empty = false;
-            } else {
-                sb.append(',');
-            }
-            sb.append(day);
+            rt.put(day, true);
         }
-        return empty ? null : sb.toString();
+        final int[] rta = new int[rt.size()];
+        for (int i = 0; i < rta.length; i++) {
+            rta[i] = rt.keyAt(i);
+        }
+        Arrays.sort(rta);
+        return rta;
     }
 
-    protected void onChanged(String mode) {
+    protected void onChanged(int[] days) {
         // event hook for subclasses
     }
 }
diff --git a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
new file mode 100644
index 0000000..f7015d3
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
@@ -0,0 +1,285 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import static com.android.settings.notification.ZenModeScheduleDaysSelection.DAYS;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.FragmentManager;
+import android.app.TimePickerDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnDismissListener;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+import android.service.notification.ZenModeConfig;
+import android.service.notification.ZenModeConfig.ScheduleInfo;
+import android.service.notification.ZenModeConfig.ZenRule;
+import android.text.format.DateFormat;
+import android.util.Log;
+import android.widget.TimePicker;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.R;
+
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Calendar;
+
+public class ZenModeScheduleRuleSettings extends ZenModeRuleSettingsBase {
+    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 SimpleDateFormat DAY_FORMAT = new SimpleDateFormat("EEE");
+
+    public static final String ACTION = Settings.ACTION_ZEN_MODE_SCHEDULE_RULE_SETTINGS;
+
+    private Preference mDays;
+    private TimePickerPreference mStart;
+    private TimePickerPreference mEnd;
+
+    private ScheduleInfo mSchedule;
+
+    @Override
+    protected boolean setRule(ZenRule rule) {
+        mSchedule = rule != null ? ZenModeConfig.tryParseScheduleConditionId(rule.conditionId)
+                : null;
+        return mSchedule != null;
+    }
+
+    @Override
+    protected String getZenModeDependency() {
+        return mDays.getKey();
+    }
+
+    @Override
+    protected void onCreateInternal() {
+        addPreferencesFromResource(R.xml.zen_mode_schedule_rule_settings);
+        final PreferenceScreen root = getPreferenceScreen();
+
+        mDays = root.findPreference(KEY_DAYS);
+        mDays.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                showDaysDialog();
+                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(final int hour, final int minute) {
+                if (mDisableListeners) return true;
+                if (!ZenModeConfig.isValidHour(hour)) return false;
+                if (!ZenModeConfig.isValidMinute(minute)) return false;
+                if (hour == mSchedule.startHour && minute == mSchedule.startMinute) {
+                    return true;
+                }
+                if (DEBUG) Log.d(TAG, "onPrefChange start h=" + hour + " m=" + minute);
+                mSchedule.startHour = hour;
+                mSchedule.startMinute = minute;
+                updateRule(ZenModeConfig.toScheduleConditionId(mSchedule));
+                return true;
+            }
+        });
+        root.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(final int hour, final int minute) {
+                if (mDisableListeners) return true;
+                if (!ZenModeConfig.isValidHour(hour)) return false;
+                if (!ZenModeConfig.isValidMinute(minute)) return false;
+                if (hour == mSchedule.endHour && minute == mSchedule.endMinute) {
+                    return true;
+                }
+                if (DEBUG) Log.d(TAG, "onPrefChange end h=" + hour + " m=" + minute);
+                mSchedule.endHour = hour;
+                mSchedule.endMinute = minute;
+                updateRule(ZenModeConfig.toScheduleConditionId(mSchedule));
+                return true;
+            }
+        });
+        root.addPreference(mEnd);
+        mEnd.setDependency(mDays.getKey());
+    }
+
+    private void updateDays() {
+        // Compute an ordered, delimited list of day names based on the persisted user config.
+        final int[] days = mSchedule.days;
+        if (days != null && days.length > 0) {
+            final StringBuilder sb = new StringBuilder();
+            final Calendar c = Calendar.getInstance();
+            for (int i = 0; i < DAYS.length; i++) {
+                final int day = DAYS[i];
+                for (int j = 0; j < days.length; j++) {
+                    if (day == days[j]) {
+                        c.set(Calendar.DAY_OF_WEEK, day);
+                        if (sb.length() > 0) {
+                            sb.append(mContext.getString(R.string.summary_divider_text));
+                        }
+                        sb.append(DAY_FORMAT.format(c.getTime()));
+                        break;
+                    }
+                }
+            }
+            if (sb.length() > 0) {
+                mDays.setSummary(sb);
+                mDays.notifyDependencyChange(false);
+                return;
+            }
+        }
+        mDays.setSummary(R.string.zen_mode_schedule_rule_days_none);
+        mDays.notifyDependencyChange(true);
+    }
+
+    private void updateEndSummary() {
+        final int startMin = 60 * mSchedule.startHour + mSchedule.startMinute;
+        final int endMin = 60 * mSchedule.endHour + mSchedule.endMinute;
+        final boolean nextDay = startMin >= endMin;
+        final int summaryFormat = nextDay ? R.string.zen_mode_end_time_next_day_summary_format : 0;
+        mEnd.setSummaryFormat(summaryFormat);
+    }
+
+    @Override
+    protected void updateControlsInternal() {
+        updateDays();
+        mStart.setTime(mSchedule.startHour, mSchedule.startMinute);
+        mEnd.setTime(mSchedule.endHour, mSchedule.endMinute);
+        updateEndSummary();
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NOTIFICATION_ZEN_MODE_SCHEDULE_RULE;
+    }
+
+    private void showDaysDialog() {
+        new AlertDialog.Builder(mContext)
+                .setTitle(R.string.zen_mode_schedule_rule_days)
+                .setView(new ZenModeScheduleDaysSelection(mContext, mSchedule.days) {
+                      @Override
+                      protected void onChanged(final int[] days) {
+                          if (mDisableListeners) return;
+                          if (Arrays.equals(days, mSchedule.days)) return;
+                          if (DEBUG) Log.d(TAG, "days.onChanged days=" + Arrays.asList(days));
+                          mSchedule.days = days;
+                          updateRule(ZenModeConfig.toScheduleConditionId(mSchedule));
+                      }
+                })
+                .setOnDismissListener(new OnDismissListener() {
+                    @Override
+                    public void onDismiss(DialogInterface dialog) {
+                        updateDays();
+                    }
+                })
+                .setPositiveButton(R.string.done_button, null)
+                .show();
+    }
+
+    private static class TimePickerPreference extends Preference {
+        private final Context mContext;
+
+        private int mSummaryFormat;
+        private int mHourOfDay;
+        private int mMinute;
+        private Callback mCallback;
+
+        public TimePickerPreference(Context context, final FragmentManager mgr) {
+            super(context);
+            mContext = context;
+            setPersistent(false);
+            setOnPreferenceClickListener(new OnPreferenceClickListener(){
+                @Override
+                public boolean onPreferenceClick(Preference preference) {
+                    final TimePickerFragment frag = new TimePickerFragment();
+                    frag.pref = TimePickerPreference.this;
+                    frag.show(mgr, TimePickerPreference.class.getName());
+                    return true;
+                }
+            });
+        }
+
+        public void setCallback(Callback callback) {
+            mCallback = callback;
+        }
+
+        public void setSummaryFormat(int resId) {
+            mSummaryFormat = resId;
+            updateSummary();
+        }
+
+        public void setTime(int hourOfDay, int minute) {
+            if (mCallback != null && !mCallback.onSetTime(hourOfDay, minute)) return;
+            mHourOfDay = hourOfDay;
+            mMinute = minute;
+            updateSummary();
+        }
+
+        private void updateSummary() {
+            final Calendar c = Calendar.getInstance();
+            c.set(Calendar.HOUR_OF_DAY, mHourOfDay);
+            c.set(Calendar.MINUTE, mMinute);
+            String time = DateFormat.getTimeFormat(mContext).format(c.getTime());
+            if (mSummaryFormat != 0) {
+                time = mContext.getResources().getString(mSummaryFormat, time);
+            }
+            setSummary(time);
+        }
+
+        public static class TimePickerFragment extends DialogFragment implements
+                TimePickerDialog.OnTimeSetListener {
+            public TimePickerPreference pref;
+
+            @Override
+            public Dialog onCreateDialog(Bundle savedInstanceState) {
+                final boolean usePref = pref != null && pref.mHourOfDay >= 0 && pref.mMinute >= 0;
+                final Calendar c = Calendar.getInstance();
+                final int hour = usePref ? pref.mHourOfDay : c.get(Calendar.HOUR_OF_DAY);
+                final int minute = usePref ? pref.mMinute : c.get(Calendar.MINUTE);
+                return new TimePickerDialog(getActivity(), this, hour, minute,
+                        DateFormat.is24HourFormat(getActivity()));
+            }
+
+            public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
+                if (pref != null) {
+                    pref.setTime(hourOfDay, minute);
+                }
+            }
+        }
+
+        public interface Callback {
+            boolean onSetTime(int hour, int minute);
+        }
+    }
+
+}
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index 47d1f5d..34abf59 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -21,54 +21,94 @@
 import android.content.DialogInterface;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.os.UserHandle;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
 import android.provider.Settings.Global;
+import android.service.notification.Condition;
+import android.service.notification.ZenModeConfig;
+import android.text.TextUtils;
+import android.util.Log;
 import android.util.SparseArray;
 import android.widget.ScrollView;
+import android.widget.Switch;
 
 import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.SettingsActivity;
 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;
 
-public class ZenModeSettings extends ZenModeSettingsBase implements Indexable {
-    private static final String KEY_ZEN_MODE = "zen_mode";
+public class ZenModeSettings extends ZenModeSettingsBase
+        implements Indexable, SwitchBar.OnSwitchChangeListener {
     private static final String KEY_PRIORITY_SETTINGS = "priority_settings";
     private static final String KEY_AUTOMATION_SETTINGS = "automation_settings";
 
-    private static final SettingPrefWithCallback PREF_ZEN_MODE = new SettingPrefWithCallback(
-            SettingPref.TYPE_GLOBAL, KEY_ZEN_MODE, Global.ZEN_MODE, Global.ZEN_MODE_OFF,
-            Global.ZEN_MODE_OFF, Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, Global.ZEN_MODE_ALARMS,
-            Global.ZEN_MODE_NO_INTERRUPTIONS) {
-        protected String getCaption(Resources res, int value) {
-            switch (value) {
-                case Global.ZEN_MODE_NO_INTERRUPTIONS:
-                    return res.getString(R.string.zen_mode_option_no_interruptions);
-                case Global.ZEN_MODE_ALARMS:
-                    return res.getString(R.string.zen_mode_option_alarms);
-                case Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS:
-                    return res.getString(R.string.zen_mode_option_important_interruptions);
-                default:
-                    return res.getString(R.string.zen_mode_option_off);
-            }
-        }
-    };
-
     private Preference mPrioritySettings;
     private AlertDialog mDialog;
+    private SwitchBar mSwitchBar;
+    private boolean mShowing;
+    private boolean mUpdatingControls;
 
-    private static SparseArray<String> allKeyTitles(Context context) {
-        final SparseArray<String> rt = new SparseArray<String>();
-        rt.put(R.string.zen_mode_option_title, KEY_ZEN_MODE);
-        rt.put(R.string.zen_mode_priority_settings_title, KEY_PRIORITY_SETTINGS);
-        rt.put(R.string.zen_mode_automation_settings_title, KEY_AUTOMATION_SETTINGS);
-        return rt;
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        addPreferencesFromResource(R.xml.zen_mode_settings);
+        final PreferenceScreen root = getPreferenceScreen();
+
+        mPrioritySettings = root.findPreference(KEY_PRIORITY_SETTINGS);
+        if (!isScheduleSupported(mContext)) {
+            removePreference(KEY_AUTOMATION_SETTINGS);
+        }
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        final SettingsActivity activity = (SettingsActivity) getActivity();
+        mSwitchBar = activity.getSwitchBar();
+        mSwitchBar.addOnSwitchChangeListener(this);
+        mSwitchBar.show();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        mSwitchBar.removeOnSwitchChangeListener(this);
+        mSwitchBar.hide();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateControls();
+        mShowing = true;
+    }
+
+    @Override
+    public void onPause() {
+        mShowing = false;
+        super.onPause();
+    }
+
+    @Override
+    public void onSwitchChanged(Switch switchView, boolean isChecked) {
+        if (DEBUG) Log.d(TAG, "onSwitchChanged " + isChecked + " mShowing=" + mShowing
+                + " mUpdatingControls=" + mUpdatingControls);
+        if (!mShowing || mUpdatingControls) return; // not from the user
+        if (isChecked) {
+            setZenMode(Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, null);
+            showConditionSelection(Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+        } else {
+            setZenMode(Global.ZEN_MODE_OFF, null);
+        }
     }
 
     @Override
@@ -78,44 +118,52 @@
 
     @Override
     protected void onZenModeChanged() {
-        PREF_ZEN_MODE.update(mContext);
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        addPreferencesFromResource(R.xml.zen_mode_settings);
-        final PreferenceScreen root = getPreferenceScreen();
-
-        PREF_ZEN_MODE.init(this);
-        PREF_ZEN_MODE.setCallback(new SettingPrefWithCallback.Callback() {
-            @Override
-            public void onSettingSelected(int value) {
-                if (value != Global.ZEN_MODE_OFF) {
-                    showConditionSelection(value);
-                }
-            }
-        });
-
-        mPrioritySettings = root.findPreference(KEY_PRIORITY_SETTINGS);
-        if (!isDowntimeSupported(mContext)) {
-            removePreference(KEY_AUTOMATION_SETTINGS);
-        }
-
         updateControls();
     }
 
     @Override
-    protected void updateControls() {
+    protected void onZenModeConfigChanged() {
+        updateControls();
+    }
+
+    public static String computeZenModeCaption(Resources res, int zenMode) {
+        switch (zenMode) {
+            case Global.ZEN_MODE_ALARMS:
+                return res.getString(R.string.zen_mode_option_alarms);
+            case Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS:
+                return res.getString(R.string.zen_mode_option_important_interruptions);
+            case Global.ZEN_MODE_NO_INTERRUPTIONS:
+                return res.getString(R.string.zen_mode_option_no_interruptions);
+            default:
+                return null;
+        }
+    }
+
+    private String computeZenModeSummaryLine() {
+        final String caption = computeZenModeCaption(getResources(), mZenMode);
+        if (caption == null) return null;  // zen mode off
+        final String conditionText = ZenModeConfig.getConditionLine1(mContext, mConfig,
+                UserHandle.myUserId());
+        return getString(R.string.zen_mode_summary_combination, caption, conditionText);
+    }
+
+    private void updateControls() {
+        if (mSwitchBar != null) {
+            final String summaryLine = computeZenModeSummaryLine();
+            mUpdatingControls = true;
+            mSwitchBar.setChecked(summaryLine != null);
+            mUpdatingControls = false;
+            mSwitchBar.setSummary(summaryLine);
+        }
         updatePrioritySettingsSummary();
     }
 
     private void updatePrioritySettingsSummary() {
+        final boolean callers = mConfig.allowCalls || mConfig.allowRepeatCallers;
         String s = getResources().getString(R.string.zen_mode_alarms);
         s = appendLowercase(s, mConfig.allowReminders, R.string.zen_mode_reminders);
         s = appendLowercase(s, mConfig.allowEvents, R.string.zen_mode_events);
-        s = appendLowercase(s, mConfig.allowCalls, R.string.zen_mode_calls);
+        s = appendLowercase(s, callers, R.string.zen_mode_selected_callers);
         s = appendLowercase(s, mConfig.allowMessages, R.string.zen_mode_messages);
         mPrioritySettings.setSummary(s);
     }
@@ -128,11 +176,11 @@
         return s;
     }
 
-    protected void showConditionSelection(final int newSettingsValue) {
+    protected void showConditionSelection(final int zenMode) {
         if (mDialog != null) return;
 
         final ZenModeConditionSelection zenModeConditionSelection =
-                new ZenModeConditionSelection(mContext);
+                new ZenModeConditionSelection(mContext, zenMode);
         DialogInterface.OnClickListener positiveListener = new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
@@ -140,34 +188,52 @@
                 mDialog = null;
             }
         };
-        final int oldSettingsValue = PREF_ZEN_MODE.getValue(mContext);
         ScrollView scrollView = new ScrollView(mContext);
         scrollView.addView(zenModeConditionSelection);
         mDialog = new AlertDialog.Builder(getActivity())
-                .setTitle(PREF_ZEN_MODE.getCaption(getResources(), newSettingsValue))
+                .setTitle(computeZenModeCaption(getResources(), zenMode))
                 .setView(scrollView)
                 .setPositiveButton(R.string.okay, positiveListener)
-                .setNegativeButton(R.string.cancel_all_caps, new DialogInterface.OnClickListener() {
+                .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        cancelDialog(oldSettingsValue);
+                        cancelDialog();
                     }
                 })
                 .setOnCancelListener(new DialogInterface.OnCancelListener() {
                     @Override
                     public void onCancel(DialogInterface dialog) {
-                        cancelDialog(oldSettingsValue);
+                        cancelDialog();
                     }
                 }).create();
         mDialog.show();
     }
 
-    protected void cancelDialog(int oldSettingsValue) {
-        // If not making a decision, reset drop down to current setting.
-        PREF_ZEN_MODE.setValueWithoutCallback(mContext, oldSettingsValue);
+    private void cancelDialog() {
+        if (DEBUG) Log.d(TAG, "cancelDialog");
+        // If not making a decision, reset zen to off.
+        setZenMode(Global.ZEN_MODE_OFF, null);
         mDialog = null;
     }
 
+    public static String computeConditionText(Condition c) {
+        return !TextUtils.isEmpty(c.line1) ? c.line1
+                : !TextUtils.isEmpty(c.summary) ? c.summary
+                : "";
+    }
+
+    private static SparseArray<String> allKeyTitles(Context context) {
+        final SparseArray<String> rt = new SparseArray<String>();
+        rt.put(R.string.zen_mode_priority_settings_title, KEY_PRIORITY_SETTINGS);
+        rt.put(R.string.zen_mode_automation_settings_title, KEY_AUTOMATION_SETTINGS);
+        return rt;
+    }
+
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_uri_interruptions;
+    }
+
     // Enable indexing of searchable data
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
         new BaseSearchIndexProvider() {
@@ -191,64 +257,10 @@
             @Override
             public List<String> getNonIndexableKeys(Context context) {
                 final ArrayList<String> rt = new ArrayList<String>();
-                if (!isDowntimeSupported(context)) {
+                if (!isScheduleSupported(context)) {
                     rt.add(KEY_AUTOMATION_SETTINGS);
                 }
                 return rt;
             }
         };
-
-    private static class SettingPrefWithCallback extends SettingPref {
-
-        private Callback mCallback;
-        private int mValue;
-
-        public SettingPrefWithCallback(int type, String key, String setting, int def,
-                int... values) {
-            super(type, key, setting, def, values);
-        }
-
-        public void setCallback(Callback callback) {
-            mCallback = callback;
-        }
-
-        @Override
-        public void update(Context context) {
-            // Avoid callbacks from non-user changes.
-            mValue = getValue(context);
-            super.update(context);
-        }
-
-        @Override
-        protected boolean setSetting(Context context, int value) {
-            if (value == mValue) return true;
-            mValue = value;
-            if (mCallback != null) {
-                mCallback.onSettingSelected(value);
-            }
-            return super.setSetting(context, value);
-        }
-
-        @Override
-        public Preference init(SettingsPreferenceFragment settings) {
-            Preference ret = super.init(settings);
-            mValue = getValue(settings.getActivity());
-
-            return ret;
-        }
-
-        public boolean setValueWithoutCallback(Context context, int value) {
-            // Set the current value ahead of time, this way we won't trigger a callback.
-            mValue = value;
-            return putInt(mType, context.getContentResolver(), mSetting, value);
-        }
-
-        public int getValue(Context context) {
-            return getInt(mType, context.getContentResolver(), mSetting, mDefault);
-        }
-
-        public interface Callback {
-            void onSettingSelected(int value);
-        }
-    }
 }
diff --git a/src/com/android/settings/notification/ZenModeSettingsBase.java b/src/com/android/settings/notification/ZenModeSettingsBase.java
index ec17d86..9824dc7 100644
--- a/src/com/android/settings/notification/ZenModeSettingsBase.java
+++ b/src/com/android/settings/notification/ZenModeSettingsBase.java
@@ -16,14 +16,13 @@
 
 package com.android.settings.notification;
 
-import android.app.INotificationManager;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.database.ContentObserver;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.ServiceManager;
+import android.provider.Settings;
 import android.provider.Settings.Global;
 import android.service.notification.ZenModeConfig;
 import android.util.Log;
@@ -41,23 +40,25 @@
 
     protected Context mContext;
     protected ZenModeConfig mConfig;
+    protected int mZenMode;
 
     abstract protected void onZenModeChanged();
-    abstract protected void updateControls();
+    abstract protected void onZenModeConfigChanged();
 
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         mContext = getActivity();
-        mConfig = getZenModeConfig();
+        updateZenMode(false /*fireChanged*/);
+        updateZenModeConfig(false /*fireChanged*/);
         if (DEBUG) Log.d(TAG, "Loaded mConfig=" + mConfig);
     }
 
     @Override
     public void onResume() {
         super.onResume();
-        mConfig = getZenModeConfig();
-        updateControls();
+        updateZenMode(true /*fireChanged*/);
+        updateZenModeConfig(true /*fireChanged*/);
         mSettingsObserver.register();
     }
 
@@ -67,45 +68,48 @@
         mSettingsObserver.unregister();
     }
 
-    protected boolean setZenModeConfig(ZenModeConfig config) {
-        final INotificationManager nm = INotificationManager.Stub.asInterface(
-                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
-        try {
-            final boolean success = nm.setZenModeConfig(config);
-            if (success) {
-                mConfig = config;
-                if (DEBUG) Log.d(TAG, "Saved mConfig=" + mConfig);
-                updateControls();
-            }
-            return success;
-        } catch (Exception e) {
-           Log.w(TAG, "Error calling NoMan", e);
-           return false;
+    private void updateZenMode(boolean fireChanged) {
+        final int zenMode = Settings.Global.getInt(getContentResolver(), Global.ZEN_MODE, mZenMode);
+        if (zenMode == mZenMode) return;
+        mZenMode = zenMode;
+        if (DEBUG) Log.d(TAG, "updateZenMode mZenMode=" + mZenMode);
+        if (fireChanged) {
+            onZenModeChanged();
         }
     }
 
-    protected static boolean isDowntimeSupported(Context context) {
-        return NotificationManager.from(context)
-                .isSystemConditionProviderEnabled(ZenModeConfig.DOWNTIME_PATH);
-    }
-
-    private void updateZenModeConfig() {
+    private void updateZenModeConfig(boolean fireChanged) {
         final ZenModeConfig config = getZenModeConfig();
         if (Objects.equals(config, mConfig)) return;
         mConfig = config;
         if (DEBUG) Log.d(TAG, "updateZenModeConfig mConfig=" + mConfig);
-        updateControls();
+        if (fireChanged) {
+            onZenModeConfigChanged();
+        }
+    }
+
+    protected boolean setZenModeConfig(ZenModeConfig config) {
+        final String reason = getClass().getSimpleName();
+        final boolean success = NotificationManager.from(mContext).setZenModeConfig(config, reason);
+        if (success) {
+            mConfig = config;
+            if (DEBUG) Log.d(TAG, "Saved mConfig=" + mConfig);
+            onZenModeConfigChanged();
+        }
+        return success;
+    }
+
+    protected void setZenMode(int zenMode, Uri conditionId) {
+        NotificationManager.from(mContext).setZenMode(zenMode, conditionId, TAG);
+    }
+
+    protected static boolean isScheduleSupported(Context context) {
+        return NotificationManager.from(context)
+                .isSystemConditionProviderEnabled(ZenModeConfig.SCHEDULE_PATH);
     }
 
     private ZenModeConfig getZenModeConfig() {
-        final INotificationManager nm = INotificationManager.Stub.asInterface(
-                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
-        try {
-            return nm.getZenModeConfig();
-        } catch (Exception e) {
-           Log.w(TAG, "Error calling NoMan", e);
-           return new ZenModeConfig();
-        }
+        return NotificationManager.from(mContext).getZenModeConfig();
     }
 
     private final class SettingsObserver extends ContentObserver {
@@ -129,10 +133,10 @@
         public void onChange(boolean selfChange, Uri uri) {
             super.onChange(selfChange, uri);
             if (ZEN_MODE_URI.equals(uri)) {
-                onZenModeChanged();
+                updateZenMode(true /*fireChanged*/);
             }
             if (ZEN_MODE_CONFIG_ETAG_URI.equals(uri)) {
-                updateZenModeConfig();
+                updateZenModeConfig(true /*fireChanged*/);
             }
         }
     }
diff --git a/src/com/android/settings/notification/ZenModeVoiceActivity.java b/src/com/android/settings/notification/ZenModeVoiceActivity.java
new file mode 100644
index 0000000..2994ed1
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeVoiceActivity.java
@@ -0,0 +1,240 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import static android.provider.Settings.EXTRA_DO_NOT_DISTURB_MODE_MINUTES;
+import static android.provider.Settings.EXTRA_DO_NOT_DISTURB_MODE_ENABLED;
+
+import com.android.settings.R;
+import com.android.settings.utils.VoiceSelectionAdapter;
+import com.android.settings.utils.VoiceSelection;
+import com.android.settings.utils.VoiceSelectionFragment;
+import com.android.settings.utils.VoiceSettingsActivity;
+
+import android.app.Fragment;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.UserHandle;
+import android.provider.Settings.Global;
+import android.service.notification.Condition;
+import android.service.notification.ZenModeConfig;
+import android.text.format.DateFormat;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * Activity for modifying the Zen mode (Do not disturb) by voice
+ * using the Voice Interaction API.
+ */
+public class ZenModeVoiceActivity extends VoiceSettingsActivity {
+    private static final String TAG = "ZenModeVoiceActivity";
+    private static final int MINUTES_MS = 60 * 1000;
+
+    @Override
+    protected boolean onVoiceSettingInteraction(Intent intent) {
+        setContentView(R.layout.voice_interaction);
+        pickNotificationMode(intent);
+        return false;
+    }
+
+    /**
+     * Start a voice interaction to ask what kind of interruptions should
+     * be permitted. The intent can optionally include extra information about the type
+     * of interruptions desired or how long interruptions should be limited to that are
+     * used as hints.
+     */
+    private void pickNotificationMode(final Intent intent) {
+        boolean enabled = intent.getBooleanExtra(EXTRA_DO_NOT_DISTURB_MODE_ENABLED, false);
+        boolean specified = intent.hasExtra(EXTRA_DO_NOT_DISTURB_MODE_ENABLED);
+
+        setHeader(getString(R.string.zen_mode_interruptions_voice_header));
+
+        List<VoiceSelection> states = new ArrayList<VoiceSelection>();
+        if (!specified || enabled) {
+            states.add(new ModeSelection(this, Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS,
+                    R.string.zen_mode_option_voice_important_interruptions,
+                    R.string.zen_mode_option_voice_important_synonyms));
+            states.add(new ModeSelection(this, Global.ZEN_MODE_ALARMS,
+                    R.string.zen_mode_option_voice_alarms,
+                    R.string.zen_mode_option_voice_alarms_synonyms));
+            states.add(new ModeSelection(this, Global.ZEN_MODE_NO_INTERRUPTIONS,
+                    R.string.zen_mode_option_voice_no_interruptions,
+                    R.string.zen_mode_option_voice_no_interruptions_synonyms));
+        }
+        if (!specified || !enabled) {
+            states.add(new ModeSelection(this, Global.ZEN_MODE_OFF,
+                    R.string.zen_mode_option_voice_all_interruptions,
+                    R.string.zen_mode_option_voice_all_interruptions_synonyms));
+        }
+        VoiceSelectionFragment fragment = new VoiceSelectionFragment();
+        fragment.setArguments(VoiceSelectionFragment.createArguments(
+                getString(R.string.zen_mode_interruptions_voice_prompt)));
+        fragment.setListAdapter(
+                new VoiceSelectionAdapter(this, R.layout.voice_item_row, states));
+        fragment.setOnItemSelectedHandler(new VoiceSelection.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(int index, VoiceSelection selection) {
+                int mode = ((ModeSelection) selection).mMode;
+                ConditionSelection conditionSelection = getConditionSelection(
+                        intent.getIntExtra(EXTRA_DO_NOT_DISTURB_MODE_MINUTES, 0));
+                if (mode != Global.ZEN_MODE_OFF) {
+                    if (conditionSelection == null) {
+                        pickDuration(selection.getLabel(), mode);
+                        return;
+                    }
+                    setZenModeConfig(mode, conditionSelection.mCondition);
+                } else {
+                    setZenModeConfig(Global.ZEN_MODE_OFF, null);
+                }
+                notifySuccess(getChangeSummary(mode, conditionSelection));
+                finish();
+            }
+        });
+        showFragment(fragment, "pick_mode_fragment");
+    }
+
+    /**
+     * Start a voice interaction to ask for the zen mode duration.
+     */
+    private void pickDuration(CharSequence label, final int mode) {
+        setTitle(label.toString());
+        setHeader(null);
+
+        List<VoiceSelection> states = new ArrayList<VoiceSelection>();
+        states.add(new ConditionSelection(null, -1,
+              getString(R.string.zen_mode_duration_indefinte_voice_label),
+              getString(R.string.zen_mode_duration_indefinite_voice_synonyms)));
+        for (int i = ZenModeConfig.MINUTE_BUCKETS.length - 1; i >= 0; --i) {
+            states.add(getConditionSelection(ZenModeConfig.MINUTE_BUCKETS[i]));
+        }
+
+        VoiceSelectionFragment fragment = new VoiceSelectionFragment();
+        fragment.setArguments(VoiceSelectionFragment.createArguments(
+                getString(R.string.zen_mode_duration_voice_prompt)));
+        fragment.setListAdapter(
+                new VoiceSelectionAdapter(this, R.layout.voice_item_row, states));
+        fragment.setOnItemSelectedHandler(new VoiceSelection.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(int index, VoiceSelection item) {
+                ConditionSelection selection = ((ConditionSelection) item);
+                setZenModeConfig(mode, selection.mCondition);
+                notifySuccess(getChangeSummary(mode, selection));
+                finish();
+            }
+        });
+        showFragment(fragment, "pick_duration_fragment");
+    }
+
+    private void setZenModeConfig(int mode, Condition condition) {
+        if (condition != null) {
+            NotificationManager.from(this).setZenMode(mode, condition.id, TAG);
+        } else {
+            NotificationManager.from(this).setZenMode(mode, null, TAG);
+        }
+    }
+
+    /**
+     * Produce a summary of the Zen mode change to be read aloud as TTS.
+     */
+    private CharSequence getChangeSummary(int mode, ConditionSelection duration) {
+        int indefinite = -1;
+        int byMinute = -1;
+        int byHour = -1;
+
+        switch (mode) {
+            case Global.ZEN_MODE_ALARMS:
+                indefinite = R.string.zen_mode_summary_alarams_only_indefinite;
+                byMinute = R.plurals.zen_mode_summary_alarms_only_by_minute;
+                byHour = R.plurals.zen_mode_summary_alarms_only_by_hour;
+                break;
+            case Global.ZEN_MODE_NO_INTERRUPTIONS:
+                indefinite = R.string.zen_mode_summary_no_interruptions_indefinite;
+                byMinute = R.plurals.zen_mode_summary_no_interruptions_by_minute;
+                byHour = R.plurals.zen_mode_summary_no_interruptions_by_hour;
+                break;
+            case Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS:
+                indefinite = R.string.zen_mode_summary_priority_indefinitely;
+                byMinute = R.plurals.zen_mode_summary_priority_by_minute;
+                byHour = R.plurals.zen_mode_summary_priority_by_hour;
+                break;
+            default:
+            case Global.ZEN_MODE_OFF:
+                indefinite = R.string.zen_mode_summary_always;
+                break;
+        };
+
+        if (duration == null || duration.mCondition == null) {
+            return getString(indefinite);
+        }
+
+        long time = System.currentTimeMillis() + duration.mMinutes * MINUTES_MS;
+        String skeleton = DateFormat.is24HourFormat(this, UserHandle.myUserId()) ? "Hm" : "hma";
+        String pattern = DateFormat.getBestDateTimePattern(Locale.getDefault(), skeleton);
+        CharSequence formattedTime = DateFormat.format(pattern, time);
+        Resources res = getResources();
+
+        if (duration.mMinutes < 60) {
+            return res.getQuantityString(byMinute,
+                    duration.mMinutes, duration.mMinutes, formattedTime);
+        } else {
+            int hours = duration.mMinutes / 60;
+            return res.getQuantityString(byHour, hours, hours, formattedTime);
+        }
+    }
+
+    private ConditionSelection getConditionSelection(int minutes) {
+        Condition condition = ZenModeConfig.toTimeCondition(this, minutes, UserHandle.myUserId());
+        Resources res = getResources();
+        if (minutes <= 0) {
+            return null;
+        } else if (minutes < 60) {
+            String label = res.getQuantityString(R.plurals.zen_mode_duration_minutes_voice_label,
+                    minutes, minutes);
+            return new ConditionSelection(condition, minutes, label, Integer.toString(minutes));
+        } else {
+            int hours = minutes / 60;
+            String label = res.getQuantityString(R.plurals.zen_mode_duration_hours_voice_label,
+                    hours, hours);
+            return new ConditionSelection(condition, minutes, label, Integer.toString(hours));
+        }
+    }
+
+    private static class ConditionSelection extends VoiceSelection {
+        Condition mCondition;
+        int mMinutes;
+
+        public ConditionSelection(Condition condition, int minutes, CharSequence label,
+                CharSequence synonyms) {
+            super(label, synonyms);
+            mMinutes = minutes;
+            mCondition = condition;
+        }
+    }
+
+    private static class ModeSelection extends VoiceSelection {
+        int mMode;
+
+        public ModeSelection(Context context, int mode, int label, int synonyms) {
+            super(context.getString(label), context.getString(synonyms));
+            mMode = mode;
+        }
+    }
+}
diff --git a/src/com/android/settings/notification/ZenRuleNameDialog.java b/src/com/android/settings/notification/ZenRuleNameDialog.java
new file mode 100644
index 0000000..8b44e46
--- /dev/null
+++ b/src/com/android/settings/notification/ZenRuleNameDialog.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import android.app.AlertDialog;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnDismissListener;
+import android.content.pm.ServiceInfo;
+import android.net.Uri;
+import android.service.notification.ZenModeConfig;
+import android.service.notification.ZenModeConfig.ScheduleInfo;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.ArraySet;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+
+import com.android.settings.R;
+
+import java.util.List;
+
+public abstract class ZenRuleNameDialog {
+    private static final String TAG = ZenModeSettings.TAG;
+    private static final boolean DEBUG = ZenModeSettings.DEBUG;
+
+    private final AlertDialog mDialog;
+    private final EditText mEditText;
+    private final RadioGroup mTypes;
+    private final ArraySet<String> mExistingNames;
+    private final ServiceListing mServiceListing;
+    private final RuleInfo[] mExternalRules = new RuleInfo[3];
+
+    public ZenRuleNameDialog(Context context, ServiceListing serviceListing, String ruleName,
+            ArraySet<String> existingNames) {
+        mServiceListing = serviceListing;
+        final View v = LayoutInflater.from(context).inflate(R.layout.zen_rule_name, null, false);
+        mEditText = (EditText) v.findViewById(R.id.rule_name);
+        if (ruleName != null) {
+            mEditText.setText(ruleName);
+        }
+        mEditText.setSelectAllOnFocus(true);
+        mTypes = (RadioGroup) v.findViewById(R.id.rule_types);
+        if (mServiceListing != null) {
+            bindType(R.id.rule_type_schedule, defaultNewSchedule());
+            bindExternalRules();
+            mServiceListing.addCallback(mServiceListingCallback);
+            mServiceListing.reload();
+        }
+        mDialog = new AlertDialog.Builder(context)
+                .setTitle(R.string.zen_mode_rule_name)
+                .setView(v)
+                .setPositiveButton(R.string.okay, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        onOk(trimmedText(), selectedRuleInfo());
+                    }
+                })
+                .setOnDismissListener(new OnDismissListener() {
+                    @Override
+                    public void onDismiss(DialogInterface dialog) {
+                        if (mServiceListing != null) {
+                            mServiceListing.removeCallback(mServiceListingCallback);
+                        }
+                    }
+                })
+                .setNegativeButton(R.string.cancel, null)
+                .create();
+        mEditText.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                // noop
+            }
+
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                // noop
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                updatePositiveButton();
+            }
+        });
+        mExistingNames = new ArraySet<String>(existingNames.size());
+        for (String existingName : existingNames) {
+            mExistingNames.add(existingName.toLowerCase());
+        }
+    }
+
+    abstract public void onOk(String ruleName, RuleInfo ruleInfo);
+
+    public void show() {
+        mDialog.show();
+        updatePositiveButton();
+    }
+
+    private void bindType(int id, RuleInfo ri) {
+        final RadioButton rb = (RadioButton) mTypes.findViewById(id);
+        if (ri == null) {
+            rb.setVisibility(View.GONE);
+            return;
+        }
+        rb.setVisibility(View.VISIBLE);
+        if (ri.caption != null) {
+            rb.setText(ri.caption);
+        }
+        rb.setTag(ri);
+    }
+
+    private RuleInfo selectedRuleInfo() {
+        final int id = mTypes.getCheckedRadioButtonId();
+        if (id == -1) return null;
+        final RadioButton rb = (RadioButton) mTypes.findViewById(id);
+        return (RuleInfo) rb.getTag();
+    }
+
+    private String trimmedText() {
+        return mEditText.getText() == null ? null : mEditText.getText().toString().trim();
+    }
+
+    private void updatePositiveButton() {
+        final String name = trimmedText();
+        final boolean validName = !TextUtils.isEmpty(name)
+                && !mExistingNames.contains(name.toLowerCase());
+        mDialog.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(validName);
+    }
+
+    private static RuleInfo defaultNewSchedule() {
+        final ScheduleInfo schedule = new ScheduleInfo();
+        schedule.days = ZenModeConfig.ALL_DAYS;
+        schedule.startHour = 22;
+        schedule.endHour = 7;
+        final RuleInfo rt = new RuleInfo();
+        rt.settingsAction = ZenModeScheduleRuleSettings.ACTION;
+        rt.defaultConditionId = ZenModeConfig.toScheduleConditionId(schedule);
+        return rt;
+    }
+
+    private void bindExternalRules() {
+        bindType(R.id.rule_type_2, mExternalRules[0]);
+        bindType(R.id.rule_type_3, mExternalRules[1]);
+        bindType(R.id.rule_type_4, mExternalRules[2]);
+        // show radio group if we have at least one external rule type
+        mTypes.setVisibility(mExternalRules[0] != null ? View.VISIBLE : View.GONE);
+    }
+
+    private final ServiceListing.Callback mServiceListingCallback = new ServiceListing.Callback() {
+        @Override
+        public void onServicesReloaded(List<ServiceInfo> services) {
+            if (DEBUG) Log.d(TAG, "Services reloaded: count=" + services.size());
+            mExternalRules[0] = mExternalRules[1] = mExternalRules[2] = null;
+            int i = 0;
+            for (ServiceInfo si : services) {
+                final RuleInfo ri = ZenModeExternalRuleSettings.getRuleInfo(si);
+                if (ri != null) {
+                    mExternalRules[i] = ri;
+                    i++;
+                    if (i == mExternalRules.length) {
+                        break;
+                    }
+                }
+            }
+            bindExternalRules();
+        }
+    };
+
+    public static class RuleInfo {
+        public String caption;
+        public String settingsAction;
+        public Uri defaultConditionId;
+        public ComponentName serviceComponent;
+        public ComponentName configurationActivity;
+    }
+
+}
\ No newline at end of file
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index 27ccc59..cea65d7 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -129,6 +129,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_uri_printing;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         addPreferencesFromResource(R.xml.print_settings);
diff --git a/src/com/android/settings/search/Ranking.java b/src/com/android/settings/search/Ranking.java
index f37e1fc..e1eec5f 100644
--- a/src/com/android/settings/search/Ranking.java
+++ b/src/com/android/settings/search/Ranking.java
@@ -31,8 +31,9 @@
 import com.android.settings.WirelessSettings;
 import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.applications.AdvancedAppSettings;
+import com.android.settings.applications.ManageDefaultApps;
 import com.android.settings.bluetooth.BluetoothSettings;
-import com.android.settings.deviceinfo.Memory;
+import com.android.settings.deviceinfo.StorageSettings;
 import com.android.settings.deviceinfo.UsbSettings;
 import com.android.settings.fuelgauge.BatterySaverSettings;
 import com.android.settings.fuelgauge.PowerUsageSummary;
@@ -129,7 +130,7 @@
         sRankMap.put(ZenModeAutomationSettings.class.getName(), RANK_NOTIFICATIONS);
 
         // Storage
-        sRankMap.put(Memory.class.getName(), RANK_STORAGE);
+        sRankMap.put(StorageSettings.class.getName(), RANK_STORAGE);
         sRankMap.put(UsbSettings.class.getName(), RANK_STORAGE);
 
         // Battery
@@ -138,6 +139,7 @@
 
         // Advanced app settings
         sRankMap.put(AdvancedAppSettings.class.getName(), RANK_APPS);
+        sRankMap.put(ManageDefaultApps.class.getName(), RANK_APPS);
 
         // Users
         sRankMap.put(UserSettings.class.getName(), RANK_USERS);
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index 0ad9503..a3d2ddc 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -24,16 +24,18 @@
 import com.android.settings.DeviceInfoSettings;
 import com.android.settings.DisplaySettings;
 import com.android.settings.HomeSettings;
-import com.android.settings.ScreenPinningSettings;
 import com.android.settings.PrivacySettings;
 import com.android.settings.R;
+import com.android.settings.ScreenPinningSettings;
 import com.android.settings.SecuritySettings;
 import com.android.settings.WallpaperTypeSettings;
+import com.android.settings.WifiCallingSettings;
 import com.android.settings.WirelessSettings;
 import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.applications.AdvancedAppSettings;
+import com.android.settings.applications.ManageDefaultApps;
 import com.android.settings.bluetooth.BluetoothSettings;
-import com.android.settings.deviceinfo.Memory;
+import com.android.settings.deviceinfo.StorageSettings;
 import com.android.settings.deviceinfo.UsbSettings;
 import com.android.settings.fuelgauge.BatterySaverSettings;
 import com.android.settings.fuelgauge.PowerUsageSummary;
@@ -43,7 +45,6 @@
 import com.android.settings.net.DataUsageMeteredSettings;
 import com.android.settings.notification.NotificationSettings;
 import com.android.settings.notification.OtherSoundSettings;
-import com.android.settings.notification.ZenModeAutomationSettings;
 import com.android.settings.notification.ZenModePrioritySettings;
 import com.android.settings.notification.ZenModeSettings;
 import com.android.settings.print.PrintSettingsFragment;
@@ -53,7 +54,6 @@
 import com.android.settings.wifi.AdvancedWifiSettings;
 import com.android.settings.wifi.SavedAccessPointsWifiSettings;
 import com.android.settings.wifi.WifiSettings;
-import com.android.settings.WifiCallingSettings;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -171,18 +171,11 @@
                         ZenModePrioritySettings.class.getName(),
                         R.drawable.ic_settings_notifications));
 
-        sResMap.put(ZenModeAutomationSettings.class.getName(),
+        sResMap.put(StorageSettings.class.getName(),
                 new SearchIndexableResource(
-                        Ranking.getRankForClassName(ZenModeAutomationSettings.class.getName()),
+                        Ranking.getRankForClassName(StorageSettings.class.getName()),
                         NO_DATA_RES_ID,
-                        ZenModeAutomationSettings.class.getName(),
-                        R.drawable.ic_settings_notifications));
-
-        sResMap.put(Memory.class.getName(),
-                new SearchIndexableResource(
-                        Ranking.getRankForClassName(Memory.class.getName()),
-                        NO_DATA_RES_ID,
-                        Memory.class.getName(),
+                        StorageSettings.class.getName(),
                         R.drawable.ic_settings_storage));
 
         sResMap.put(UsbSettings.class.getName(),
@@ -209,10 +202,17 @@
         sResMap.put(AdvancedAppSettings.class.getName(),
                 new SearchIndexableResource(
                         Ranking.getRankForClassName(AdvancedAppSettings.class.getName()),
-                        NO_DATA_RES_ID,
+                        R.xml.advanced_apps,
                         AdvancedAppSettings.class.getName(),
                         R.drawable.ic_settings_applications));
 
+        sResMap.put(ManageDefaultApps.class.getName(),
+                new SearchIndexableResource(
+                        Ranking.getRankForClassName(ManageDefaultApps.class.getName()),
+                        NO_DATA_RES_ID,
+                        ManageDefaultApps.class.getName(),
+                        R.drawable.ic_settings_applications));
+
         sResMap.put(UserSettings.class.getName(),
                 new SearchIndexableResource(
                         Ranking.getRankForClassName(UserSettings.class.getName()),
diff --git a/src/com/android/settings/utils/VoiceSelection.java b/src/com/android/settings/utils/VoiceSelection.java
new file mode 100644
index 0000000..997d2cc
--- /dev/null
+++ b/src/com/android/settings/utils/VoiceSelection.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.utils;
+
+import android.app.VoiceInteractor.PickOptionRequest.Option;
+import android.os.Bundle;
+import android.text.TextUtils;
+
+/**
+ * Model for a single item that can be selected by a {@link VoiceSelectionFragment}.
+ * Each item consists of a visual label and several alternative synonyms for the item
+ * that can be used to identify the item by voice.
+ */
+public class VoiceSelection {
+    final CharSequence mLabel;
+    final CharSequence[] mSynonyms;
+
+    /**
+     * Created a new selectable item with a visual label and a set of synonyms.
+     */
+    public VoiceSelection(CharSequence label, CharSequence synonyms) {
+        mLabel = label;
+        mSynonyms = TextUtils.split(synonyms.toString(), ",");
+    }
+
+    /**
+     * Created a new selectable item with a visual label and no synonyms.
+     */
+    public VoiceSelection(CharSequence label) {
+        mLabel = label;
+        mSynonyms = null;
+    }
+
+    public CharSequence getLabel() {
+        return mLabel;
+    }
+
+    public CharSequence[] getSynonyms() {
+        return mSynonyms;
+    }
+
+    Option toOption(int index) {
+        Option result = new Option(mLabel);
+        Bundle extras = new Bundle();
+        extras.putInt("index", index);
+        result.setExtras(extras);
+
+        for (CharSequence synonym : mSynonyms) {
+            result.addSynonym(synonym);
+        }
+        return result;
+    }
+
+    /**
+     * Listener interface for when an item is selected.
+     */
+    public interface OnItemSelectedListener {
+        abstract void onItemSelected(int position, VoiceSelection selection);
+    };
+}
diff --git a/src/com/android/settings/utils/VoiceSelectionAdapter.java b/src/com/android/settings/utils/VoiceSelectionAdapter.java
new file mode 100644
index 0000000..2c060c2
--- /dev/null
+++ b/src/com/android/settings/utils/VoiceSelectionAdapter.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.utils;
+
+import android.content.Context;
+import android.widget.ArrayAdapter;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import android.app.Activity;
+import com.android.settings.R;
+
+import java.util.List;
+import android.util.Log;
+
+/**
+ * Array adapter for selecting an item by voice interaction. Each row includes a visual
+ * indication of the 1-indexed position of the item so that a user can easily say
+ * "number 4" to select it.
+ */
+public class VoiceSelectionAdapter extends ArrayAdapter<VoiceSelection> {
+    public VoiceSelectionAdapter(Context context, int resource, List<VoiceSelection> objects) {
+        super(context, resource, objects);
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        VoiceSelection item = getItem(position);
+        View row = convertView;
+        if (row == null) {
+            LayoutInflater inflater = ((Activity) getContext()).getLayoutInflater();
+            row = inflater.inflate(R.layout.voice_item_row, parent, false);
+        }
+
+        TextView label = (TextView) row.findViewById(R.id.voice_item_label);
+        if (label != null) {
+            label.setText(item.getLabel());
+        }
+
+        TextView positionLabel = (TextView) row.findViewById(R.id.voice_item_position);
+        if (positionLabel != null) {
+            positionLabel.setText(Integer.toString(position + 1));
+        }
+
+        return row;
+    }
+};
diff --git a/src/com/android/settings/utils/VoiceSelectionFragment.java b/src/com/android/settings/utils/VoiceSelectionFragment.java
new file mode 100644
index 0000000..1e4e7e4
--- /dev/null
+++ b/src/com/android/settings/utils/VoiceSelectionFragment.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.utils;
+
+import android.app.ListFragment;
+import android.app.VoiceInteractor;
+import android.app.VoiceInteractor.PickOptionRequest;
+import android.app.VoiceInteractor.PickOptionRequest.Option;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ArrayAdapter;
+import android.widget.ListAdapter;
+import android.widget.ListView;
+
+import java.util.List;
+
+/**
+ * An Activity fragment that presents a set of options as a visual list and also allows
+ * items to be selected by the users voice.
+ */
+public class VoiceSelectionFragment extends ListFragment {
+    private static final String EXTRA_SELECTION_PROMPT = "selection_prompt";
+
+    private CharSequence mPrompt = null;
+    private VoiceInteractor.Request mRequest = null;
+    private VoiceInteractor mVoiceInteractor = null;
+    private VoiceSelection.OnItemSelectedListener mOnItemSelectedListener = null;
+
+    /**
+     * No-args ctor required for fragment.
+     */
+    public VoiceSelectionFragment() {}
+
+    @Override
+    public void onCreate(Bundle args) {
+        super.onCreate(args);
+        mPrompt = getArguments().getCharSequence(EXTRA_SELECTION_PROMPT);
+    }
+
+    /**
+     * Set the prompt spoken when the fragment is presented.
+     */
+    static public Bundle createArguments(CharSequence prompt) {
+        Bundle args = new Bundle();
+        args.putCharSequence(EXTRA_SELECTION_PROMPT, prompt);
+        return args;
+    }
+
+    private VoiceSelection getSelectionAt(int position) {
+        return ((ArrayAdapter<VoiceSelection>) getListAdapter()).getItem(position);
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        final int numItems = getListAdapter().getCount();
+        if (numItems <= 0) {
+            return;
+        }
+
+        Option[] options = new Option[numItems];
+        for (int idx = 0; idx < numItems; idx++) {
+            options[idx] = getSelectionAt(idx).toOption(idx);
+        }
+        mRequest = new PickOptionRequest(mPrompt, options, null) {
+            @Override
+            public void onPickOptionResult(boolean isComplete, Option[] options, Bundle args) {
+                if (!isComplete || options == null) {
+                    return;
+                }
+                if (options.length == 1 && mOnItemSelectedListener != null) {
+                    int idx = options[0].getExtras().getInt("index", -1);
+                    mOnItemSelectedListener.onItemSelected(idx, getSelectionAt(idx));
+                } else {
+                    onCancel();
+                }
+            }
+        };
+        mVoiceInteractor = getActivity().getVoiceInteractor();
+        if (mVoiceInteractor != null) {
+            mVoiceInteractor.submitRequest(mRequest);
+        }
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        mVoiceInteractor = null;
+    }
+
+    @Override
+    public void onListItemClick(ListView l, View v, int position, long id) {
+        if (mRequest != null) {
+            mRequest.cancel();
+            mRequest = null;
+        }
+
+        if (mOnItemSelectedListener != null) {
+            mOnItemSelectedListener.onItemSelected(position, getSelectionAt(position));
+        }
+    }
+
+
+    /**
+     * Sets the selection handler for an item either by voice or by touch.
+     */
+    public void setOnItemSelectedHandler(VoiceSelection.OnItemSelectedListener listener) {
+        mOnItemSelectedListener = listener;
+    }
+
+    /**
+     * Called when the user cancels the interaction. The default implementation is to
+     * finish the activity.
+     */
+    public void onCancel() {
+        getActivity().finish();
+    }
+};
diff --git a/src/com/android/settings/utils/VoiceSettingsActivity.java b/src/com/android/settings/utils/VoiceSettingsActivity.java
new file mode 100644
index 0000000..21849a4
--- /dev/null
+++ b/src/com/android/settings/utils/VoiceSettingsActivity.java
@@ -0,0 +1,99 @@
+/*
+ * 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.utils;
+
+import com.android.settings.R;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.app.VoiceInteractor;
+import android.app.VoiceInteractor.CompleteVoiceRequest;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.TextView;
+import android.util.Log;
+
+/**
+ * Activity for modifying a setting using the Voice Interaction API. This activity
+ * will only allow modifying the setting if the intent was sent using
+ * {@link android.service.voice.VoiceInteractionSession#startVoiceActivity startVoiceActivity}
+ * by the current Voice Interaction Service.
+ */
+abstract public class VoiceSettingsActivity extends Activity {
+
+    private static final String TAG = "VoiceSettingsActivity";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (isVoiceInteraction() || savedInstanceState == null) {
+            // Only permit if this is a voice interaction.
+            if (onVoiceSettingInteraction(getIntent())) {
+                // If it's complete, finish.
+                finish();
+            }
+        } else {
+            Log.v(TAG, "Cannot modify settings without voice interaction");
+            finish();
+        }
+    }
+
+    /**
+     * Modify the setting as a voice interaction. Should return true if the
+     * voice interaction is complete or false if more interaction is required.
+     */
+    abstract protected boolean onVoiceSettingInteraction(Intent intent);
+
+    /**
+     * Send a notification that the interaction was successful. If {@link prompt} is
+     * not null, then it will be read to the user.
+     */
+    protected void notifySuccess(CharSequence prompt) {
+        if (getVoiceInteractor() != null) {
+            getVoiceInteractor().submitRequest(new CompleteVoiceRequest(prompt, null));
+        }
+    }
+
+    protected void setHeader(String label) {
+        TextView header = (TextView) findViewById(R.id.voice_fragment_header);
+        if (header != null) {
+            if (label != null) {
+                header.setText(label);
+                header.setVisibility(View.VISIBLE);
+            } else {
+                header.setVisibility(View.GONE);
+            }
+        }
+    }
+
+    /**
+     * Indicates when the setting could not be changed.
+     */
+    protected void notifyFailure(String reason) {
+        getVoiceInteractor().submitRequest(new VoiceInteractor.AbortVoiceRequest(reason, null));
+    }
+
+    protected void showFragment(Fragment fragment, String tag) {
+        getFragmentManager()
+                .beginTransaction()
+                .replace(R.id.voice_fragment_root, fragment, tag)
+                .commit();
+    }
+
+}
diff --git a/src/com/android/settings/widget/FloatingActionButton.java b/src/com/android/settings/widget/FloatingActionButton.java
new file mode 100644
index 0000000..181c6c0
--- /dev/null
+++ b/src/com/android/settings/widget/FloatingActionButton.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.widget;
+
+import android.animation.AnimatorInflater;
+import android.content.Context;
+import android.graphics.Outline;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewOutlineProvider;
+import android.widget.ImageView;
+
+import com.android.settings.R;
+
+public class FloatingActionButton extends ImageView {
+
+    public FloatingActionButton(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setScaleType(ScaleType.CENTER);
+        setStateListAnimator(AnimatorInflater.loadStateListAnimator(context, R.anim.fab_elevation));
+        setOutlineProvider(new ViewOutlineProvider() {
+            @Override
+            public void getOutline(View view, Outline outline) {
+                outline.setOval(0, 0, getWidth(), getHeight());
+            }
+        });
+        setClipToOutline(true);
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+        invalidateOutline();
+    }
+}
diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java
index 606ceaa..094b95f 100644
--- a/src/com/android/settings/widget/SwitchBar.java
+++ b/src/com/android/settings/widget/SwitchBar.java
@@ -20,15 +20,18 @@
 import android.content.res.TypedArray;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
+import android.text.style.TextAppearanceSpan;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CompoundButton;
 import android.widget.LinearLayout;
-
 import android.widget.Switch;
 import android.widget.TextView;
+
 import com.android.settings.R;
 
 import java.util.ArrayList;
@@ -46,8 +49,12 @@
         void onSwitchChanged(Switch switchView, boolean isChecked);
     }
 
+    private final TextAppearanceSpan mSummarySpan;
+
     private ToggleSwitch mSwitch;
     private TextView mTextView;
+    private String mLabel;
+    private String mSummary;
 
     private ArrayList<OnSwitchChangeListener> mSwitchChangeListeners =
             new ArrayList<OnSwitchChangeListener>();
@@ -78,7 +85,9 @@
         a.recycle();
 
         mTextView = (TextView) findViewById(R.id.switch_text);
-        mTextView.setText(R.string.switch_off_text);
+        mLabel = getResources().getString(R.string.switch_off_text);
+        mSummarySpan = new TextAppearanceSpan(mContext, R.style.TextAppearance_Small_SwitchBar);
+        updateText();
         ViewGroup.MarginLayoutParams lp = (MarginLayoutParams) mTextView.getLayoutParams();
         lp.setMarginStart(switchBarMarginStart);
 
@@ -103,7 +112,26 @@
     }
 
     public void setTextViewLabel(boolean isChecked) {
-        mTextView.setText(isChecked ? R.string.switch_on_text : R.string.switch_off_text);
+        mLabel = getResources()
+                .getString(isChecked ? R.string.switch_on_text : R.string.switch_off_text);
+        updateText();
+    }
+
+    public void setSummary(String summary) {
+        mSummary = summary;
+        updateText();
+    }
+
+    private void updateText() {
+        if (TextUtils.isEmpty(mSummary)) {
+            mTextView.setText(mLabel);
+            return;
+        }
+        final SpannableStringBuilder ssb = new SpannableStringBuilder(mLabel).append('\n');
+        final int start = ssb.length();
+        ssb.append(mSummary);
+        ssb.setSpan(mSummarySpan, start, ssb.length(), 0);
+        mTextView.setText(ssb);
     }
 
     public void setChecked(boolean checked) {
diff --git a/src/com/android/settings/wifi/AccessPointPreference.java b/src/com/android/settings/wifi/AccessPointPreference.java
index f68410a..8a24bc9 100644
--- a/src/com/android/settings/wifi/AccessPointPreference.java
+++ b/src/com/android/settings/wifi/AccessPointPreference.java
@@ -15,16 +15,9 @@
  */
 package com.android.settings.wifi;
 
-import android.app.AppGlobals;
 import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.IPackageManager;
-import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.StateListDrawable;
-import android.net.wifi.WifiConfiguration;
-import android.os.RemoteException;
-import android.os.UserHandle;
 import android.preference.Preference;
 import android.view.View;
 import android.widget.TextView;
@@ -67,36 +60,6 @@
         notifyChanged();
     }
 
-    public void showAppIcon() {
-        PackageManager pm = getContext().getPackageManager();
-        String systemName = pm.getNameForUid(android.os.Process.SYSTEM_UID);
-        WifiConfiguration mConfig = mAccessPoint.getConfig();
-
-        Drawable drawable = pm.getDefaultActivityIcon();
-        if (mConfig == null) {
-            drawable.setAlpha(0);
-        } else {
-            int userId = UserHandle.getUserId(mConfig.creatorUid);
-            ApplicationInfo appInfo = null;
-            if (mConfig.creatorName.equals(systemName)) {
-                appInfo = getContext().getApplicationInfo();
-            } else {
-                try {
-                    IPackageManager ipm = AppGlobals.getPackageManager();
-                    appInfo = ipm.getApplicationInfo(mConfig.creatorName, 0 /* flags */, userId);
-                } catch (RemoteException rex) {
-                    // use default app icon
-                }
-            }
-            if (appInfo != null) {
-                drawable = appInfo.loadIcon(pm);
-                drawable = pm.getUserBadgedIcon(drawable, new UserHandle(userId));
-            }
-        }
-
-        setIcon(drawable);
-    }
-
     protected void updateIcon(int level, Context context) {
         if (level == -1) {
             setIcon(null);
diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
index 2627bc4..6726717 100644
--- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
+++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
@@ -16,12 +16,19 @@
 
 package com.android.settings.wifi;
 
+import android.app.AppGlobals;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.IPackageManager;
+import android.content.pm.PackageManager;
 import android.content.res.Resources;
+import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.UserHandle;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
 import android.util.Log;
@@ -93,11 +100,32 @@
 
         preferenceScreen.removeAll();
 
+        PackageManager pm = context.getPackageManager();
+        String systemName = pm.getNameForUid(android.os.Process.SYSTEM_UID);
+
         final int accessPointsSize = accessPoints.size();
         for (int i = 0; i < accessPointsSize; ++i){
             AccessPointPreference preference = new AccessPointPreference(accessPoints.get(i),
                     context);
-            preference.setShowSummary(false);
+            WifiConfiguration config = accessPoints.get(i).getConfig();
+            if (config != null) {
+                int userId = UserHandle.getUserId(config.creatorUid);
+                ApplicationInfo appInfo = null;
+                if (config.creatorName != null && config.creatorName.equals(systemName)) {
+                    appInfo = context.getApplicationInfo();
+                } else {
+                    try {
+                        IPackageManager ipm = AppGlobals.getPackageManager();
+                        appInfo = ipm.getApplicationInfo(config.creatorName, 0 /* flags */, userId);
+                    } catch (RemoteException rex) {
+                    }
+                }
+                if (appInfo != null) {
+                    preference.setSummary(getResources().getString(appInfo.labelRes));
+                }
+            } else {
+                preference.setShowSummary(false);
+            }
             preferenceScreen.addPreference(preference);
         }
 
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index cc8481d..1503c63 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -88,6 +88,9 @@
     public static final int WIFI_EAP_METHOD_TLS  = 1;
     public static final int WIFI_EAP_METHOD_TTLS = 2;
     public static final int WIFI_EAP_METHOD_PWD  = 3;
+    public static final int WIFI_EAP_METHOD_SIM  = 4;
+    public static final int WIFI_EAP_METHOD_AKA  = 5;
+    public static final int WIFI_EAP_METHOD_AKA_PRIME  = 6;
 
     /* These values come from "wifi_peap_phase2_entries" resource array */
     public static final int WIFI_PEAP_PHASE2_NONE 	    = 0;
@@ -734,9 +737,23 @@
                 mView.findViewById(R.id.l_anonymous).setVisibility(View.VISIBLE);
                 setUserCertInvisible();
                 break;
+            case WIFI_EAP_METHOD_SIM:
+            case WIFI_EAP_METHOD_AKA:
+            case WIFI_EAP_METHOD_AKA_PRIME:
+                setPhase2Invisible();
+                setAnonymousIdentInvisible();
+                setUserCertInvisible();
+                setPasswordInvisible();
+                setIdentityInvisible();
+                break;
         }
     }
 
+    private void setIdentityInvisible() {
+        mView.findViewById(R.id.l_identity).setVisibility(View.GONE);
+        mPhase2Spinner.setSelection(Phase2.NONE);
+    }
+
     private void setPhase2Invisible() {
         mView.findViewById(R.id.l_phase2).setVisibility(View.GONE);
         mPhase2Spinner.setSelection(Phase2.NONE);
diff --git a/src/com/android/settings/wifi/WifiNoInternetDialog.java b/src/com/android/settings/wifi/WifiNoInternetDialog.java
new file mode 100644
index 0000000..a45d6a2
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiNoInternetDialog.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.ConnectivityManager;
+import android.net.ConnectivityManager.NetworkCallback;
+import android.net.Network;
+import android.net.NetworkInfo;
+import android.net.NetworkCapabilities;
+import android.net.NetworkRequest;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.TextView;
+
+import com.android.internal.app.AlertActivity;
+import com.android.internal.app.AlertController;
+import com.android.settings.R;
+
+public final class WifiNoInternetDialog extends AlertActivity implements
+        DialogInterface.OnClickListener {
+    private static final String TAG = "WifiNoInternetDialog";
+
+    private ConnectivityManager mCM;
+    private Network mNetwork;
+    private String mNetworkName;
+    private ConnectivityManager.NetworkCallback mNetworkCallback;
+    private CheckBox mAlwaysAllow;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        final Intent intent = getIntent();
+        if (intent == null ||
+                !intent.getAction().equals(ConnectivityManager.ACTION_PROMPT_UNVALIDATED)) {
+            Log.e(TAG, "Unexpected intent " + intent + ", exiting");
+            finish();
+            return;
+        }
+
+        mNetwork = intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK);
+        if (mNetwork == null) {
+            Log.e(TAG, "ACTION_PROMPT_UNVALIDATED for null network, exiting");
+            finish();
+            return;
+        }
+
+        // TODO: add a registerNetworkCallback(Network network, NetworkCallback networkCallback) and
+        // simplify this.
+        final NetworkRequest.Builder builder = new NetworkRequest.Builder();
+        for (int i = 0; i < 256; i++) {
+            try {
+                builder.removeCapability(i);
+            } catch (IllegalArgumentException e) {}
+        }
+        final NetworkRequest request = builder.build();
+        mNetworkCallback = new NetworkCallback() {
+            public void onLost(Network network) {
+                // Close the dialog if the network disconnects.
+                if (mNetwork.equals(network)) {
+                    Log.d(TAG, "Network " + mNetwork + " disconnected");
+                    finish();
+                }
+            }
+            // TODO: implement onNetworkCapabilitiesChanged so we can close the dialog if the
+            // network is now validated.
+        };
+
+        mCM = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+        mCM.registerNetworkCallback(request, mNetworkCallback);
+
+        final NetworkInfo ni = mCM.getNetworkInfo(mNetwork);
+        if (ni == null || !ni.isConnectedOrConnecting()) {
+            Log.d(TAG, "Network " + mNetwork + " is not connected: " + ni);
+            finish();
+            return;
+        }
+        mNetworkName = ni.getExtraInfo();
+        if (mNetworkName != null) {
+            mNetworkName = mNetworkName.replaceAll("^\"|\"$", "");  // Remove double quotes
+        }
+
+        createDialog();
+    }
+
+    private void createDialog() {
+        mAlert.setIcon(R.drawable.ic_settings_wireless);
+
+        final AlertController.AlertParams ap = mAlertParams;
+        ap.mTitle = mNetworkName;
+        ap.mMessage = getString(R.string.no_internet_access_text);
+        ap.mPositiveButtonText = getString(android.R.string.ok);
+        ap.mNegativeButtonText = getString(android.R.string.cancel);
+        ap.mPositiveButtonListener = this;
+        ap.mNegativeButtonListener = this;
+
+        final LayoutInflater inflater = LayoutInflater.from(ap.mContext);
+        final View checkbox = inflater.inflate(
+                com.android.internal.R.layout.always_use_checkbox, null);
+        ap.mView = checkbox;
+
+        mAlwaysAllow = (CheckBox) checkbox.findViewById(com.android.internal.R.id.alwaysUse);
+        mAlwaysAllow.setText(getString(R.string.no_internet_access_remember));
+
+        setupAlert();
+    }
+
+    @Override
+    protected void onDestroy() {
+        if (mNetworkCallback != null) {
+            mCM.unregisterNetworkCallback(mNetworkCallback);
+            mNetworkCallback = null;
+        }
+        super.onDestroy();
+    }
+
+    public void onClick(DialogInterface dialog, int which) {
+        final boolean accept = (which == BUTTON_POSITIVE);
+        final String action = (accept ? "Connect" : "Ignore");
+        final boolean always = mAlwaysAllow.isChecked();
+
+        switch (which) {
+            case BUTTON_POSITIVE:
+            case BUTTON_NEGATIVE:
+                mCM.setAcceptUnvalidated(mNetwork, accept, always);
+                Log.d(TAG, action +  " network=" + mNetwork + (always ? " and remember" : ""));
+                break;
+            default:
+                break;
+        }
+    }
+}
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index cb6be53..f46edac 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -93,7 +93,6 @@
     private static final int MENU_ID_FORGET = Menu.FIRST + 7;
     private static final int MENU_ID_MODIFY = Menu.FIRST + 8;
     private static final int MENU_ID_WRITE_NFC = Menu.FIRST + 9;
-    private static final int MENU_ID_APPS = Menu.FIRST + 10;
 
     public static final int WIFI_DIALOG_ID = 1;
     /* package */ static final int WPS_PBC_DIALOG_ID = 2;
@@ -120,9 +119,6 @@
 
     private TextView mEmptyView;
 
-    private boolean showAppIcons = false;
-    private MenuItem showAppMenuItem = null;
-
     // 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";
@@ -324,8 +320,6 @@
                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
         menu.add(Menu.NONE, MENU_ID_ADVANCED, 0, R.string.wifi_menu_advanced)
                 .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-        showAppMenuItem = menu.add(Menu.NONE, MENU_ID_APPS, 0, R.string.wifi_menu_apps);
-        showAppMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
         ta.recycle();
     }
 
@@ -406,16 +400,6 @@
                             null);
                 }
                 return true;
-            case MENU_ID_APPS:
-                showAppIcons = !showAppIcons;
-
-                if (showAppIcons) {
-                    showAppMenuItem.setTitle(R.string.wifi_menu_apps_strength);
-                } else {
-                    showAppMenuItem.setTitle(R.string.wifi_menu_apps);
-                }
-                onAccessPointsChanged();
-                return true;
         }
         return super.onOptionsItemSelected(item);
     }
@@ -584,9 +568,6 @@
                     if (accessPoint.getLevel() != -1) {
                         AccessPointPreference preference = new AccessPointPreference(accessPoint,
                                 getActivity());
-                        if (showAppIcons) {
-                            preference.showAppIcon();
-                        }
 
                         getPreferenceScreen().addPreference(preference);
                         accessPoint.setListener(this);
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
index 5716bec..4dfea08 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.wifi;
 
-import android.content.Intent;
+import android.app.Dialog;
 import android.net.wifi.WifiConfiguration;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -29,6 +29,7 @@
 import android.widget.TextView;
 
 import com.android.settings.R;
+import com.android.settings.SetupWizardUtils;
 
 /**
  * This customized version of WifiSettings is shown to the user only during Setup Wizard. Menu
@@ -40,9 +41,6 @@
 
     private static final String TAG = "WifiSettingsForSetupWizard";
 
-    // show a text regarding data charges when wifi connection is required during setup wizard
-    protected static final String EXTRA_SHOW_WIFI_REQUIRED_INFO = "wifi_show_wifi_required_info";
-
     private View mAddOtherNetworkItem;
     private TextView mEmptyFooter;
     private boolean mListLastEmpty = false;
@@ -71,13 +69,6 @@
             }
         });
 
-        final Intent intent = getActivity().getIntent();
-        if (intent.getBooleanExtra(EXTRA_SHOW_WIFI_REQUIRED_INFO, false)) {
-            final View requiredInfo =
-                    inflater.inflate(R.layout.setup_wifi_required_info, list, false);
-            list.addHeaderView(requiredInfo, null, false);
-        }
-
         return view;
     }
 
@@ -119,6 +110,13 @@
     }
 
     @Override
+    public Dialog onCreateDialog(int dialogId) {
+        final Dialog dialog = super.onCreateDialog(dialogId);
+        SetupWizardUtils.applyImmersiveFlags(dialog);
+        return dialog;
+    }
+
+    @Override
     protected void connect(final WifiConfiguration config) {
         WifiSetupActivity activity = (WifiSetupActivity) getActivity();
         activity.networkSelected();
diff --git a/src/com/android/settings/wifi/WifiSetupActivity.java b/src/com/android/settings/wifi/WifiSetupActivity.java
index a60945f..7d7fe3b 100644
--- a/src/com/android/settings/wifi/WifiSetupActivity.java
+++ b/src/com/android/settings/wifi/WifiSetupActivity.java
@@ -180,7 +180,7 @@
 
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent(), resid);
+        resid = SetupWizardUtils.getTheme(getIntent());
         super.onApplyThemeResource(theme, resid, first);
     }
 
@@ -212,7 +212,7 @@
     @Override
     public void onNavigationBarCreated(final SetupWizardNavBar bar) {
         mNavigationBar = bar;
-        SetupWizardUtils.setImmersiveMode(this, bar);
+        SetupWizardUtils.setImmersiveMode(this);
     }
 
     @Override
@@ -263,24 +263,26 @@
         @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             int messageRes = getArguments().getInt("messageRes");
-            return new AlertDialog.Builder(getActivity())
+            final AlertDialog dialog = new AlertDialog.Builder(getActivity())
                     .setMessage(messageRes)
                     .setCancelable(false)
                     .setPositiveButton(R.string.wifi_skip_anyway,
                             new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int id) {
-                            WifiSetupActivity activity = (WifiSetupActivity) getActivity();
-                            activity.finishOrNext(RESULT_SKIP);
-                        }
-                    })
+                                @Override
+                                public void onClick(DialogInterface dialog, int id) {
+                                    WifiSetupActivity activity = (WifiSetupActivity) getActivity();
+                                    activity.finishOrNext(RESULT_SKIP);
+                                }
+                            })
                     .setNegativeButton(R.string.wifi_dont_skip,
                             new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int id) {
-                        }
-                    })
+                                @Override
+                                public void onClick(DialogInterface dialog, int id) {
+                                }
+                            })
                     .create();
+            SetupWizardUtils.applyImmersiveFlags(dialog);
+            return dialog;
         }
     }
 }
diff --git a/wrap_alpha.py b/wrap_alpha.py
new file mode 100755
index 0000000..53db4eb
--- /dev/null
+++ b/wrap_alpha.py
@@ -0,0 +1,43 @@
+#!/usr/bin/python
+
+import os
+
+# assume everything needs alpha suffixes
+for root, dirs, files in os.walk('.'):
+    if "res/drawable-" not in root: continue
+
+    for before in files:
+        if "_alpha.png" in before: continue
+        if not before.startswith("ic_settings_"): continue
+
+        after = before.replace(".png", "_alpha.png")
+        os.rename(os.path.join(root, before), os.path.join(root, after))
+
+# build xml redirection
+for root, dirs, files in os.walk('.'):
+    if "res/drawable-" not in root: continue
+
+    for src in files:
+        if not src.endswith(".png"): continue
+        src = src[0:-4]
+
+        src_clause = '\n    android:src="@drawable/%s"' % (src)
+
+        alpha = src.endswith("_alpha")
+        if alpha:
+            src = src[0:-6]
+            alpha_clause = '\n    android:tint="?android:attr/colorAccent"'
+        else:
+            alpha_clause = ''
+
+        am = src.endswith("_am")
+        if am:
+            src = src[0:-3]
+            am_clause = '\n    android:autoMirrored="true"'
+        else:
+            am_clause = ''
+
+        with open("res/drawable/%s.xml" % (src), 'w') as xml:
+            xml.write("""<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"%s%s%s />
+""" % (src_clause, alpha_clause, am_clause))