diff --git a/Android.mk b/Android.mk
index 61734fb..537004e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,6 +1,16 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
+LOCAL_SRC_FILES := \
+        $(call all-logtags-files-under, src)
+
+LOCAL_MODULE := settings-logtags
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+# Build the Settings APK
+include $(CLEAR_VARS)
+
 LOCAL_JAVA_LIBRARIES := bouncycastle core-oj telephony-common ims-common
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-v4 \
@@ -9,13 +19,13 @@
     android-support-v7-preference \
     android-support-v7-appcompat \
     android-support-v14-preference \
-    jsr305
+    jsr305 \
+    settings-logtags
 
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := \
-        $(call all-java-files-under, src) \
-        src/com/android/settings/EventLogTags.logtags
+        $(call all-java-files-under, src)
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \
     frameworks/support/v7/preference/res \
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bb4395f..29a7495 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -81,6 +81,7 @@
     <uses-permission android:name="android.permission.CHANGE_APP_IDLE_STATE" />
     <uses-permission android:name="android.permission.PEERS_MAC_ADDRESS"/>
     <uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.DELETE_PACKAGES"/>
 
     <application android:label="@string/settings_label"
             android:icon="@mipmap/ic_launcher_settings"
@@ -119,6 +120,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts"/>
         </activity-alias>
 
         <activity android:name=".Settings$WirelessSettings"
@@ -851,29 +853,23 @@
                   android:label="@string/wallpaper_settings_fragment_title"
                   android:icon="@drawable/ic_wallpaper"
                   android:taskAffinity="">
-            <intent-filter android:priority="1">
-                <action android:name="android.settings.WALLPAPER_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                        android:value="com.android.settings.WallpaperTypeSettings" />
         </activity>
 
-        <activity android:name="Settings$WallpaperSuggestionActivity"
-                android:label="@string/wallpaper_settings_title"
-                android:exported="true"
-                android:icon="@drawable/ic_wallpaper"
-                android:taskAffinity="">
+        <activity android:name="WallpaperSuggestionActivity"
+                  android:label="@string/wallpaper_settings_title"
+                  android:icon="@drawable/ic_wallpaper"
+                  android:exported="true"
+                  android:theme="@android:style/Theme.NoDisplay">
             <intent-filter android:priority="1">
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="com.android.settings.suggested.category.SETTINGS_ONLY" />
             </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.WallpaperTypeSettings" />
             <meta-data android:name="com.android.settings.title"
-                android:resource="@string/wallpaper_suggestion_title" />
+                       android:resource="@string/wallpaper_suggestion_title" />
             <meta-data android:name="com.android.settings.summary"
-                android:resource="@string/wallpaper_suggestion_summary" />
+                       android:resource="@string/wallpaper_suggestion_summary" />
         </activity>
 
         <activity android:name="Settings$ZenModeScheduleRuleSettingsActivity"
@@ -1585,7 +1581,7 @@
             android:enabled="false"
             android:exported="true"
             android:taskAffinity="com.android.wizard"
-            android:theme="@style/SetupWizardDisableAppStartingTheme"
+            android:theme="@style/SuwThemeGlif.Light"
             android:icon="@drawable/ic_suggested_notifications">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1599,7 +1595,8 @@
                        android:resource="@string/notification_suggestion_summary" />
         </activity>
 
-        <activity android:name=".notification.RedactionInterstitial"/>
+        <activity android:name=".notification.RedactionInterstitial"
+            android:theme="@style/SetupWizardTheme.Light" />
 
         <activity android:name=".notification.RedactionSettingsStandalone"
                   android:exported="true">
@@ -1646,7 +1643,7 @@
         <activity android:name=".fingerprint.SetupFingerprintEnrollIntroduction"
             android:exported="true"
             android:permission="android.permission.MANAGE_FINGERPRINT"
-            android:theme="@style/SetupWizardDisableAppStartingTheme">
+            android:theme="@style/SetupWizardTheme.Light">
             <intent-filter>
                 <action android:name="android.settings.FINGERPRINT_SETUP" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1666,7 +1663,7 @@
 
         <activity android:name="SetupChooseLockGeneric"
             android:taskAffinity="com.android.wizard"
-            android:theme="@style/SetupWizardDisableAppStartingTheme"
+            android:theme="@style/SetupWizardTheme.Light"
             android:label="@string/lock_settings_picker_title">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.SETUP_LOCK_SCREEN" />
@@ -1724,25 +1721,30 @@
         <activity android:name="SetupChooseLockPattern"
             android:exported="false"
             android:taskAffinity="com.android.wizard"
-            android:theme="@style/SetupWizardDisableAppStartingTheme" />
+            android:theme="@style/SetupWizardTheme.Light" />
 
-        <activity android:name="ChooseLockPattern" android:exported="false"/>
+        <activity android:name="ChooseLockPattern"
+            android:exported="false"
+            android:theme="@style/SetupWizardTheme.Light" />
 
         <activity android:name="SetupChooseLockPassword"
             android:exported="false"
             android:taskAffinity="com.android.wizard"
-            android:theme="@style/SetupWizardDisableAppStartingTheme"
+            android:theme="@style/SetupWizardTheme.Light"
             android:windowSoftInputMode="stateVisible|adjustResize" />
 
-        <activity android:name="ChooseLockPassword" android:exported="false"
+        <activity android:name="ChooseLockPassword"
+            android:exported="false"
+            android:theme="@style/SetupWizardTheme.Light"
             android:windowSoftInputMode="stateVisible|adjustResize"/>
 
         <activity android:name=".SetupEncryptionInterstitial"
             android:label="@string/encryption_interstitial_header"
             android:taskAffinity="com.android.wizard"
-            android:theme="@style/SetupWizardDisableAppStartingTheme"/>
+            android:theme="@style/SetupWizardTheme.Light"/>
 
-        <activity android:name=".EncryptionInterstitial"/>
+        <activity android:name=".EncryptionInterstitial"
+            android:theme="@style/SetupWizardTheme.Light" />
 
         <!-- Runs in the phone process since it needs access to the Phone object -->
         <activity android:name=".Settings$StatusActivity"
@@ -1990,7 +1992,7 @@
                   android:label="@string/bluetooth_pairing_request"
                   android:excludeFromRecents="true"
                   android:windowSoftInputMode="stateVisible|adjustResize"
-                  android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
+                  android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
             <intent-filter android:priority="1">
                 <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2685,7 +2687,7 @@
 
         <!-- Show regulatory info (from settings item or dialing "*#07#") -->
         <activity android:name="RegulatoryInfoDisplayActivity"
-                  android:label="@string/regulatory_information"
+                  android:label="@string/regulatory_labels"
                   android:taskAffinity=""
                   android:enabled="@bool/config_show_regulatory_info">
             <intent-filter>
@@ -2917,6 +2919,49 @@
                 android:value="true" />
         </activity>
 
+        <!-- activity for gesture settings -->
+        <activity android:name="Settings$GestureSettingsActivity"
+                  android:label="@string/gesture_preference_title"
+                  android:icon="@drawable/ic_settings_gestures"
+                  android:taskAffinity="">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.android.settings.SHORTCUT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                       android:value="com.android.settings.category.device" />
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.gestures.GestureSettings" />
+        </activity>
+
+        <activity android:name="BackupSettingsActivity"
+                  android:label="@string/privacy_settings_title"
+                  android:icon="@drawable/ic_settings_backup"
+                  android:theme="@android:style/Theme.NoDisplay"
+                  android:taskAffinity="com.android.settings"
+                  android:parentActivityName="Settings">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.PRIVACY_SETTINGS" />
+                <action android:name="android.settings.BACKUP_AND_RESET_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="android.intent.category.VOICE_LAUNCH" />
+            </intent-filter>
+            <intent-filter android:priority="-2">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                       android:value="com.android.settings.category.personal" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                       android:value="true" />
+        </activity>
+
         <service
             android:name=".SettingsDumpService"
             android:exported="true"
@@ -2976,6 +3021,7 @@
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
         </service>
+
         <!-- This is the longest AndroidManifest.xml ever. -->
     </application>
 </manifest>
diff --git a/proguard.flags b/proguard.flags
index 3c3300e..f3c218a 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -17,6 +17,7 @@
 -keep class com.android.settings.users.*
 -keep class com.android.settings.nfc.*
 -keep class com.android.settings.notification.*
+-keep class com.android.settings.overlay.FeatureFactoryImpl
 -keep class com.android.settings.accessibility.*FragmentForSetupWizard
 -keep class com.android.settings.display.*FragmentForSetupWizard
 
diff --git a/res/values-sw360dp/aliases.xml b/res/color/sliding_tab_title_text_color.xml
similarity index 69%
copy from res/values-sw360dp/aliases.xml
copy to res/color/sliding_tab_title_text_color.xml
index a10585b..925ab97 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/color/sliding_tab_title_text_color.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<!--
+     Copyright (C) 2016 Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,7 +15,8 @@
      limitations under the License.
 -->
 
-<resources>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
-</resources>
-
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="false"
+          android:color="#b3ffffff"/>
+    <item android:color="@android:color/white"/>
+</selector>
diff --git a/res/drawable-hdpi/ic_bt_config.png b/res/drawable-hdpi/ic_bt_config.png
deleted file mode 100644
index a204936..0000000
--- a/res/drawable-hdpi/ic_bt_config.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_bt_imaging.png b/res/drawable-hdpi/ic_bt_imaging.png
deleted file mode 100644
index 62624ee..0000000
--- a/res/drawable-hdpi/ic_bt_imaging.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_bt_laptop.png b/res/drawable-hdpi/ic_bt_laptop.png
deleted file mode 100644
index 42c3dc5..0000000
--- a/res/drawable-hdpi/ic_bt_laptop.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_lockscreen_ime.png b/res/drawable-hdpi/ic_lockscreen_ime.png
deleted file mode 100644
index 70d35bf..0000000
--- a/res/drawable-hdpi/ic_lockscreen_ime.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_add_dark.png b/res/drawable-hdpi/ic_menu_add_dark.png
deleted file mode 100644
index 40a26b1..0000000
--- a/res/drawable-hdpi/ic_menu_add_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_add_light.png b/res/drawable-hdpi/ic_menu_add_light.png
deleted file mode 100644
index 91b0354..0000000
--- a/res/drawable-hdpi/ic_menu_add_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_add_white.png b/res/drawable-hdpi/ic_menu_add_white.png
deleted file mode 100644
index 7638c64..0000000
--- a/res/drawable-hdpi/ic_menu_add_white.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_sysbar_quicksettings.png b/res/drawable-hdpi/ic_sysbar_quicksettings.png
deleted file mode 100644
index a204936..0000000
--- a/res/drawable-hdpi/ic_sysbar_quicksettings.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_bt_config.png b/res/drawable-mdpi/ic_bt_config.png
deleted file mode 100644
index d266b39..0000000
--- a/res/drawable-mdpi/ic_bt_config.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_bt_imaging.png b/res/drawable-mdpi/ic_bt_imaging.png
deleted file mode 100644
index 76234a6..0000000
--- a/res/drawable-mdpi/ic_bt_imaging.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_bt_laptop.png b/res/drawable-mdpi/ic_bt_laptop.png
deleted file mode 100644
index 792e8df..0000000
--- a/res/drawable-mdpi/ic_bt_laptop.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_lockscreen_ime.png b/res/drawable-mdpi/ic_lockscreen_ime.png
deleted file mode 100644
index 3216776..0000000
--- a/res/drawable-mdpi/ic_lockscreen_ime.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_add_dark.png b/res/drawable-mdpi/ic_menu_add_dark.png
deleted file mode 100644
index d7aa774..0000000
--- a/res/drawable-mdpi/ic_menu_add_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_add_light.png b/res/drawable-mdpi/ic_menu_add_light.png
deleted file mode 100644
index 8b55810..0000000
--- a/res/drawable-mdpi/ic_menu_add_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_add_white.png b/res/drawable-mdpi/ic_menu_add_white.png
deleted file mode 100644
index 40cdc82..0000000
--- a/res/drawable-mdpi/ic_menu_add_white.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_sysbar_quicksettings.png b/res/drawable-mdpi/ic_sysbar_quicksettings.png
deleted file mode 100644
index d266b39..0000000
--- a/res/drawable-mdpi/ic_sysbar_quicksettings.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_config.png b/res/drawable-xhdpi/ic_bt_config.png
deleted file mode 100644
index 46077be..0000000
--- a/res/drawable-xhdpi/ic_bt_config.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_imaging.png b/res/drawable-xhdpi/ic_bt_imaging.png
deleted file mode 100644
index 9ea3b85..0000000
--- a/res/drawable-xhdpi/ic_bt_imaging.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_laptop.png b/res/drawable-xhdpi/ic_bt_laptop.png
deleted file mode 100644
index 1c053c8..0000000
--- a/res/drawable-xhdpi/ic_bt_laptop.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_lockscreen_ime.png b/res/drawable-xhdpi/ic_lockscreen_ime.png
deleted file mode 100644
index 02cc3af..0000000
--- a/res/drawable-xhdpi/ic_lockscreen_ime.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_add_dark.png b/res/drawable-xhdpi/ic_menu_add_dark.png
deleted file mode 100644
index 2f00b96..0000000
--- a/res/drawable-xhdpi/ic_menu_add_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_add_light.png b/res/drawable-xhdpi/ic_menu_add_light.png
deleted file mode 100644
index 4109b2c..0000000
--- a/res/drawable-xhdpi/ic_menu_add_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_add_white.png b/res/drawable-xhdpi/ic_menu_add_white.png
deleted file mode 100644
index 1d53989..0000000
--- a/res/drawable-xhdpi/ic_menu_add_white.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sysbar_quicksettings.png b/res/drawable-xhdpi/ic_sysbar_quicksettings.png
deleted file mode 100644
index 46077be..0000000
--- a/res/drawable-xhdpi/ic_sysbar_quicksettings.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_bt_config.png b/res/drawable-xxhdpi/ic_bt_config.png
deleted file mode 100644
index ad964b4..0000000
--- a/res/drawable-xxhdpi/ic_bt_config.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_bt_imaging.png b/res/drawable-xxhdpi/ic_bt_imaging.png
deleted file mode 100644
index a0058dc..0000000
--- a/res/drawable-xxhdpi/ic_bt_imaging.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_bt_laptop.png b/res/drawable-xxhdpi/ic_bt_laptop.png
deleted file mode 100644
index bca7145..0000000
--- a/res/drawable-xxhdpi/ic_bt_laptop.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_lockscreen_ime.png b/res/drawable-xxhdpi/ic_lockscreen_ime.png
deleted file mode 100644
index f23b0e7..0000000
--- a/res/drawable-xxhdpi/ic_lockscreen_ime.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_add_dark.png b/res/drawable-xxhdpi/ic_menu_add_dark.png
deleted file mode 100644
index 0ab6a40..0000000
--- a/res/drawable-xxhdpi/ic_menu_add_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_add_light.png b/res/drawable-xxhdpi/ic_menu_add_light.png
deleted file mode 100644
index 767b808..0000000
--- a/res/drawable-xxhdpi/ic_menu_add_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_add_white.png b/res/drawable-xxhdpi/ic_menu_add_white.png
deleted file mode 100644
index 16a8b8a..0000000
--- a/res/drawable-xxhdpi/ic_menu_add_white.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_sysbar_quicksettings.png b/res/drawable-xxhdpi/ic_sysbar_quicksettings.png
deleted file mode 100644
index ad964b4..0000000
--- a/res/drawable-xxhdpi/ic_sysbar_quicksettings.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_bt_config.png b/res/drawable-xxxhdpi/ic_bt_config.png
deleted file mode 100644
index e89d484..0000000
--- a/res/drawable-xxxhdpi/ic_bt_config.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_bt_imaging.png b/res/drawable-xxxhdpi/ic_bt_imaging.png
deleted file mode 100644
index f0ffb52..0000000
--- a/res/drawable-xxxhdpi/ic_bt_imaging.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_bt_laptop.png b/res/drawable-xxxhdpi/ic_bt_laptop.png
deleted file mode 100644
index 2d758bd..0000000
--- a/res/drawable-xxxhdpi/ic_bt_laptop.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_lockscreen_ime.png b/res/drawable-xxxhdpi/ic_lockscreen_ime.png
deleted file mode 100644
index 2eb8a92..0000000
--- a/res/drawable-xxxhdpi/ic_lockscreen_ime.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_menu_add_dark.png b/res/drawable-xxxhdpi/ic_menu_add_dark.png
deleted file mode 100644
index 01f53fe..0000000
--- a/res/drawable-xxxhdpi/ic_menu_add_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_menu_add_white.png b/res/drawable-xxxhdpi/ic_menu_add_white.png
deleted file mode 100644
index 27a15f5..0000000
--- a/res/drawable-xxxhdpi/ic_menu_add_white.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_sysbar_quicksettings.png b/res/drawable-xxxhdpi/ic_sysbar_quicksettings.png
deleted file mode 100644
index e89d484..0000000
--- a/res/drawable-xxxhdpi/ic_sysbar_quicksettings.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/selectable_card.xml b/res/drawable/fallback_home_unprovisioned_background.xml
similarity index 71%
rename from res/drawable/selectable_card.xml
rename to res/drawable/fallback_home_unprovisioned_background.xml
index 554b9f6..9ec3874 100644
--- a/res/drawable/selectable_card.xml
+++ b/res/drawable/fallback_home_unprovisioned_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2015 The Android Open Source Project
+  ~ Copyright (C) 2016 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -15,7 +15,5 @@
   ~ limitations under the License
   -->
 
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:attr/colorControlHighlight" >
-    <item android:drawable="@color/card_background"/>
-</ripple>
+<color xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="#000000" />
\ No newline at end of file
diff --git a/res/drawable/ic_bt_imaging.xml b/res/drawable/ic_bt_imaging.xml
new file mode 100644
index 0000000..01e78c0
--- /dev/null
+++ b/res/drawable/ic_bt_imaging.xml
@@ -0,0 +1,27 @@
+<!--
+     Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?android:attr/colorAccent">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,8L5,8c-1.66,0 -3,1.34 -3,3v6h4v4h12v-4h4v-6c0,-1.66 -1.34,-3
+            -3,-3zM16,19L8,19v-5h8v5zM19,12c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1
+            -1,1zM18,3L6,3v4h12L18,3z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_bt_laptop.xml b/res/drawable/ic_bt_laptop.xml
new file mode 100644
index 0000000..bf2fd49
--- /dev/null
+++ b/res/drawable/ic_bt_laptop.xml
@@ -0,0 +1,26 @@
+<!--
+     Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?android:attr/colorAccent">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,18c1.1,0 2,-0.9 2,-2V6c0,-1.1 -0.9,-2 -2,-2H4c-1.1,0
+            -2,0.9 -2,2v10c0,1.1 0.9,2 2,2H0v2h24v-2h-4zM4,6h16v10H4V6z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_call_24dp.xml b/res/drawable/ic_call_24dp.xml
new file mode 100644
index 0000000..26bbde5
--- /dev/null
+++ b/res/drawable/ic_call_24dp.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorAccent">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M6.62,10.79c1.44,2.83 3.76,5.14 6.59,6.59l2.2,-2.2c0.27,-0.27 0.67,-0.36
+        1.02,-0.24 1.12,0.37 2.33,0.57 3.57,0.57 0.55,0 1,0.45 1,1V20c0,0.55 -0.45,1 -1,1 -9.39,0
+         -17,-7.61 -17,-17 0,-0.55 0.45,-1 1,-1h3.5c0.55,0 1,0.45 1,1 0,1.25 0.2,2.45 0.57,3.57
+         0.11,0.35 0.03,0.74 -0.25,1.02l-2.2,2.2z"/>
+</vector>
diff --git a/res/drawable/ic_fingerprint_header.xml b/res/drawable/ic_fingerprint_header.xml
new file mode 100644
index 0000000..e7ac81a
--- /dev/null
+++ b/res/drawable/ic_fingerprint_header.xml
@@ -0,0 +1,38 @@
+<!--
+    Copyright (C) 2016 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:tint="?android:attr/colorPrimary"
+    android:viewportHeight="32.0"
+    android:viewportWidth="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_gesture_play_button.xml b/res/drawable/ic_gesture_play_button.xml
new file mode 100644
index 0000000..e2fa6e0
--- /dev/null
+++ b/res/drawable/ic_gesture_play_button.xml
@@ -0,0 +1,25 @@
+<!--
+    Copyright (C) 2016 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,
+            16.5v-9l6,4.5 -6,4.5z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_help_24dp.xml b/res/drawable/ic_help_24dp.xml
new file mode 100644
index 0000000..d80b717
--- /dev/null
+++ b/res/drawable/ic_help_24dp.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?android:attr/colorAccent">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,19.59V8l-6,-6H6c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2
+        1.99,2H18c0.45,0 0.85,-0.15 1.19,-0.4l-4.43,-4.43c-0.8,0.52 -1.74,0.83 -2.76,0.83 -2.76,0
+         -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5c0,1.02 -0.31,1.96 -0.83,2.75L20,19.59zM9,13c0,1.66
+          1.34,3 3,3s3,-1.34 3,-3 -1.34,-3 -3,-3 -3,1.34 -3,3z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_lightbulb_outline_24.xml b/res/drawable/ic_lightbulb_outline_24.xml
new file mode 100644
index 0000000..89cf8fa
--- /dev/null
+++ b/res/drawable/ic_lightbulb_outline_24.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?android:attr/colorAccent">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,21c0,0.55 0.45,1 1,1h4c0.55,0 1,-0.45 1,-1v-1L9,20v1zM12,2C8.14,2
+            5,5.14 5,9c0,2.38 1.19,4.47 3,5.74L8,17c0,0.55 0.45,1 1,1h6c0.55,0 1,-0.45
+            1,-1v-2.26c1.81,-1.27 3,-3.36 3,-5.74 0,-3.86 -3.14,-7
+            -7,-7zM14.85,13.1l-0.85,0.6L14,16h-4v-2.3l-0.85,-0.6C7.8,12.16 7,10.63 7,9c0,-2.76
+            2.24,-5 5,-5s5,2.24 5,5c0,1.63 -0.8,3.16 -2.15,4.1z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_lock.xml b/res/drawable/ic_lock.xml
new file mode 100644
index 0000000..975cbf5
--- /dev/null
+++ b/res/drawable/ic_lock.xml
@@ -0,0 +1,24 @@
+<!--
+    Copyright (C) 2016 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+    <path
+        android:fillColor="?android:attr/colorPrimary"
+        android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z" />
+</vector>
diff --git a/res/drawable/ic_menu_add.xml b/res/drawable/ic_menu_add.xml
index ed58072..3387f29 100644
--- a/res/drawable/ic_menu_add.xml
+++ b/res/drawable/ic_menu_add.xml
@@ -15,6 +15,13 @@
      limitations under the License.
 -->
 
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ic_menu_add_white"
-    android:tint="?android:attr/colorAccent" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?android:attr/colorAccent">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/res/values-sw360dp/aliases.xml b/res/drawable/ic_menu_add_white.xml
similarity index 62%
copy from res/values-sw360dp/aliases.xml
copy to res/drawable/ic_menu_add_white.xml
index a10585b..9a06d5c 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/drawable/ic_menu_add_white.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<!--
+     Copyright (C) 2016 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,7 +15,12 @@
      limitations under the License.
 -->
 
-<resources>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
-</resources>
-
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/res/drawable/ic_settings.xml b/res/drawable/ic_settings.xml
new file mode 100644
index 0000000..439c1a7
--- /dev/null
+++ b/res/drawable/ic_settings.xml
@@ -0,0 +1,36 @@
+<!--
+     Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?android:attr/colorAccent">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66
+            -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3
+            -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2
+            14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59
+            -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49
+            0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66
+            0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3
+            0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42
+            0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25
+            1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49
+            -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57
+            -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
+</vector>
diff --git a/res/drawable/ic_settings_gestures.xml b/res/drawable/ic_settings_gestures.xml
new file mode 100644
index 0000000..9537bed
--- /dev/null
+++ b/res/drawable/ic_settings_gestures.xml
@@ -0,0 +1,25 @@
+<!--
+    Copyright (C) 2016 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorAccent">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,11.24L9,7.5C9,6.12 10.12,5 11.5,5S14,6.12 14,7.5v3.74c1.21,-0.81 2,-2.18 2,-3.74C16,5.01 13.99,3 11.5,3S7,5.01 7,7.5c0,1.56 0.79,2.93 2,3.74zM18.84,15.87l-4.54,-2.26c-0.17,-0.07 -0.35,-0.11 -0.54,-0.11L13,13.5v-6c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,6.67 10,7.5v10.74l-3.43,-0.72c-0.08,-0.01 -0.15,-0.03 -0.24,-0.03 -0.31,0 -0.59,0.13 -0.79,0.33l-0.79,0.8 4.94,4.94c0.27,0.27 0.65,0.44 1.06,0.44h6.79c0.75,0 1.33,-0.55 1.44,-1.28l0.75,-5.27c0.01,-0.07 0.02,-0.14 0.02,-0.2 0,-0.62 -0.38,-1.16 -0.91,-1.38z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_shortcut_battery.xml b/res/drawable/ic_shortcut_battery.xml
new file mode 100644
index 0000000..36bffa2
--- /dev/null
+++ b/res/drawable/ic_shortcut_battery.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <bitmap android:src="@drawable/shortcut_base" />
+    </item>
+    <item>
+        <inset android:inset="19.2dp">
+            <vector android:width="24.0dp"
+                    android:height="24.0dp"
+                    android:viewportWidth="24.0"
+                    android:viewportHeight="24.0">
+                <path
+                    android:fillColor="@color/icon_accent"
+                    android:pathData="M15.67,4.0L14.0,4.0L14.0,2.0l-4.0,0.0l0.0,2.0L8.33,4.0C7.6,4.0 7.0,4.6 7.0,5.33l0.0,15.33C7.0,21.4 7.6,22.0 8.33,22.0l7.33,0.0c0.74,0.0 1.34,-0.6 1.34,-1.33L17.0,5.33C17.0,4.6 16.4,4.0 15.67,4.0z
+                    M16,5l0,5.5l-8,0l0,-5.5l3,0l0,-2l2,0l0,2l3,0z"/>
+            </vector>
+        </inset>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/ic_shortcut_data_usage.xml b/res/drawable/ic_shortcut_data_usage.xml
new file mode 100644
index 0000000..d1d4cac
--- /dev/null
+++ b/res/drawable/ic_shortcut_data_usage.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <bitmap android:src="@drawable/shortcut_base" />
+    </item>
+    <item>
+        <inset android:inset="19.2dp">
+            <vector android:width="24.0dp"
+                    android:height="24.0dp"
+                    android:viewportWidth="24.0"
+                    android:viewportHeight="24.0">
+                <path
+                    android:fillColor="@color/icon_accent"
+                    android:pathData="M26.0,4.1
+                    l0.0,6.06
+                    c6.7,0.97 12.0,6.79 12.0,13.84
+                    0.0,1.79 -0.35,3.5 -0.96,5.07
+                    l5.2,3.07
+                    C43.35,29.65 44.0,26.91 44.0,24.0
+                    c0.0,-10.37 -7.89,-18.89 -18.0,-19.9z
+                    M24.0,38.0
+                    c-7.73,0.0 -14.0,-6.27 -14.0,-14.0 0.0,-7.05 5.22,-12.87 12.0,-13.84
+                    l0.0,-6
+                    C11.88,5.1 4.0,13.63 4.0,24.0
+                    c0.0,11.05 8.94,20.0 19.99,20.0 6.62,0.0 12.47,-3.23 16.11,-8.18
+                    l-5.19,-3.06
+                    C32.35,35.95 28.42,38.0 24.0,38.0z"/>
+            </vector>
+        </inset>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/ic_shortcut_display.xml b/res/drawable/ic_shortcut_display.xml
new file mode 100644
index 0000000..9053f5f
--- /dev/null
+++ b/res/drawable/ic_shortcut_display.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <bitmap android:src="@drawable/shortcut_base" />
+    </item>
+    <item>
+        <inset android:inset="19.2dp">
+            <vector android:width="24.0dp"
+                    android:height="24.0dp"
+                    android:viewportWidth="24.0"
+                    android:viewportHeight="24.0">
+                <path
+                    android:fillColor="@color/icon_accent"
+                    android:pathData="M20.0,15.31L23.31,12.0 20.0,8.69L20.0,4.0l-4.69,0.0L12.0,0.69 8.69,4.0L4.0,4.0l0.0,4.69L0.69,12.0 4.0,15.31L4.0,20.0l4.69,0.0L12.0,23.31 15.31,20.0L20.0,20.0l0.0,-4.69zM12.0,18.0L12.0,6.0c3.31,0.0 6.0,2.69 6.0,6.0s-2.69,6.0 -6.0,6.0z"/>
+            </vector>
+        </inset>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/ic_shortcut_storage.xml b/res/drawable/ic_shortcut_storage.xml
new file mode 100644
index 0000000..0729d1d
--- /dev/null
+++ b/res/drawable/ic_shortcut_storage.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <bitmap android:src="@drawable/shortcut_base" />
+    </item>
+    <item>
+        <inset android:inset="19.2dp">
+            <vector android:width="24.0dp"
+                    android:height="24.0dp"
+                    android:viewportWidth="24.0"
+                    android:viewportHeight="24.0">
+                <path
+                    android:fillColor="@color/icon_accent"
+                    android:pathData="M2.0,20.0l20.0,0.0l0.0,-4.0L2.0,16.0l0.0,4.0zm2.0,-3.0l2.0,0.0l0.0,2.0L4.0,19.0l0.0,-2.0zM2.0,4.0l0.0,4.0l20.0,0.0L22.0,4.0L2.0,4.0zm4.0,3.0L4.0,7.0L4.0,5.0l2.0,0.0l0.0,2.0zm-4.0,7.0l20.0,0.0l0.0,-4.0L2.0,10.0l0.0,4.0zm2.0,-3.0l2.0,0.0l0.0,2.0L4.0,13.0l0.0,-2.0z"/>
+            </vector>
+        </inset>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/ic_shortcut_wireless.xml b/res/drawable/ic_shortcut_wireless.xml
new file mode 100644
index 0000000..1c4d1d7
--- /dev/null
+++ b/res/drawable/ic_shortcut_wireless.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <bitmap android:src="@drawable/shortcut_base" />
+    </item>
+    <item>
+        <inset android:inset="19.2dp">
+            <vector android:width="24.0dp"
+                    android:height="24.0dp"
+                    android:viewportWidth="24.0"
+                    android:viewportHeight="24.0">
+                <path
+                    android:fillColor="@color/icon_accent"
+                    android:pathData="M9.01,15.99l8.8,-10.96C17.47,4.77 14.08,2.0 9.0,2.0S0.53,4.7 0.19,5.03l8.8,10.96l0.02,0.0z"/>
+            </vector>
+        </inset>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/values-sw360dp/aliases.xml b/res/drawable/selectable_card_grey.xml
similarity index 69%
copy from res/values-sw360dp/aliases.xml
copy to res/drawable/selectable_card_grey.xml
index a10585b..e4c73ba 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/drawable/selectable_card_grey.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<!--
+     Copyright (C) 2016 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,7 +15,8 @@
      limitations under the License.
 -->
 
-<resources>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
-</resources>
-
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item android:drawable="@color/card_background_grey"/>
+</ripple>
diff --git a/res/drawable/switchbar_background.xml b/res/drawable/switchbar_background.xml
index ac340be..a58f2e9 100644
--- a/res/drawable/switchbar_background.xml
+++ b/res/drawable/switchbar_background.xml
@@ -16,6 +16,6 @@
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
     android:color="?android:attr/colorControlHighlight">
-    <item android:drawable="@color/switchbar_background_color" />
+    <item android:drawable="?android:attr/colorSecondary" />
 </ripple>
 
diff --git a/res/layout-land/choose_lock_password.xml b/res/layout-land/choose_lock_password.xml
deleted file mode 100644
index f79de61..0000000
--- a/res/layout-land/choose_lock_password.xml
+++ /dev/null
@@ -1,100 +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.
-*/
--->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:gravity="center_horizontal">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            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"
-            />
-
-            <!-- 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|flagNoExtractUi"
-                android:gravity="center"
-                android:textSize="24sp"
-                style="@style/TextAppearance.PasswordEntry"
-            />
-        </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
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1">
-            <LinearLayout
-                style="@style/SecurityPreferenceButtonContainer"
-                android:orientation="horizontal"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true">
-
-                <!-- left : cancel -->
-                <Button android:id="@+id/cancel_button"
-                    style="@style/SecurityPreferenceButton"
-                    android:text="@string/lockpassword_cancel_label"/>
-
-                <!-- right : continue -->
-                <Button android:id="@+id/next_button"
-                    style="@style/SecurityPreferenceButton"
-                    android:text="@string/lockpassword_continue_label"/>
-
-            </LinearLayout>
-        </RelativeLayout>
-
-    </LinearLayout>
-
-</ScrollView>
diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml
index f048ba2..89e3d57 100644
--- a/res/layout-land/choose_lock_pattern.xml
+++ b/res/layout-land/choose_lock_pattern.xml
@@ -1,94 +1,141 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!--
+    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
+    Licensed under the Apache License, Version 2.0 (the "License")
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
-          http://www.apache.org/licenses/LICENSE-2.0
+        http://www.apache.org/licenses/LICENSE-2.0
 
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT 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="horizontal"
+<com.android.setupwizardlib.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:icon="@drawable/ic_lock"
+    android:layout="@layout/suw_glif_blank_template"
+    settings:suwHeaderText="@string/lock_settings_picker_title">
 
-    <!-- left side: instructions and messages -->
-    <LinearLayout
-            android:orientation="vertical"
+    <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
+        android:id="@+id/topLayout"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <!-- left side: instructions and messages -->
+        <LinearLayout
             android:layout_width="0dip"
             android:layout_height="match_parent"
             android:layout_weight="1.0"
-            >
+            android:layout_marginStart="?attr/suwMarginSides"
+            android:layout_marginBottom="@dimen/suw_content_frame_padding_bottom"
+            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"/>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
-        <!-- footer can show a message, or confirm / restart buttons -->
-        <RelativeLayout
+                <ImageView
+                    android:id="@+id/suw_layout_icon"
+                    style="@style/SuwGlifIcon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginEnd="0dp"
+                    android:src="@drawable/ic_lock" />
+
+                <TextView
+                    android:id="@+id/suw_layout_title"
+                    style="@style/SuwGlifHeaderTitle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginEnd="0dp" />
+
+            </LinearLayout>
+
+            <!-- header message -->
+            <TextView android:id="@+id/headerText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:gravity="start|bottom"
+                android:textSize="18sp" />
+
+            <!-- footer can show a message, or confirm / restart buttons -->
+            <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dip"
                 android:layout_weight="1.0">
 
-            <!-- confirm / restart buttons -->
-            <LinearLayout android:id="@+id/buttonContainer"
-                style="@style/SecurityPreferenceButtonContainer"
-                android:layout_centerHorizontal="true"
-                android:layout_alignParentBottom="true"
-                android:orientation="horizontal">
-
-                <!-- left / top button: skip, or re-try -->
-                <Button android:id="@+id/footerLeftButton"
-                    style="@style/SecurityPreferenceButton"
+                <!-- confirm / restart buttons -->
+                <LinearLayout android:id="@+id/buttonContainer"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/lockpattern_restart_button_text"/>
+                    android:layout_centerHorizontal="true"
+                    android:layout_alignParentBottom="true"
+                    android:orientation="horizontal">
 
-                <!-- right / bottom button: confirm or ok -->
-                <Button android:id="@+id/footerRightButton"
-                    style="@style/SecurityPreferenceButton"
-                    android:layout_width="match_parent"
+                    <!-- left / top button: skip, or re-try -->
+                    <Button android:id="@+id/footerLeftButton"
+                        style="@style/SetupWizardButton.Negative"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/lockpattern_restart_button_text" />
+
+                    <Space
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_weight="1" />
+
+                    <!-- right / bottom button: confirm or ok -->
+                    <Button android:id="@+id/footerRightButton"
+                        style="@style/SetupWizardButton.Positive"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/lockpattern_confirm_button_text" />
+
+                </LinearLayout>
+
+                <!-- message above buttons -->
+                <TextView android:id="@+id/footerText"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/lockpattern_confirm_button_text"/>
+                    android:layout_above="@+id/buttonContainer"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginBottom="4dip"
+                    android:textSize="14sp"
+                    android:visibility="gone" />
 
-            </LinearLayout>
+            </RelativeLayout>
 
-            <!-- message above buttons -->
-            <TextView android:id="@+id/footerText"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_above="@+id/buttonContainer"
-                android:layout_centerHorizontal="true"
-                android:layout_marginBottom="4dip"
-                android:textSize="14sp"/>
+        </LinearLayout>
 
-        </RelativeLayout>
-    </LinearLayout>
+        <!-- right side: lock pattern -->
+        <FrameLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1.0">
 
-    <View
-         android:background="@*android:drawable/code_lock_left"
-         android:layout_width="2dip"
-         android:layout_height="match_parent" />
+            <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:background="@color/lock_pattern_background" />
 
-    <!-- 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" />
+        </FrameLayout>
 
+    </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
 
-</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
-
+</com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout-land/fingerprint_enroll_enrolling.xml b/res/layout-land/fingerprint_enroll_enrolling.xml
index c72c029..8154d0c 100644
--- a/res/layout-land/fingerprint_enroll_enrolling.xml
+++ b/res/layout-land/fingerprint_enroll_enrolling.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
   -->
 
-<com.android.setupwizardlib.SetupWizardLayout
+<com.android.setupwizardlib.GlifLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/setup_wizard_layout"
     android:layout_width="match_parent"
@@ -33,17 +33,17 @@
 
         <!-- Both texts are kept as separate text views so it doesn't jump around in portrait.
              See layouts/fingerprint_enroll_enrolling_base.xml. -->
-        <FrameLayout
+        <RelativeLayout
             android:layout_width="0dp"
             android:layout_weight="1"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical">
+            android:layout_height="wrap_content">
 
             <TextView
                 style="@style/TextAppearance.FingerprintMessage"
                 android:id="@+id/start_message"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
                 android:text="@string/security_settings_fingerprint_enroll_start_message"/>
 
             <TextView
@@ -51,10 +51,21 @@
                 android:id="@+id/repeat_message"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
                 android:text="@string/security_settings_fingerprint_enroll_repeat_message"
                 android:visibility="invisible"/>
 
-        </FrameLayout>
+            <Button
+                android:id="@+id/skip_button"
+                style="@style/SetupWizardButton.Negative"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_marginBottom="8dp"
+                android:text="@string/skip_label"
+                android:visibility="gone" />
+
+        </RelativeLayout>
 
         <FrameLayout
             android:layout_width="0dp"
@@ -79,4 +90,4 @@
 
     </LinearLayout>
 
-</com.android.setupwizardlib.SetupWizardLayout>
+</com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout-land/fingerprint_enroll_find_sensor.xml b/res/layout-land/fingerprint_enroll_find_sensor.xml
index 81d1dac..1d923fa 100644
--- a/res/layout-land/fingerprint_enroll_find_sensor.xml
+++ b/res/layout-land/fingerprint_enroll_find_sensor.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
   -->
 
-<com.android.setupwizardlib.SetupWizardLayout
+<com.android.setupwizardlib.GlifLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/setup_wizard_layout"
     android:layout_width="match_parent"
@@ -45,13 +45,11 @@
                 android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
 
             <Button
-                style="@style/Button.FingerprintButton"
+                style="@style/SetupWizardButton.Positive"
                 android:id="@+id/next_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:layout_marginStart="-12dp"
-                android:gravity="start|center_vertical"
                 android:text="@string/fingerprint_enroll_button_next" />
         </LinearLayout>
 
@@ -70,4 +68,4 @@
 
     </LinearLayout>
 
-</com.android.setupwizardlib.SetupWizardLayout>
+</com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout-land/fingerprint_enroll_finish.xml b/res/layout-land/fingerprint_enroll_finish.xml
index e051f15..664123d 100644
--- a/res/layout-land/fingerprint_enroll_finish.xml
+++ b/res/layout-land/fingerprint_enroll_finish.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
   -->
 
-<com.android.setupwizardlib.SetupWizardLayout
+<com.android.setupwizardlib.GlifLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/setup_wizard_layout"
     android:layout_width="match_parent"
@@ -50,29 +50,32 @@
                 style="@style/TextAppearance.FingerprintMessage"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/suw_description_margin_top"
+                android:layout_marginTop="@dimen/suw_description_glif_margin_top"
                 android:text="@string/setup_fingerprint_enroll_finish_message_secondary"
                 android:textColor="?android:attr/textColorSecondary"
                 android:visibility="gone" />
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:layout_marginStart="-12dp"
                 android:orientation="horizontal">
 
                 <Button
-                    style="@style/Button.FingerprintButton"
+                    style="@style/SetupWizardButton.Negative"
                     android:id="@+id/add_another_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
-                    android:gravity="start|center_vertical"
                     android:text="@string/fingerprint_enroll_button_add" />
 
+                <Space
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_weight="1" />
+
                 <Button
-                    style="@style/Button.FingerprintButton"
+                    style="@style/SetupWizardButton.Positive"
                     android:id="@+id/next_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -100,4 +103,4 @@
 
     </LinearLayout>
 
-</com.android.setupwizardlib.SetupWizardLayout>
+</com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout-land/setup_choose_lock_pattern.xml b/res/layout-land/setup_choose_lock_pattern.xml
deleted file mode 100644
index 6ee8e81..0000000
--- a/res/layout-land/setup_choose_lock_pattern.xml
+++ /dev/null
@@ -1,113 +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.
--->
-
-<com.android.setupwizardlib.SetupWizardLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    settings:suwBackgroundTile="@drawable/setup_illustration_tile"
-    settings:suwHeaderText="@string/wifi_setup_wizard_title"
-    settings:suwIllustrationHorizontalTile="@drawable/setup_illustration_horizontal_tile"
-    settings:suwIllustrationImage="@drawable/setup_illustration_lock_screen">
-
-    <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
-        android:id="@+id/topLayout"
-        style="@style/SuwContentFrame"
-        android:clipChildren="false"
-        android:clipToPadding="false"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <!-- left side: instructions and messages -->
-        <LinearLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1.0"
-            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="start|bottom"
-                android:textSize="18sp" />
-
-            <Button android:id="@+id/retryButton"
-                style="@android:style/Widget.Material.Button.Borderless.Colored"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="start"
-                android:layout_marginStart="-12dp"
-                android:minWidth="0dp"
-                android:text="@string/lockpattern_retry_button_text" />
-
-            <!-- footer can show a message, or confirm / restart buttons -->
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dip"
-                android:layout_weight="1.0"
-                android:visibility="gone">
-
-                <!-- confirm / restart buttons -->
-                <LinearLayout android:id="@+id/buttonContainer"
-                    style="@style/SecurityPreferenceButtonContainer"
-                    android:layout_centerHorizontal="true"
-                    android:layout_alignParentBottom="true"
-                    android:orientation="horizontal">
-
-                    <!-- left / top button: skip, or re-try -->
-                    <Button android:id="@+id/footerLeftButton"
-                        style="@style/SecurityPreferenceButton"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/lockpattern_restart_button_text" />
-
-                    <!-- right / bottom button: confirm or ok -->
-                    <Button android:id="@+id/footerRightButton"
-                        style="@style/SecurityPreferenceButton"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/lockpattern_confirm_button_text" />
-
-                </LinearLayout>
-
-                <!-- message above buttons -->
-                <TextView android:id="@+id/footerText"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_above="@+id/buttonContainer"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginBottom="4dip"
-                    android:textSize="14sp"
-                    android:visibility="gone" />
-
-            </RelativeLayout>
-
-        </LinearLayout>
-
-        <!-- 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" />
-
-    </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
-
-</com.android.setupwizardlib.SetupWizardLayout>
diff --git a/res/layout-land/setup_fingerprint_enroll_find_sensor.xml b/res/layout-land/setup_fingerprint_enroll_find_sensor.xml
deleted file mode 100644
index 3873e00..0000000
--- a/res/layout-land/setup_fingerprint_enroll_find_sensor.xml
+++ /dev/null
@@ -1,73 +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
-  -->
-
-<com.android.setupwizardlib.SetupWizardLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/setup_wizard_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        style="?attr/fingerprint_layout_theme">
-
-    <LinearLayout
-            style="@style/SuwContentFrame"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="horizontal"
-            android:clipToPadding="false"
-            android:clipChildren="false"
-            android:paddingBottom="0dp">
-
-        <LinearLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:orientation="vertical">
-
-            <TextView
-                    style="@style/TextAppearance.FingerprintMessage"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
-
-            <Button
-                    style="@style/Button.FingerprintButton"
-                    android:id="@+id/next_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginStart="-12dp"
-                    android:gravity="start|center_vertical"
-                    android:text="@string/fingerprint_enroll_button_next" />
-        </LinearLayout>
-
-        <FrameLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent">
-
-            <include
-                    layout="@layout/fingerprint_enroll_find_sensor_graphic"
-                    android:layout_width="@dimen/fingerprint_find_sensor_graphic_size"
-                    android:layout_height="@dimen/fingerprint_find_sensor_graphic_size"
-                    android:layout_gravity="center"/>
-
-        </FrameLayout>
-
-    </LinearLayout>
-
-</com.android.setupwizardlib.SetupWizardLayout>
diff --git a/res/layout-sw600dp-land/choose_lock_password.xml b/res/layout-sw600dp-land/choose_lock_password.xml
deleted file mode 100644
index 199c9ac..0000000
--- a/res/layout-sw600dp-land/choose_lock_password.xml
+++ /dev/null
@@ -1,90 +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.
-*/
--->
-
-<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/textAppearanceLarge"
-        />
-
-        <!-- 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/choose_lock_pattern.xml b/res/layout-sw600dp-land/choose_lock_pattern.xml
deleted file mode 100644
index e0d9667..0000000
--- a/res/layout-sw600dp-land/choose_lock_pattern.xml
+++ /dev/null
@@ -1,88 +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="14dip">
-
-        <TextView android:id="@+id/headerText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    </ScrollView>
-
-    <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"/>
-
-    <!-- footer message -->
-    <TextView android:id="@+id/footerText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/headerText"
-        android:layout_marginTop="16dip"
-        android:layout_toEndOf="@id/lockPattern"
-        android:layout_marginStart="100dip"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:visibility="gone"/>
-
-    <!-- confirm / restart buttons -->
-    <LinearLayout android:id="@+id/buttonContainer"
-        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/footerLeftButton"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpattern_restart_button_text"/>
-
-        <!-- right / bottom button: confirm or ok -->
-        <Button android:id="@+id/footerRightButton"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpattern_confirm_button_text"/>
-
-    </LinearLayout>
-
-</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
-
diff --git a/res/layout-sw600dp/choose_lock_password.xml b/res/layout-sw600dp/choose_lock_password.xml
deleted file mode 100644
index ca8975e..0000000
--- a/res/layout-sw600dp/choose_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.
-*/
--->
-<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:lines="2"
-        android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-    <!-- 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>
diff --git a/res/layout-sw600dp/choose_lock_pattern.xml b/res/layout-sw600dp/choose_lock_pattern.xml
deleted file mode 100644
index 7733184..0000000
--- a/res/layout-sw600dp/choose_lock_pattern.xml
+++ /dev/null
@@ -1,85 +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">
-
-    <!-- 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"
-        android:visibility="gone"/>
-
-    <!-- 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"/>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            style="@style/SecurityPreferenceButtonContainer"
-            android:layout_alignParentEnd="true"
-            android:orientation="horizontal">
-
-            <!-- left / top button: skip, or re-try -->
-            <Button android:id="@+id/footerLeftButton"
-                style="@style/SecurityPreferenceButton"
-                android:text="@string/lockpattern_restart_button_text"/>
-
-            <!-- right / bottom button: confirm or ok -->
-            <Button android:id="@+id/footerRightButton"
-                style="@style/SecurityPreferenceButton"
-                android:text="@string/lockpattern_confirm_button_text"/>
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout/accessibility_settings_for_suw.xml b/res/layout/accessibility_settings_for_suw.xml
deleted file mode 100644
index d566811..0000000
--- a/res/layout/accessibility_settings_for_suw.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2016 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <FrameLayout
-        android:id="@+id/suw_main_content"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1" />
-
-    <com.android.setupwizardlib.view.NavigationBar
-        android:id="@+id/suw_navigation_bar"
-        style="@style/SuwNavBarTheme"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/suw_navbar_height"
-        android:accessibilityTraversalAfter="@id/suw_main_content" />
-
-</LinearLayout>
diff --git a/res/layout/app_item.xml b/res/layout/app_item.xml
index ea0008e..15a9014 100644
--- a/res/layout/app_item.xml
+++ b/res/layout/app_item.xml
@@ -60,6 +60,14 @@
         android:textColor="?android:attr/textColorSecondary"
         android:duplicateParentState="true" />
 
+    <Switch
+            android:id="@android:id/switch_widget"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:background="@null"
+            android:visibility="gone"/>
+
     <FrameLayout
         android:id="@android:id/widget_frame"
         android:layout_width="wrap_content"
diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml
index c13d150..99657b4 100644
--- a/res/layout/choose_lock_password.xml
+++ b/res/layout/choose_lock_password.xml
@@ -1,79 +1,97 @@
 <?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) 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="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:lines="2"
-        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    <!-- Password entry field -->
-    <EditText android:id="@+id/password_entry"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginStart="30dip"
-        android:layout_marginEnd="30dip"
-        android: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" />
+<com.android.setupwizardlib.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:icon="@drawable/ic_lock"
+    settings:suwHeaderText="@string/lockpassword_choose_your_password_header">
 
     <LinearLayout
-        style="@style/SecurityPreferenceButtonContainer"
-        android:orientation="horizontal">
+        style="@style/SuwContentFrame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
 
-        <!-- left : cancel -->
-        <Button android:id="@+id/cancel_button"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpassword_cancel_label"/>
+        <!-- header text ('Enter Pin') -->
+        <TextView android:id="@+id/headerText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:lines="2"
+            android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-        <!-- right : continue -->
-        <Button android:id="@+id/next_button"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpassword_continue_label"/>
+        <!-- Password entry field -->
+        <EditText android:id="@+id/password_entry"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:inputType="textPassword"
+            android:imeOptions="actionNext|flagNoExtractUi"
+            android:textSize="24sp"
+            style="@style/TextAppearance.PasswordEntry"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            android:gravity="end"
+            android:orientation="horizontal">
+
+            <!-- left : cancel -->
+            <Button android:id="@+id/cancel_button"
+                style="@style/SetupWizardButton.Negative"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/lockpassword_cancel_label" />
+
+            <Space
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <!-- right : continue -->
+            <Button android:id="@+id/next_button"
+                style="@style/SetupWizardButton.Positive"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/lockpassword_continue_label" />
+
+        </LinearLayout>
+
+        <!-- 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_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="#00000000"
+            android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
+            android:visibility="gone"/>
 
     </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"
-    />
-
-</LinearLayout>
+</com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout/choose_lock_pattern.xml b/res/layout/choose_lock_pattern.xml
deleted file mode 100644
index 94eecef..0000000
--- a/res/layout/choose_lock_pattern.xml
+++ /dev/null
@@ -1,78 +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">
-
-    <!-- takes up all space above button bar at bottom -->
-    <com.android.settings.widget.MatchParentShrinkingLinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1">
-
-        <TextView android:id="@+id/headerText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:minLines="2"
-            android:gravity="center"
-            android:textSize="18sp" />
-
-        <View
-             android:background="@*android:drawable/code_lock_top"
-             android:layout_width="match_parent"
-             android:layout_height="2dip" />
-
-        <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent" />
-
-        <!-- bottom line looks bad when button bar is their too, omit in this case -->
-        <!--View
-             android:background="@*android:drawable/code_lock_bottom"
-             android:layout_width="match_parent"
-             android:layout_height="8dip" /-->
-
-        <TextView android:id="@+id/footerText"
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:textSize="14sp"/>
-
-    </com.android.settings.widget.MatchParentShrinkingLinearLayout>
-
-    <LinearLayout
-        style="@style/SecurityPreferenceButtonContainer"
-        android:orientation="horizontal">
-
-        <!-- left : cancel, or re-try -->
-        <Button android:id="@+id/footerLeftButton"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpattern_tutorial_cancel_label"/>
-
-        <!-- right : confirm or ok -->
-        <Button android:id="@+id/footerRightButton"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpattern_tutorial_continue_label"/>
-
-    </LinearLayout>
-
-</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout/choose_lock_pattern_common.xml b/res/layout/choose_lock_pattern_common.xml
new file mode 100644
index 0000000..6557e6a
--- /dev/null
+++ b/res/layout/choose_lock_pattern_common.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2014 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License")
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- Used in phone portrait and tablet, as referenced in alias.xml. -->
+<com.android.setupwizardlib.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:icon="@drawable/ic_lock"
+    settings:suwHeaderText="@string/wifi_setup_wizard_title">
+
+    <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
+        android:id="@+id/topLayout"
+        style="@style/SuwContentFrame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <!-- takes up all space above button bar at bottom -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <TextView android:id="@+id/headerText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:minLines="2"
+                android:gravity="center"
+                android:textSize="18sp" />
+
+            <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+                android:layout_width="match_parent"
+                android:layout_height="0dip"
+                android:layout_weight="4" />
+
+            <!-- Buttons are hidden during setup, and use the buttons in setup navigation bar instead -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <!-- left : cancel, or re-try -->
+                <Button android:id="@+id/footerLeftButton"
+                    style="@style/SetupWizardButton.Negative"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/lockpattern_tutorial_cancel_label" />
+
+                <Space
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_weight="1" />
+
+                <!-- right : confirm or ok -->
+                <Button android:id="@+id/footerRightButton"
+                    style="@style/SetupWizardButton.Positive"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/lockpattern_tutorial_continue_label" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <TextView android:id="@+id/footerText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:minHeight="50dip"
+            android:textSize="14sp"
+            android:visibility="gone"/>
+
+    </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
+
+</com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout/condition_card.xml b/res/layout/condition_card.xml
index 5c82c7e..c911f03 100644
--- a/res/layout/condition_card.xml
+++ b/res/layout/condition_card.xml
@@ -42,7 +42,7 @@
                 android:id="@android:id/icon"
                 android:layout_width="24dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="36dp"
+                android:layout_marginEnd="32dp"
                 android:tint="?android:attr/textColorPrimaryInverse" />
 
             <TextView
@@ -69,7 +69,7 @@
             android:id="@+id/detail_group"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:paddingStart="60dp"
+            android:paddingStart="56dp"
             android:visibility="gone"
             android:orientation="vertical">
 
diff --git a/res/layout/dashboard_category.xml b/res/layout/dashboard_category.xml
index 7019a9c..b3500b2 100644
--- a/res/layout/dashboard_category.xml
+++ b/res/layout/dashboard_category.xml
@@ -21,8 +21,7 @@
     android:orientation="vertical"
     android:paddingBottom="8dip"
     android:background="@color/card_background"
-    android:importantForAccessibility="noHideDescendants"
-    android:elevation="@dimen/dashboard_category_elevation" >
+    android:importantForAccessibility="noHideDescendants">
 
     <TextView android:id="@android:id/title"
         android:layout_width="match_parent"
diff --git a/res/values-sw360dp/aliases.xml b/res/layout/dashboard_container.xml
similarity index 74%
rename from res/values-sw360dp/aliases.xml
rename to res/layout/dashboard_container.xml
index a10585b..4cab75c 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/layout/dashboard_container.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 
-<resources>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
-</resources>
-
+<android.support.v4.view.ViewPager
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
diff --git a/res/values-sw360dp/aliases.xml b/res/layout/dashboard_container_header.xml
similarity index 66%
copy from res/values-sw360dp/aliases.xml
copy to res/layout/dashboard_container_header.xml
index a10585b..a12f249 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/layout/dashboard_container_header.xml
@@ -14,7 +14,10 @@
      limitations under the License.
 -->
 
-<resources>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
-</resources>
-
+<com.android.settings.widget.SlidingTabLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/sliding_tabs"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/colorPrimary"/>
diff --git a/res/layout/dashboard_spacer.xml b/res/layout/dashboard_spacer.xml
index 19ef8ff..8d58c80 100644
--- a/res/layout/dashboard_spacer.xml
+++ b/res/layout/dashboard_spacer.xml
@@ -14,6 +14,8 @@
      limitations under the License.
 -->
 
-<View xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="6dp" />
+<View
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="8dp"
+    android:background="@color/card_background_grey"/>
diff --git a/res/layout/dashboard_tile.xml b/res/layout/dashboard_tile.xml
index a588ed4..1ec1730 100644
--- a/res/layout/dashboard_tile.xml
+++ b/res/layout/dashboard_tile.xml
@@ -19,12 +19,11 @@
     android:id="@+id/dashboard_tile"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
     android:gravity="center_vertical"
     android:minHeight="@dimen/dashboard_tile_minimum_height"
     android:clickable="true"
-    android:focusable="true"
-    android:background="@drawable/selectable_card"
-    android:elevation="@dimen/dashboard_category_elevation" >
+    android:focusable="true">
 
     <ImageView
         android:id="@android:id/icon"
diff --git a/res/layout/dream_info_row.xml b/res/layout/dream_info_row.xml
index 1a4dc8e..fd70ad5 100644
--- a/res/layout/dream_info_row.xml
+++ b/res/layout/dream_info_row.xml
@@ -89,6 +89,6 @@
         android:padding="8dip"
         android:clickable="true"
         android:focusable="true"
-        android:src="@drawable/ic_bt_config" />
+        android:src="@drawable/ic_settings" />
 
 </LinearLayout>
diff --git a/res/layout/encryption_interstitial_header.xml b/res/layout/encryption_interstitial_header.xml
index 8d36432..9601fa8 100644
--- a/res/layout/encryption_interstitial_header.xml
+++ b/res/layout/encryption_interstitial_header.xml
@@ -20,8 +20,9 @@
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:minHeight="56dp"
-    android:paddingTop="16dp"
+    android:paddingBottom="@dimen/suw_description_glif_margin_bottom_lists"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:paddingBottom="16dp"
-    android:textAppearance="?android:attr/textAppearanceMedium" />
+    android:paddingTop="@dimen/suw_description_glif_margin_top"
+    android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+    android:textAppearance="?android:attr/textAppearanceListItem" />
diff --git a/res/layout/fingerprint_enroll_enrolling_base.xml b/res/layout/fingerprint_enroll_enrolling_base.xml
index c93de4e..e9e3385 100644
--- a/res/layout/fingerprint_enroll_enrolling_base.xml
+++ b/res/layout/fingerprint_enroll_enrolling_base.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
   -->
 
-<com.android.setupwizardlib.SetupWizardLayout
+<com.android.setupwizardlib.GlifLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/setup_wizard_layout"
     android:layout_width="match_parent"
@@ -35,7 +35,7 @@
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/suw_description_margin_top">
+            android:layout_marginTop="@dimen/suw_description_glif_margin_top">
 
             <TextView
                 style="@style/TextAppearance.FingerprintMessage"
@@ -70,6 +70,14 @@
             android:accessibilityLiveRegion="polite"
             android:visibility="invisible"/>
 
+        <Button
+            android:id="@+id/skip_button"
+            style="@style/SetupWizardButton.Negative"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/skip_label"
+            android:visibility="gone" />
+
     </LinearLayout>
 
-</com.android.setupwizardlib.SetupWizardLayout>
+</com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout/fingerprint_enroll_find_sensor_base.xml b/res/layout/fingerprint_enroll_find_sensor_base.xml
index 3f69a0a..d38818b 100644
--- a/res/layout/fingerprint_enroll_find_sensor_base.xml
+++ b/res/layout/fingerprint_enroll_find_sensor_base.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
   -->
 
-<com.android.setupwizardlib.SetupWizardLayout
+<com.android.setupwizardlib.GlifLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/setup_wizard_layout"
     android:layout_width="match_parent"
@@ -47,7 +47,7 @@
                 style="@style/TextAppearance.FingerprintMessage"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/suw_description_margin_top"
+                android:layout_marginTop="@dimen/suw_description_glif_margin_top"
                 android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
 
             <View
@@ -56,16 +56,14 @@
                 android:layout_weight="1"/>
 
             <Button
-                style="@style/Button.FingerprintButton"
+                style="@style/SetupWizardButton.Positive"
                 android:id="@+id/next_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="4dp"
-                android:layout_marginEnd="-12dp"
                 android:layout_gravity="end"
-                android:gravity="end|center_vertical"
                 android:text="@string/fingerprint_enroll_button_next" />
 
         </LinearLayout>
     </FrameLayout>
-</com.android.setupwizardlib.SetupWizardLayout>
+</com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout/fingerprint_enroll_finish_base.xml b/res/layout/fingerprint_enroll_finish_base.xml
index 15ee22a..bcbbadf 100644
--- a/res/layout/fingerprint_enroll_finish_base.xml
+++ b/res/layout/fingerprint_enroll_finish_base.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
   -->
 
-<com.android.setupwizardlib.SetupWizardLayout
+<com.android.setupwizardlib.GlifLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/setup_wizard_layout"
     android:layout_width="match_parent"
@@ -35,7 +35,7 @@
             style="@style/TextAppearance.FingerprintMessage"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/suw_description_margin_top"
+            android:layout_marginTop="@dimen/suw_description_glif_margin_top"
             android:text="@string/security_settings_fingerprint_enroll_finish_message"/>
 
         <TextView
@@ -43,7 +43,7 @@
             style="@style/TextAppearance.FingerprintMessage"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/suw_description_margin_top"
+            android:layout_marginTop="@dimen/suw_description_glif_margin_top"
             android:text="@string/setup_fingerprint_enroll_finish_message_secondary"
             android:textColor="?android:attr/textColorSecondary"
             android:visibility="gone" />
@@ -72,30 +72,32 @@
             android:layout_weight="1"/>
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="-12dp"
             android:layout_marginBottom="4dp"
-            android:layout_gravity="end"
             android:orientation="horizontal">
 
             <Button
-                style="@style/Button.FingerprintButton"
+                style="@style/SetupWizardButton.Negative"
                 android:id="@+id/add_another_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/fingerprint_enroll_button_add" />
 
+            <Space
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
             <Button
-                style="@style/Button.FingerprintButton"
+                style="@style/SetupWizardButton.Positive"
                 android:id="@+id/next_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="end|center_vertical"
                 android:text="@string/security_settings_fingerprint_enroll_done" />
 
         </LinearLayout>
 
     </LinearLayout>
 
-</com.android.setupwizardlib.SetupWizardLayout>
+</com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout/fingerprint_enroll_introduction.xml b/res/layout/fingerprint_enroll_introduction.xml
index f43bdb6..6d1c699 100644
--- a/res/layout/fingerprint_enroll_introduction.xml
+++ b/res/layout/fingerprint_enroll_introduction.xml
@@ -15,10 +15,10 @@
     limitations under the License
 -->
 
-<com.android.setupwizardlib.SetupWizardRecyclerLayout
+<com.android.setupwizardlib.GlifRecyclerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    style="?attr/fingerprint_layout_theme"
     android:id="@+id/setup_wizard_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:entries="@xml/fingerprint_enroll_introduction_items"
-    style="?attr/fingerprint_layout_theme" />
+    android:entries="@xml/fingerprint_enroll_introduction_items" />
diff --git a/res/layout/gesture_preference.xml b/res/layout/gesture_preference.xml
new file mode 100644
index 0000000..71fe86f
--- /dev/null
+++ b/res/layout/gesture_preference.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:gravity="center_vertical"
+    android:background="?android:attr/activatedBackgroundIndicator"
+    android:clipToPadding="false"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:background="@android:color/white">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceListItem"
+            android:ellipsize="marquee"/>
+
+        <Switch
+            android:id="@android:id/switch_widget"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="end|center_vertical"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/gestures_setting_background_color"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:orientation="horizontal">
+
+        <FrameLayout
+            android:id="@+id/gesture_animation_frame"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1">
+
+            <TextureView
+                android:id="@+id/gesture_video"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"/>
+
+            <ImageView
+                android:id="@+id/gesture_image"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:visibility="gone"/>
+
+            <ImageView
+                android:id="@+id/gesture_play_button"
+                android:layout_width="@dimen/gestures_play_button_size"
+                android:layout_height="@dimen/gestures_play_button_size"
+                android:src="@drawable/ic_gesture_play_button"
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:visibility="gone"/>
+
+        </FrameLayout>
+
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:paddingTop="@dimen/gestures_settings_padding_top_bottom"
+            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+            android:textColor="?android:attr/textColorSecondary"
+            android:maxLines="10"
+            android:ellipsize="end"/>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/preference_app_restrictions.xml b/res/layout/preference_app_restrictions.xml
index fe575a2..d571b5f 100644
--- a/res/layout/preference_app_restrictions.xml
+++ b/res/layout/preference_app_restrictions.xml
@@ -83,7 +83,7 @@
         android:layout_height="fill_parent"
         android:paddingStart="12dip"
         android:paddingEnd="12dp"
-        android:src="@drawable/ic_sysbar_quicksettings"
+        android:src="@drawable/ic_settings"
         android:contentDescription="@string/apps_with_restrictions_settings_button"
         android:layout_gravity="center"
         android:clickable="true"
diff --git a/res/layout/preference_bluetooth.xml b/res/layout/preference_bluetooth.xml
index 17ee70c..c339e67 100644
--- a/res/layout/preference_bluetooth.xml
+++ b/res/layout/preference_bluetooth.xml
@@ -27,7 +27,7 @@
         android:layout_gravity="center_vertical"
         android:padding="8dip"
         android:background="?android:attr/selectableItemBackground"
-        android:src="@drawable/ic_bt_config"
+        android:src="@drawable/ic_settings"
         android:contentDescription="@string/bluetooth_device_details" />
 
 </LinearLayout>
diff --git a/res/layout/preference_importance_slider.xml b/res/layout/preference_importance_slider.xml
index ddbcd30..3861807 100644
--- a/res/layout/preference_importance_slider.xml
+++ b/res/layout/preference_importance_slider.xml
@@ -58,8 +58,8 @@
                 android:focusable="true"
                 android:background="#00ffffff"
                 android:progressBackgroundTint="@color/importance_secondary_slider_color"
-                android:thumbTint="@color/importance_slider_color"
-                android:progressTint="@color/importance_slider_color"
+                android:thumbTint="?android:attr/colorAccent"
+                android:progressTint="?android:attr/colorAccent"
                 style="@android:style/Widget.Material.SeekBar.Discrete"
                 android:tickMarkTint="@android:color/black" />
 
diff --git a/res/layout/preference_list_fragment.xml b/res/layout/preference_list_fragment.xml
index 9f1e076..6e540c4 100644
--- a/res/layout/preference_list_fragment.xml
+++ b/res/layout/preference_list_fragment.xml
@@ -83,6 +83,7 @@
         android:visibility="gone">
 
         <Button android:id="@+id/back_button"
+            style="?android:attr/buttonBarButtonStyle"
             android:layout_width="150dip"
             android:layout_height="wrap_content"
             android:layout_margin="5dip"
@@ -97,7 +98,8 @@
             android:layout_alignParentEnd="true">
 
             <Button android:id="@+id/skip_button"
-                android:layout_width="150dip"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="5dip"
                 android:text="@*android:string/skip_button_label"
@@ -105,7 +107,8 @@
                 />
 
             <Button android:id="@+id/next_button"
-                android:layout_width="150dip"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="5dip"
                 android:text="@*android:string/next_button_label"
diff --git a/res/layout/preference_tts_engine.xml b/res/layout/preference_tts_engine.xml
index fe8e967..277fc23 100644
--- a/res/layout/preference_tts_engine.xml
+++ b/res/layout/preference_tts_engine.xml
@@ -41,7 +41,7 @@
         android:layout_height="match_parent"
         android:paddingStart="?android:attr/listPreferredItemPaddingStart"
         android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:src="@drawable/ic_sysbar_quicksettings"
+        android:src="@drawable/ic_settings"
         android:contentDescription="@string/tts_engine_settings_button"
         android:layout_centerVertical="true"
         android:clickable="true"
diff --git a/res/layout/preference_widget_settings.xml b/res/layout/preference_widget_settings.xml
index 6d9ac2fe..dfeca1a 100644
--- a/res/layout/preference_widget_settings.xml
+++ b/res/layout/preference_widget_settings.xml
@@ -27,7 +27,7 @@
         android:layout_gravity="center_vertical"
         android:padding="8dip"
         android:background="?android:attr/selectableItemBackground"
-        android:src="@drawable/ic_sysbar_quicksettings"
+        android:src="@drawable/ic_settings"
         android:contentDescription="@string/settings_button" />
 
 </LinearLayout>
diff --git a/res/layout/radio_info.xml b/res/layout/radio_info.xml
index 834bba2..e11e997 100644
--- a/res/layout/radio_info.xml
+++ b/res/layout/radio_info.xml
@@ -190,6 +190,22 @@
                 android:layout_height="wrap_content"
                 android:text="@string/volte_provisioned_switch_string"/>
 
+        <!-- VT provisioned -->
+        <Switch android:id="@+id/vt_provisioned_switch"
+                android:textSize="14sp"
+                android:layout_marginTop="8dip"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/vt_provisioned_switch_string"/>
+
+        <!-- Wifi Calling provisioned -->
+        <Switch android:id="@+id/wfc_provisioned_switch"
+                android:textSize="14sp"
+                android:layout_marginTop="8dip"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wfc_provisioned_switch_string"/>
+
         <!-- SMSC -->
         <RelativeLayout android:layout_width="match_parent"
                         android:layout_height="wrap_content">
diff --git a/res/layout/redaction_interstitial.xml b/res/layout/redaction_interstitial.xml
index ec0c249..d1ce0dc 100644
--- a/res/layout/redaction_interstitial.xml
+++ b/res/layout/redaction_interstitial.xml
@@ -1,68 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
-  ~ Copyright (C) 2014 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
+    Copyright (C) 2015 The Android Open Source Project
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT 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.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingStart="?attr/side_margin"
-    android:paddingEnd="?attr/side_margin">
+    android:icon="@drawable/ic_lock"
+    settings:suwHeaderText="@string/lock_screen_notifications_interstitial_title">
 
-    <TextView
-        android:id="@+id/message"
+    <LinearLayout
+        style="@style/SuwContentFrame"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/redaction_vertical_margins"
-        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
-        android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:text="@string/lock_screen_notifications_interstitial_message"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-    <RadioGroup
-        android:id="@+id/radio_group"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/redaction_vertical_margins"
-        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
-        android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:checkedButton="@+id/redact_sensitive">
-
-        <com.android.settings.RestrictedRadioButton
-            android:id="@+id/show_all"
+        <TextView
+            android:id="@+id/message"
+            style="@style/SuwDescription.Glif"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="@style/RedactionItemAndLabel"
-            android:text="@string/lock_screen_notifications_summary_show" />
+            android:text="@string/lock_screen_notifications_interstitial_message" />
 
-        <com.android.settings.RestrictedRadioButton
-            android:id="@+id/redact_sensitive"
+        <RadioGroup
+            android:id="@+id/radio_group"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="@style/RedactionItemAndLabel"
-            android:text="@string/lock_screen_notifications_summary_hide" />
+            android:layout_marginTop="@dimen/redaction_vertical_margins"
+            android:checkedButton="@+id/redact_sensitive">
 
-        <RadioButton
-            android:id="@+id/hide_all"
-            android:layout_width="match_parent"
+            <com.android.settings.RestrictedRadioButton
+                android:id="@+id/show_all"
+                style="@style/SuwRadioButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/lock_screen_notifications_summary_show" />
+
+            <com.android.settings.RestrictedRadioButton
+                android:id="@+id/redact_sensitive"
+                style="@style/SuwRadioButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/lock_screen_notifications_summary_hide" />
+
+            <RadioButton
+                android:id="@+id/hide_all"
+                style="@style/SuwRadioButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/lock_screen_notifications_summary_disable" />
+
+        </RadioGroup>
+
+        <Button
+            android:id="@+id/redaction_done_button"
+            style="@style/SetupWizardButton.Positive"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            style="@style/RedactionItemAndLabel"
-            android:text="@string/lock_screen_notifications_summary_disable" />
+            android:layout_gravity="end"
+            android:text="@string/app_notifications_dialog_done" />
 
-    </RadioGroup>
+    </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout/restricted_preference_user_delete_widget.xml b/res/layout/restricted_preference_user_delete_widget.xml
index 7ffb0e4..7fd5d88 100644
--- a/res/layout/restricted_preference_user_delete_widget.xml
+++ b/res/layout/restricted_preference_user_delete_widget.xml
@@ -35,7 +35,7 @@
             android:layout_height="fill_parent"
             android:paddingStart="16dip"
             android:paddingEnd="16dip"
-            android:src="@drawable/ic_sysbar_quicksettings"
+            android:src="@drawable/ic_settings"
             android:contentDescription="@string/settings_label"
             android:layout_gravity="center"
             android:background="?android:attr/selectableItemBackground" />
diff --git a/res/layout/running_processes_header.xml b/res/layout/running_processes_header.xml
index 38ff614..615d30e 100644
--- a/res/layout/running_processes_header.xml
+++ b/res/layout/running_processes_header.xml
@@ -97,7 +97,7 @@
             android:layout_height="16sp"
             android:layout_gravity="center"
             android:scaleType="centerInside"
-            android:src="@color/running_processes_apps_ram"
+            android:src="?android:attr/colorAccent"
             android:contentDescription="@null" />
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/res/layout/see_all.xml b/res/layout/see_all.xml
index 56405bb..44b263c 100644
--- a/res/layout/see_all.xml
+++ b/res/layout/see_all.xml
@@ -18,11 +18,11 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="?android:attr/selectableItemBackground"
         android:gravity="center_vertical"
         android:minHeight="@dimen/dashboard_tile_minimum_height"
         android:clickable="true"
-        android:focusable="true"
-        android:background="@drawable/selectable_card">
+        android:focusable="true">
 
     <View
             android:layout_width="@dimen/dashboard_tile_image_size"
diff --git a/res/layout/setup_choose_lock_generic_fingerprint_header.xml b/res/layout/setup_choose_lock_generic_fingerprint_header.xml
index d16aec4..b19bec1 100644
--- a/res/layout/setup_choose_lock_generic_fingerprint_header.xml
+++ b/res/layout/setup_choose_lock_generic_fingerprint_header.xml
@@ -20,10 +20,10 @@
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:minHeight="56dp"
-        android:paddingBottom="@dimen/suw_description_margin_bottom_lists"
+        android:paddingBottom="@dimen/suw_description_glif_margin_bottom_lists"
         android:paddingStart="?android:attr/listPreferredItemPaddingStart"
         android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:paddingTop="@dimen/suw_description_margin_top"
+        android:paddingTop="@dimen/suw_description_glif_margin_top"
         android:text="@string/setup_lock_settings_picker_fingerprint_message"
         android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
         android:textAppearance="?android:attr/textAppearanceListItem" />
diff --git a/res/layout/setup_choose_lock_generic_header.xml b/res/layout/setup_choose_lock_generic_header.xml
index 78cd618..9a3547d 100644
--- a/res/layout/setup_choose_lock_generic_header.xml
+++ b/res/layout/setup_choose_lock_generic_header.xml
@@ -20,10 +20,10 @@
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:minHeight="56dp"
-        android:paddingBottom="@dimen/suw_description_margin_bottom_lists"
+        android:paddingBottom="@dimen/suw_description_glif_margin_bottom_lists"
         android:paddingStart="?android:attr/listPreferredItemPaddingStart"
         android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:paddingTop="@dimen/suw_description_margin_top"
+        android:paddingTop="@dimen/suw_description_glif_margin_top"
         android:text="@string/setup_lock_settings_picker_message"
         android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
         android:textAppearance="?android:attr/textAppearanceListItem" />
diff --git a/res/layout/setup_choose_lock_password.xml b/res/layout/setup_choose_lock_password.xml
deleted file mode 100644
index 164233c..0000000
--- a/res/layout/setup_choose_lock_password.xml
+++ /dev/null
@@ -1,97 +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.
--->
-
-<com.android.setupwizardlib.SetupWizardLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    settings:suwBackgroundTile="@drawable/setup_illustration_tile"
-    settings:suwHeaderText="@string/wifi_setup_wizard_title"
-    settings:suwIllustrationHorizontalTile="@drawable/setup_illustration_horizontal_tile"
-    settings:suwIllustrationImage="@drawable/setup_illustration_lock_screen">
-
-    <LinearLayout
-        style="@style/SuwContentFrame"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
-
-        <!-- header text ('Enter Pin') -->
-        <TextView android:id="@+id/headerText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:lines="2"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-        <!-- Password entry field -->
-        <EditText android:id="@+id/password_entry"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginStart="30dip"
-            android:layout_marginEnd="30dip"
-            android:gravity="center"
-            android:inputType="textPassword"
-            android:imeOptions="actionNext|flagNoExtractUi"
-            android:textSize="24sp"
-            style="@style/TextAppearance.PasswordEntry"/>
-
-        <!-- Spacer between password entry and keyboard -->
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1"/>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:visibility="gone"
-            style="@style/SecurityPreferenceButtonContainer">
-
-            <!-- left : cancel -->
-            <Button android:id="@+id/cancel_button"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/lockpassword_cancel_label"
-                style="@style/SecurityPreferenceButton"/>
-
-            <!-- right : continue -->
-            <Button android:id="@+id/next_button"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/lockpassword_continue_label"
-                style="@style/SecurityPreferenceButton"/>
-
-        </LinearLayout>
-
-        <!-- Alphanumeric keyboard -->
-        <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="#00000000"
-            android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
-            android:visibility="gone"/>
-
-    </LinearLayout>
-
-</com.android.setupwizardlib.SetupWizardLayout>
diff --git a/res/layout/setup_choose_lock_pattern_common.xml b/res/layout/setup_choose_lock_pattern_common.xml
deleted file mode 100644
index 0a38637..0000000
--- a/res/layout/setup_choose_lock_pattern_common.xml
+++ /dev/null
@@ -1,103 +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.
--->
-
-<!-- Used in phone portrait and tablet, as referenced in alias.xml. -->
-<com.android.setupwizardlib.SetupWizardLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout="@layout/setup_choose_lock_pattern_template"
-    settings:suwBackgroundTile="@drawable/setup_illustration_tile"
-    settings:suwHeaderText="@string/wifi_setup_wizard_title"
-    settings:suwIllustrationHorizontalTile="@drawable/setup_illustration_horizontal_tile"
-    settings:suwIllustrationImage="@drawable/setup_illustration_lock_screen">
-
-    <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
-        android:id="@+id/topLayout"
-        style="@style/SuwContentFrame"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <!-- takes up all space above button bar at bottom -->
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <TextView android:id="@+id/headerText"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:minLines="2"
-                android:gravity="center"
-                android:textSize="18sp" />
-
-            <Button android:id="@+id/retryButton"
-                style="@android:style/Widget.Material.Button.Borderless.Colored"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:text="@string/lockpattern_retry_button_text"/>
-
-            <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-                android:layout_width="match_parent"
-                android:layout_height="0dip"
-                android:layout_weight="4" />
-
-        </LinearLayout>
-
-        <TextView android:id="@+id/footerText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:minHeight="50dip"
-            android:textSize="14sp"
-            android:visibility="gone"/>
-
-        <!-- Buttons are hidden during setup, and use the buttons in setup navigation bar instead -->
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:visibility="gone"
-            style="@style/SecurityPreferenceButtonContainer">
-
-            <!-- left : cancel, or re-try -->
-            <Button android:id="@+id/footerLeftButton"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/lockpattern_tutorial_cancel_label"
-                style="@style/SecurityPreferenceButton"/>
-
-            <!-- right : confirm or ok -->
-            <Button android:id="@+id/footerRightButton"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/lockpattern_tutorial_continue_label"
-                style="@style/SecurityPreferenceButton"/>
-
-        </LinearLayout>
-
-    </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
-
-</com.android.setupwizardlib.SetupWizardLayout>
diff --git a/res/layout/setup_encryption_interstitial_header.xml b/res/layout/setup_encryption_interstitial_header.xml
index a6e7c30..9601fa8 100644
--- a/res/layout/setup_encryption_interstitial_header.xml
+++ b/res/layout/setup_encryption_interstitial_header.xml
@@ -20,9 +20,9 @@
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:minHeight="56dp"
-    android:paddingBottom="@dimen/suw_description_margin_bottom_lists"
+    android:paddingBottom="@dimen/suw_description_glif_margin_bottom_lists"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:paddingTop="@dimen/suw_description_margin_top"
+    android:paddingTop="@dimen/suw_description_glif_margin_top"
     android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
     android:textAppearance="?android:attr/textAppearanceListItem" />
diff --git a/res/layout/setup_fingerprint_enroll_find_sensor_base.xml b/res/layout/setup_fingerprint_enroll_find_sensor_base.xml
deleted file mode 100644
index 184d6b9..0000000
--- a/res/layout/setup_fingerprint_enroll_find_sensor_base.xml
+++ /dev/null
@@ -1,71 +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
-  -->
-
-<com.android.setupwizardlib.SetupWizardLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/setup_wizard_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        style="?attr/fingerprint_layout_theme">
-
-    <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:clipToPadding="false"
-            android:clipChildren="false">
-
-        <include
-                layout="@layout/fingerprint_enroll_find_sensor_graphic"
-                android:layout_width="@dimen/fingerprint_find_sensor_graphic_size"
-                android:layout_height="@dimen/fingerprint_find_sensor_graphic_size"
-                android:layout_gravity="center_horizontal|bottom"/>
-
-        <LinearLayout
-                style="@style/SuwContentFrame"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:clipToPadding="false"
-                android:clipChildren="false">
-
-            <TextView
-                    style="@style/TextAppearance.FingerprintMessage"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/suw_description_margin_top"
-                    android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
-
-            <View
-                    android:layout_height="0dp"
-                    android:layout_width="match_parent"
-                    android:layout_weight="1"/>
-
-            <Button
-                    style="@style/Button.FingerprintButton"
-                    android:id="@+id/next_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="4dp"
-                    android:layout_marginEnd="-12dp"
-                    android:layout_gravity="end"
-                    android:gravity="end|center_vertical"
-                    android:text="@string/fingerprint_enroll_button_next" />
-
-        </LinearLayout>
-    </FrameLayout>
-</com.android.setupwizardlib.SetupWizardLayout>
diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml
index f5496f4..298bc9a 100644
--- a/res/layout/setup_preference.xml
+++ b/res/layout/setup_preference.xml
@@ -15,11 +15,8 @@
     limitations under the License.
 -->
 
-<com.android.setupwizardlib.SetupWizardPreferenceLayout
+<com.android.setupwizardlib.GlifPreferenceLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:id="@android:id/list_container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    settings:suwBackgroundTile="@drawable/setup_illustration_tile"
-    settings:suwIllustrationHorizontalTile="@drawable/setup_illustration_horizontal_tile" />
+    android:layout_height="match_parent" />
diff --git a/res/layout/setup_redaction_interstitial.xml b/res/layout/setup_redaction_interstitial.xml
deleted file mode 100644
index e99756a..0000000
--- a/res/layout/setup_redaction_interstitial.xml
+++ /dev/null
@@ -1,78 +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
--->
-
-<com.android.setupwizardlib.SetupWizardLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/setup_wizard_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    settings:suwBackgroundTile="@drawable/setup_illustration_tile"
-    settings:suwHeaderText="@string/lock_screen_notifications_interstitial_title"
-    settings:suwIllustrationHorizontalTile="@drawable/setup_illustration_horizontal_tile"
-    settings:suwIllustrationImage="@drawable/setup_illustration_lock_screen">
-
-    <LinearLayout
-        style="@style/SuwContentFrame"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:paddingStart="?attr/side_margin"
-        android:paddingEnd="?attr/side_margin">
-
-        <TextView
-            style="@style/SuwDescription"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
-            android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
-            android:text="@string/lock_screen_notifications_interstitial_message" />
-
-        <RadioGroup
-            android:id="@+id/radio_group"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/redaction_vertical_margins"
-            android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
-            android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
-            android:checkedButton="@+id/redact_sensitive">
-
-            <com.android.settings.RestrictedRadioButton
-                android:id="@+id/show_all"
-                style="@style/SuwRadioButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/lock_screen_notifications_summary_show" />
-
-            <com.android.settings.RestrictedRadioButton
-                android:id="@+id/redact_sensitive"
-                style="@style/SuwRadioButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/lock_screen_notifications_summary_hide" />
-
-            <RadioButton
-                android:id="@+id/hide_all"
-                style="@style/SuwRadioButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/lock_screen_notifications_summary_disable" />
-        </RadioGroup>
-
-    </LinearLayout>
-
-</com.android.setupwizardlib.SetupWizardLayout>
diff --git a/res/values-sw360dp/aliases.xml b/res/layout/sliding_tab_indicator_view.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/layout/sliding_tab_indicator_view.xml
index a10585b..b594c8b 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/layout/sliding_tab_indicator_view.xml
@@ -14,7 +14,10 @@
      limitations under the License.
 -->
 
-<resources>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
-</resources>
-
+<View
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/sliding_tab_selected_indicator"
+    android:layout_width="wrap_content"
+    android:layout_height="@dimen/pager_tabs_selected_indicator_height"
+    android:background="?android:attr/colorAccent"
+    android:theme="@*android:style/ThemeOverlay.DeviceDefault.Accent" />
diff --git a/res/layout/sliding_tab_title_view.xml b/res/layout/sliding_tab_title_view.xml
new file mode 100644
index 0000000..5df8378
--- /dev/null
+++ b/res/layout/sliding_tab_title_view.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2016 Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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:layout_width="0dp"
+    android:layout_weight="1"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:ellipsize="end"
+    android:fontFamily="sans-serif-medium"
+    android:gravity="center"
+    android:maxLines="1"
+    android:padding="@dimen/pager_tabs_title_padding"
+    android:textColor="@color/sliding_tab_title_text_color"
+    android:textAllCaps="true"/>
diff --git a/res/layout/storage_summary.xml b/res/layout/storage_summary.xml
index 35201e1..7bc51df 100644
--- a/res/layout/storage_summary.xml
+++ b/res/layout/storage_summary.xml
@@ -33,7 +33,7 @@
         android:singleLine="true"
         android:textAlignment="viewStart"
         android:textAppearance="@android:style/TextAppearance.Material.Subhead"
-        android:textColor="#ff607d8b"
+        android:textColor="?android:attr/colorAccent"
         android:textSize="36sp"
         android:ellipsize="marquee"
         android:fadingEdge="horizontal" />
diff --git a/res/layout/suggestion_header.xml b/res/layout/suggestion_header.xml
index c48553e..f3f39ff 100644
--- a/res/layout/suggestion_header.xml
+++ b/res/layout/suggestion_header.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<!--
+     Copyright (C) 2016 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -20,27 +21,32 @@
     android:layout_height="@dimen/dashboard_category_height"
     android:clickable="true"
     android:focusable="true"
-    android:background="@drawable/selectable_card"
-    android:elevation="@dimen/dashboard_category_elevation"
-    android:gravity="center_vertical" >
-
-    <TextView android:id="@android:id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:paddingStart="16dp"
-        android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.TileTitle"
-        android:textColor="?android:attr/colorAccent"
-        android:alpha=".87"
-        android:ellipsize="marquee"
-        android:fadingEdge="horizontal" />
-
-    <ImageView android:id="@android:id/icon"
+    android:background="@drawable/selectable_card_grey"
+    android:gravity="center_vertical"
+    android:paddingTop="4dp">
+    <ImageView
+        android:id="@android:id/icon"
         android:layout_width="@dimen/dashboard_tile_image_size"
         android:layout_height="@dimen/dashboard_tile_image_size"
-        android:layout_marginStart="@dimen/suggestion_arrow_margin"
-        android:layout_marginEnd="@dimen/suggestion_arrow_margin"
-        android:src="@drawable/ic_expand_more" />
-
+        android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
+        android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"
+        android:src="@drawable/ic_expand_more"/>
+    <TextView
+        android:id="@android:id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:singleLine="true"
+        android:textAppearance="@style/TextAppearance.SuggestionTitle"
+        android:textColor="?android:attr/colorAccent"
+        android:ellipsize="marquee"
+        android:fadingEdge="horizontal"/>
+    <TextView
+        android:id="@android:id/summary"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="end"
+        android:paddingEnd="18dp"
+        android:textAppearance="@style/TextAppearance.SuggestionTitle"
+        android:textColor="?android:attr/colorAccent"/>
 </LinearLayout>
diff --git a/res/layout/suggestion_tile.xml b/res/layout/suggestion_tile.xml
index 10c9558..80de8ff 100644
--- a/res/layout/suggestion_tile.xml
+++ b/res/layout/suggestion_tile.xml
@@ -18,70 +18,48 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@drawable/selectable_card_grey"
     android:clickable="true"
     android:focusable="true"
-    android:background="@drawable/selectable_card"
-    android:elevation="@dimen/dashboard_category_elevation"
-    android:orientation="vertical" >
+    android:gravity="center_vertical"
+    android:minHeight="@dimen/dashboard_tile_minimum_height">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/listDivider" />
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="@dimen/dashboard_tile_image_size"
+        android:layout_height="@dimen/dashboard_tile_image_size"
+        android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
+        android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"
+        android:scaleType="centerInside"/>
 
-    <LinearLayout
-        android:layout_width="match_parent"
+    <RelativeLayout
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:minHeight="@dimen/dashboard_tile_minimum_height">
+        android:layout_weight="1">
 
-        <ImageView
-            android:id="@android:id/icon"
-            android:layout_width="@dimen/dashboard_tile_image_size"
-            android:layout_height="@dimen/dashboard_tile_image_size"
-            android:scaleType="centerInside"
-            android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
-            android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end" />
+        <TextView android:id="@android:id/title"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:singleLine="true"
+                  android:textAppearance="@style/TextAppearance.TileTitle"
+                  android:ellipsize="marquee"
+                  android:fadingEdge="horizontal"/>
 
-        <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
+        <TextView android:id="@android:id/summary"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_below="@android:id/title"
+                  android:layout_alignStart="@android:id/title"
+                  android:textAppearance="@style/TextAppearance.Small"
+                  android:textColor="?android:attr/textColorSecondary"/>
 
-            <TextView android:id="@android:id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.TileTitle"
-                android:ellipsize="marquee"
-                android:fadingEdge="horizontal" />
+    </RelativeLayout>
 
-            <TextView android:id="@android:id/summary"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@android:id/title"
-                android:layout_alignStart="@android:id/title"
-                android:textAppearance="@style/TextAppearance.Small"
-                android:textColor="?android:attr/textColorSecondary" />
+    <ImageView
+        android:id="@+id/overflow"
+        style="?android:attr/actionOverflowButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="16dp"/>
 
-        </RelativeLayout>
-
-        <FrameLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent">
-
-            <ImageView android:id="@+id/overflow"
-                android:layout_width="44dp"
-                android:layout_height="44dp"
-                android:paddingStart="16dp"
-                android:paddingBottom="16dp"
-                android:paddingTop="12dp"
-                android:paddingEnd="12dp"
-                android:gravity="top"
-                style="?android:attr/actionOverflowButtonStyle" />
-
-        </FrameLayout>
-
-    </LinearLayout>
-
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/support_disclaimer_content.xml b/res/layout/support_disclaimer_content.xml
new file mode 100644
index 0000000..4fed865
--- /dev/null
+++ b/res/layout/support_disclaimer_content.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="24dp">
+
+    <TextView
+        android:id="@+id/support_disclaimer_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="24dp"
+        android:text="@string/support_disclaimer_content"/>
+
+    <CheckBox
+        android:id="@+id/support_disclaimer_do_not_show_again"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/support_disclaimer_do_not_show"
+        android:textColor="?android:attr/textColorSecondary"/>
+
+</LinearLayout>
diff --git a/res/layout/support_escalation_options.xml b/res/layout/support_escalation_options.xml
new file mode 100644
index 0000000..b214561
--- /dev/null
+++ b/res/layout/support_escalation_options.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/SupportEscalationCard"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+    <TextView
+        android:id="@+id/tile_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:textAppearance="@style/TextAppearance.SupportTitle"/>
+    <TextView
+        android:id="@+id/tile_summary"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:paddingTop="8dp"
+        android:paddingBottom="30dp"
+        android:textAppearance="@style/TextAppearance.Small"
+        android:textColor="?android:attr/textColorSecondary"/>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal">
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+            <Button
+                android:id="@android:id/text1"
+                style="@style/SupportPrimaryButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"/>
+            <TextView
+                android:id="@+id/summary1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="14dp"
+                android:textAppearance="@style/TextAppearance.Small"
+                android:textColor="?android:attr/textColorSecondary"/>
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+            <Button
+                android:id="@android:id/text2"
+                style="@style/SupportPrimaryButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"/>
+            <TextView
+                android:id="@+id/summary2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="14dp"
+                android:textAppearance="@style/TextAppearance.Small"
+                android:textColor="?android:attr/textColorSecondary"/>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/values-sw360dp/aliases.xml b/res/layout/support_fragment.xml
similarity index 68%
copy from res/values-sw360dp/aliases.xml
copy to res/layout/support_fragment.xml
index a10585b..481a548 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/layout/support_fragment.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<!--
+     Copyright (C) 2016 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,7 +15,8 @@
      limitations under the License.
 -->
 
-<resources>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
-</resources>
-
+<android.support.v7.widget.RecyclerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/support_items"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"/>
\ No newline at end of file
diff --git a/res/layout/support_offline_escalation_options.xml b/res/layout/support_offline_escalation_options.xml
new file mode 100644
index 0000000..d1e77a3
--- /dev/null
+++ b/res/layout/support_offline_escalation_options.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/SupportEscalationCard"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+    <TextView
+        android:id="@+id/tile_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:textAppearance="@style/TextAppearance.SupportTitle"/>
+    <TextView
+        android:id="@+id/tile_summary"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:paddingTop="8dp"
+        android:paddingBottom="10dp"
+        android:textAppearance="@style/TextAppearance.Small"
+        android:textColor="?android:attr/textColorSecondary"/>
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingEnd="8dp"
+            android:text="@string/support_country_list_title"
+            android:textAppearance="@style/TextAppearance.Small"
+            android:textColor="?android:attr/textColorSecondary"/>
+        <Spinner
+            android:id="@+id/spinner"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:dropDownWidth="196dp"/>
+    </LinearLayout>
+    <Button
+        android:id="@android:id/text1"
+        style="@style/SupportPrimaryButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"/>
+    <Button
+        android:id="@android:id/text2"
+        style="@style/SupportSecondaryButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:minHeight="48dp"/>
+</LinearLayout>
diff --git a/res/layout/support_phone_dialog_content.xml b/res/layout/support_phone_dialog_content.xml
new file mode 100644
index 0000000..ce6d2bb
--- /dev/null
+++ b/res/layout/support_phone_dialog_content.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingStart="24dp"
+    android:paddingEnd="24dp"
+    android:paddingTop="12dp"
+    android:paddingBottom="12dp">
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="16dp"
+        android:text="@string/support_international_phone_summary"/>
+    <LinearLayout
+        android:id="@+id/phone_number_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/selectableItemBackground"
+        android:gravity="center_vertical"
+        android:minHeight="48dp"
+        android:orientation="horizontal">
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingEnd="32dp"
+            android:src="@drawable/ic_call_24dp"/>
+        <TextView
+            android:id="@+id/phone_number"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:textAppearance="@style/TextAppearance.TileTitle"/>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/support_sign_in_button.xml b/res/layout/support_sign_in_button.xml
new file mode 100644
index 0000000..45de571
--- /dev/null
+++ b/res/layout/support_sign_in_button.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/SupportEscalationCard"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+    <TextView
+        android:id="@+id/tile_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:textAppearance="@style/TextAppearance.SupportTitle"/>
+    <TextView
+        android:id="@+id/tile_summary"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:paddingTop="8dp"
+        android:paddingBottom="30dp"
+        android:textAppearance="@style/TextAppearance.Small"
+        android:textColor="?android:attr/textColorSecondary"/>
+    <Button
+        android:id="@android:id/text1"
+        style="@style/SupportPrimaryButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"/>
+    <Button
+        android:id="@android:id/text2"
+        style="@style/SupportSecondaryButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:minHeight="48dp"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/support_tile.xml b/res/layout/support_tile.xml
new file mode 100644
index 0000000..5f7ced4
--- /dev/null
+++ b/res/layout/support_tile.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:gravity="center_vertical"
+    android:minHeight="@dimen/dashboard_tile_minimum_height"
+    android:orientation="horizontal">
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="@dimen/dashboard_tile_image_size"
+        android:layout_height="@dimen/dashboard_tile_image_size"
+        android:scaleType="centerInside"
+        android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
+        android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"/>
+    <TextView
+        android:id="@+id/tile_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:singleLine="true"
+        android:textAppearance="@style/TextAppearance.TileTitle"
+        android:ellipsize="end"
+        android:fadingEdge="horizontal"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/suw_item_link_description.xml b/res/layout/suw_item_link_description.xml
deleted file mode 100644
index 5396de1e..0000000
--- a/res/layout/suw_item_link_description.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (C) 2016 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    style="@style/SuwItemContainer"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:paddingTop="@dimen/suw_description_margin_top"
-    android:paddingBottom="@dimen/suw_description_margin_bottom_lists">
-
-    <FrameLayout
-        android:id="@+id/suw_items_icon_container"
-        android:layout_width="@dimen/suw_items_icon_container_width"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:gravity="start">
-
-        <ImageView
-            android:id="@+id/suw_items_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:ignore="ContentDescription" />
-
-    </FrameLayout>
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical">
-
-        <com.android.settings.widget.LinkTextView
-            android:id="@+id/suw_items_title"
-            style="@style/SuwItemTitle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="start"
-            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
-            android:textAlignment="viewStart"
-            android:textAppearance="@style/TextAppearance.SuwDescription"
-            tools:ignore="UnusedAttribute" />
-
-        <com.android.settings.widget.LinkTextView
-            android:id="@+id/suw_items_summary"
-            style="@style/SuwItemSummary"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="start"
-            android:textAlignment="viewStart"
-            android:visibility="gone"
-            tools:ignore="UnusedAttribute" />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/res/layout/switch_bar.xml b/res/layout/switch_bar.xml
index a31bd3e..8b69a1d 100644
--- a/res/layout/switch_bar.xml
+++ b/res/layout/switch_bar.xml
@@ -44,7 +44,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:background="@null"
-            android:theme="@style/ThemeOverlay.SwitchBar" />
+            android:theme="@style/ThemeOverlay.SwitchBar.Settings" />
 
 </merge>
 
diff --git a/res/layout/wifi_display_preference.xml b/res/layout/wifi_display_preference.xml
index d8c4729..99cb89c 100644
--- a/res/layout/wifi_display_preference.xml
+++ b/res/layout/wifi_display_preference.xml
@@ -37,7 +37,7 @@
         android:layout_gravity="center_vertical"
         android:padding="8dip"
         android:background="?android:attr/selectableItemBackground"
-        android:src="@drawable/ic_bt_config"
+        android:src="@drawable/ic_settings"
         android:contentDescription="@string/wifi_display_details" />
 
 </LinearLayout>
diff --git a/res/menu/storage_volume.xml b/res/menu/storage_volume.xml
index efa468c..bf9f985 100644
--- a/res/menu/storage_volume.xml
+++ b/res/menu/storage_volume.xml
@@ -30,4 +30,7 @@
     <item
         android:id="@+id/storage_migrate"
         android:title="@string/storage_menu_migrate" />
+    <item
+        android:id="@+id/storage_free"
+        android:title="@string/storage_menu_free" />
 </menu>
diff --git a/res/raw/gesture_ambient_move_lift.mp4 b/res/raw/gesture_ambient_move_lift.mp4
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/gesture_ambient_move_lift.mp4
diff --git a/res/raw/gesture_ambient_tap.mp4 b/res/raw/gesture_ambient_tap.mp4
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/gesture_ambient_tap.mp4
diff --git a/res/raw/gesture_double_tap.mp4 b/res/raw/gesture_double_tap.mp4
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/gesture_double_tap.mp4
diff --git a/res/raw/gesture_fingerprint_swipe.mp4 b/res/raw/gesture_fingerprint_swipe.mp4
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/gesture_fingerprint_swipe.mp4
diff --git a/res/raw/gesture_twist.mp4 b/res/raw/gesture_twist.mp4
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/gesture_twist.mp4
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index e5bd7da..67cdc83 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Pienk"</item>
     <item msgid="6131821495505931173">"Rooi"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Meer as 30 dae oud"</item>
+    <item msgid="2900554746706302178">"Meer as 60 dae oud"</item>
+    <item msgid="5692284879054004388">"Meer as 90 dae oud"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-af/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-af/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-af/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 5aacc88..5b93c89 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Aktiveer dataverbinding"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Deaktiveer dataverbinding"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE-voorbereid"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Video-oproepe is opgestel"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi-oproepe is opgestel"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Sellulêre radiokrag"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Bekyk SIM-adresboek"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Kyk na vaste skakelnommers"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Ontsluit met vingerafdruk"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Raak eenvoudig aan die vingerafdruksensor om jou foon te ontsluit, aankope te magtig of by programme aan te meld. Wees versigtig wie se vingeradrukke jy byvoeg. Selfs net een vingerafdruk wat bygevoeg is, sal al hierdie dinge kan doen.\n\nLet wel: Jou vingerafdruk sal dalk minder veilig as \'n sterk patroon of PIN wees. "<annotation id="url">"Kom meer te wete"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Raak eenvoudig die vingerafdruksensor om jou foon te ontsluit, aankope te magtig en by programme aan te meld. Wees versigtig wie se vingerafdrukke jy byvoeg. Selfs net een vingerafdruk wat bygevoeg is, kan enige van hierdie dinge doen.\n\nLet wel: Jou vingerafdruk sal dalk minder veilig as \'n sterk patroon of PIN wees."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Kanselleer"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Gaan voort"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Slaan oor"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Vee uit"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Kom ons begin!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Plaas jou vinger op die sensor en lig dit op wanneer jy \'n vibrasie voel"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Mooi! Doen dit weer"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Hou aan daarmee"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Beweeg jou vinger effens om al die verskillende dele van jou vingerafdruk by te voeg"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Vingerafdruk bygevoeg!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Wanneer jy hierdie ikoon sien, kan jy jou vingerafdruk gebruik vir identifisering of om \'n aankoop te magtig."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Raak net die vingerafdruksensor om jou toestel wakker te maak en te ontsluit."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Wanneer jy hierdie ikoon sien, kan jy jou vingerafdruk gebruik."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Wanneer jy hierdie ikoon sien, kan jy ook aankope magtig of by programme aanmeld."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Slaan vingerafdrukopstelling oor?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Jy het gekies om jou vingerafdruk te gebruik as een manier om jou foon te ontsluit. As jy dit nou oorslaan, sal jy dit later moet opstel. Dit neem net \'n minuut of wat om op te stel."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Stel skermslot op"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Dateer noodadres op"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Adres wat deur nooddienste as jou ligging gebruik word as jy \'n 911-oproep met Wi-Fi maak"</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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Vergeet"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Stel op"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Verken"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Maak spasie beskikbaar"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Bestuur berging"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-rekenaaraansluiting"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Koppel as"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Media-toestel (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Oudio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Gekaste data"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Ander"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Stelsel"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Verken <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Ander sluit in gedeelde lêers wat deur programme gestoor is, lêers wat van die internet of Bluetooth af afgelaai is, Android-lêers en so meer. \n\nTik op Verken om al die inhoud van hierdie <xliff:g id="NAME">^1</xliff:g> te sien."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Stelsel sluit lêers in wat die Android-bedryfstelsel intern gebruik. \n\nHierdie lêers kan nie individueel bekyk word nie."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> het dalk foto\'s, musiek, flieks, programme of ander data gestoor wat <xliff:g id="SIZE">^2</xliff:g> van die berging opneem. \n\nSkakel oor na <xliff:g id="USER_1">^1</xliff:g> om besonderhede te sien."</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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Regsinligting"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Bydraers"</string>
     <string name="manual" msgid="3025943393642974445">"Handleiding"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Regulerende inligting"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Regulerende etikette"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Veiligheid- en regulerende inligting"</string>
     <string name="copyright_title" msgid="865906688917260647">"Kopiereg"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisensie"</string>
     <string name="terms_title" msgid="7697580845616764642">"Bepalings en voorwaardes"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Altydaan-VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Geen VPN\'e is bygevoeg nie."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Altyd-aan is aktief"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Nie gesteun deur hierdie program nie"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Kies \'n VPN-profiel om altyd aan gekoppel te bly. Netwerkverkeer sal net toegelaat word wanneer verbind aan hierdie VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Geen"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Altydaan-VPN vereis \'n IP-adres vir beide die bediener en DNS."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"gly om te ontsluit, wagwoord, patroon, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"werkuitdaging, werk, profiel"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"werkprofiel, bestuurde profiel, verenig, vereniging, werk, profiel"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"gebaar"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Stel Wi-Fi-NFC-merker op"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skryf"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tik \'n merker om te skryf …"</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Agtergronddata is net deur Wi-Fi beskikbaar. Dit kan sommige programme of dienste beïnvloed wanneer Wi-Fi nie beskikbaar is nie."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Werkprofiel is af"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Programme, agtergrondsinkronisering en ander kenmerke wat met jou werkprofiel verband hou, is afgeskakel."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Voorstelle (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Voorstelle"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Verwyder"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Koel kleurtemperatuur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gebruik koeler skermkleure"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Stel ShortcutManager se koersbeperkingtellers terug?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Beheer sluitskermkennisgewings"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Wys of versteek kennisgewinginhoud"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Alles"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Steundiens"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Kleinste breedte"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Geen geïnstalleerde programme het toegang tot betaalde SMS\'e versoek nie"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Toegang tot betaalde SMS\'e"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Gedeaktiveer"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Demonstrasiemodus"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Ons is hier om te help"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Ons is dag en nag hier vir jou"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Ons steundiensspan is hier om enige kwessies te help aanspreek"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Ons steundienste is elke dag heeldag beskikbaar"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Foon-steundiensure (plaaslike tyd)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Deursoek hulp of verken wenke en truuks"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Steun vir:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> – <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Reis jy oorsee?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Internasionale heffings kan geld"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Foon"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Klets"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Verken wenke en truuks"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Deursoek hulp en stuur terugvoer"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Meld aan vir ondersteuning"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Meld aan"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Kan jy nie by jou rekening ingaan nie?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Stuur stelselinligting"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Om te help om vinnig aan jou kwessie aandag te gee, moet ons stelselinligting vir \'n diagnose hê."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Moenie weer wys nie"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Werkprofielinstellings"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaksoektog"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Laat kontaksoektogte deur jou organisasie toe om bellers en kontakte te identifiseer"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> uur</item>
+      <item quantity="one">1 uur</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minute</item>
+      <item quantity="one">1 minuut</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekondes</item>
+      <item quantity="one">1 sekonde</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Wagtydperk van ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Rekenaar"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Kopstuk"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Foon"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Oorfoon"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Randinvoertoestel"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Bergingbestuurder verwyder gerugsteunde foto\'s en video\'s van jou toestel af om te help om berginspasie beskikbaar te maak."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Verwyder foto\'s en video\'s"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Bergingbestuurder"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Outomaties"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Handmatig"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Gebare"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Spring na kamera"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Dubbeltik bloot op die aan/af-skakelaar om die kamera vinnig oop te maak. Dit werk van enige skerm af."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Draai kamera"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Draai pols twee keer om tussen voorste en agterste kamera te wissel."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Vinnige skermkontrolering"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Stoot jou foon liggies of tel dit op om daarna te kyk sonder om dit heeltemal wakker te maak."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Swiep vir kennisgewings"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Swiep na onder op die vingerafdruksensor om jou kennisgewings van enige skerm af na te gaan."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Aan"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Af"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Selflaaiprogram is reeds ontsluit"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Koppel eers aan die internet"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Onbeskikbaar op toestelle wat deur diensverskaffer gesluit is"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index 2cc7fb3..f94e125 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"ሮዝ"</item>
     <item msgid="6131821495505931173">"ቀይ"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"ከ30 ቀኖች በላይ የሆናቸው"</item>
+    <item msgid="2900554746706302178">"ከ60 ቀኖች በላይ የሆናቸው"</item>
+    <item msgid="5692284879054004388">"ከ90 ቀኖች በላይ የሆናቸው"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-am/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-am/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-am/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index d2358a9..03d6f70 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"የውሂብ ግንኙነትን አንቃ"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"የውሂብ ግንኙነትን አሰናክል"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"በVoLTE የቀረበ"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"የቪዲዮ ጥሪ ቀርቧል"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"የWifi ጥሪ ቀርቧል"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"የተንቀሳቃሽ ሬዲዮ ኃይል"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"የሲም አድራሻ ደብተር አሳይ"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"በቋሚነት የሚደወልባቸው  ቁጥሮች"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"በጣት አሻራ ይክፈቱ"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"ስልክዎን ለመክፈት፣ ግዢዎችን ለመፍቀድ ወይም በመለያ ወደ መተግበሪያዎች ለመግባት በቀላሉ የጣት አሻራ ዳሳሹን ብቻ ይንኩ።  ማን ጣት አሻራዎችን እንደሚያክሉ ላይ ይጠንቀቁ። አንድ የታከለ አሻራ ራሱ ብቻ ከእነዚህ ውስጥ ማንኛቸውንም ሊያደርጉ ይችላሉ።\n\nማስታወሻ፦ የእርስዎ ጣት አሻራ ከጠንካራ ስርዓተ ጥለት ወይም ፒን ያነሰ ደህንነት ሊኖረው ይችላል።  "<annotation id="url">"ተጨማሪ ለመረዳት"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"ስልክዎን ለመክፈት፣ ግዢዎችን ለመፍቀድ ወይም ወደ መተግበሪያዎች ለመግባት በቀላሉ የጣት አሻራ ዳሳሹን ይንኩ። የማን ጣት አሻራዎችን እንደሚያክሉ ላይ ይጠንቀቁ። አንዲት የታከለ አሻራ ራሱ እነዚህን ሊያደርግ ይችላል።\n\nማስታወሻ፦ የጣት አሻራዎ ደህንነት ከጠንካራ ስርዓተ ጥለት ወይም ፒን ያነሰ ሊሆን ይችላል።"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"ይቅር"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ቀጥል"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"ዝለል"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"ሰርዝ"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"እንጀምር!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ጣትዎን በዳሳሹ ላይ ያስቀምጡትና ንዝረት ከተሰማዎት በኋላ ያንሱት"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"ድንቅ ነው! አሁን ይድገሙት"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"ይቀጥሉ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"ሁሉንም የተለያዩ የጣት አሻራዎን ክፍሎች ከማከል ጣትዎን በትንሹ ያንቀሳቅሱት"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"የጣት አሻራ ታክሏል!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ይህን አዶ ባዩ ቁጥር፣ ማንነትን ለይቶ ለማወቅ ወይም ግዢን ፈቃድ ለመስጠት የእርስዎን የጣት አሻራ መጠቀም ይችላሉ።"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"የእርስዎን መሣሪያ ለማንቃት እና ለመክፈት የጣት አሻራ ዳሳሹን ነካ ማድረግ ብቻ ይበቃዎታል።"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"ይህን አዶ ሲመለከቱ የእርስዎን የጣት አሻራ መጠቀም ይችላሉ።"</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"ይህን አዶ በሚመለከቱበት ጊዜ በተጨማሪም ግዢዎችን ወይም ወደ በመለያ መተግበሪያ መግባቶችን መፍቀድ ይችላሉ።"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"የጣት አሻራን ማቀናበር ይዘለል?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"የእርስዎን ስልክ ለመክፈት የጣት አሻራዎችዎን እንደ አንድ መንገድ መርጠዋል። አሁን ከዘለሉት ይህንን በኋላ ላይ ማዘጋጀት ይኖርብዎታል። ማዘጋጀት አንድ ወይም ሁለት ደቂቃ ብቻ ነው የሚወስደው።"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ማያ ገጽ መቆለፊያ ያዋቅሩ"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"የWi-Fi ጥሪ ሲበራ የእርስዎ ስልክ በምርጫዎ እና በየትኛው ይበልጥ ጠንካራ እንደሆነ የሚወሰን ሆኖ ጥሪዎችን በWi-Fi አውታረ መረቦች ወይም በአገልግሎት አቅራቢዎ አውታረ መረብ በኩል ሊያዞር ይችላል። ይህን ባህሪ ከማብራትዎ በፊት ክፍያዎችን እና ሌሎች ዝርዝሮችን በተመለከተ አገልግሎት አቅራቢዎን ያነጋግሩ።"</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"የአስቸኳይ አደጋ አድራሻን ያዘምኑ"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"እንደ WiFi ያለ የ911 ጥሪ ካደረጉ የአስቸኳይ አደጋ አገልግሎቶች እንደ የእርስዎ አካባቢ ያለ አድራሻ ይጠቀሙበታል"</string>
     <string name="home_settings" msgid="212375129455718176">"መነሻ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"አሳይ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ድምፅ"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"እርሳ"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"አዋቅር"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"ያስሱ"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"ቦታ ያስለቅቁ"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"ማከማቻን ያቀናብሩ"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"የUSB ኮምፒዩተር ትይይዝ"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"እንደ.... ያግኙን"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"የማህደረ መረጃ መሣሪያ (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"ኦዲዮ"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"የተሸጎጠ ውሂብ"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"ሌላ"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"ሥርዓት"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> ይመርምሩ"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"ሌላ በመተግበሪያዎች፣ ከበይነመረቡ ወይም ብሉቱዝ የወረዱ ፋይሎች፣ የAndroid ፋይሎች እና የመሳሰሉትን ያካትታል። \n\nመላውን የዚህ <xliff:g id="NAME">^1</xliff:g> ይዘቶችን ለማየት አስስን ነካ ያድርጉ።"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"ሥርዓት በAndroid ሥርዓተ ክወና በውስጣዊ መንገድ ጥቅም ላይ የዋሉ ፋይሎችን ያካትታል። \n\nእነዚህ ፋይሎች በተናጠል ሊታዩ አይችሉም።"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> ፎቶዎች፣ ሙዚቃ፣ ፊልሞች፣ ወይም ሌላ ውሂብ <xliff:g id="SIZE">^2</xliff:g> ማከማቻ የያዘ አስቀምጦ ይሆናል። \n\nዝርዝሮች ለመመልከት ወደ ይቀይሩ<xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"የህግ መረጃ"</string>
     <string name="contributors_title" msgid="5917703088825286504">"አዋጮች"</string>
     <string name="manual" msgid="3025943393642974445">"መመሪያ"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"የደንብ ክትትል መረጃ"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"የመከታተያ መሰየሚያዎች"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"የደህንነት እና ክትትል መረጃ"</string>
     <string name="copyright_title" msgid="865906688917260647">"የቅጂ መብት"</string>
     <string name="license_title" msgid="1990487604356037871">"ፍቃድ"</string>
     <string name="terms_title" msgid="7697580845616764642">"ውሎች እና ደንቦች"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"ሁልጊዜ የበራ VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"ምንም ቪፒኤንዎች አልታከሉም።"</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"ሁልጊዜ-የበራ ንቁ"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"በዚህ መተግበሪያ አይደገፍም"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"ሁልጊዜ እንደተገናኙ የሚቆዩበት የVPN መገለጫ ይምረጡ። ከዚህ VPN ጋር ሲገናኝ ብቻ ነው የአውታረ መረብ ትራፊክ የሚፈቀደው።"</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"ምንም"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"ሁልጊዜ የበራ VPN ለአገልጋይም ለDNSም የአይ.ፒ. አድራሻ ያስፈልገዋል።"</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"ለማስከፈት ያንሸራትቱ፣ የይለፍ ቃል፣ ስርዓተ-ጥለት፣ ፒን"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"የስራ ፈተና፣ ስራ፣ መገለጫ"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"የሥራ መገለጫ፣ የሚተዳደር መገለጫ፣ አዋህድ፣ ውህደት፣ ሥራ፣ መገለጫ"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"የጣት ምልክት"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"የWi-Fi NFC መለያ ያዋቅሩ"</string>
     <string name="write_tag" msgid="8571858602896222537">"ጻፍ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ለመጻፍ አንድ መለያ መታ ያድርጉ..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"የጀርባ ውሂብ በWi-Fi በኩል ብቻ ነው የሚገኘው። ይሄ Wi-Fi በማይገኝበት ጊዜ በአንዳንድ መተግበሪያዎች ወይም አገልግሎቶች ላይ ተጽዕኖ ሊፈጥር ይችላል።"</string>
     <string name="condition_work_title" msgid="7293722361184366648">"የሥራ መገለጫ ጠፍቷል"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"መተግበሪያዎች፣ የበስተጀርባ ሥምረት፣ እና ሌሎች ከእርስዎ የሥራ መገለጫ ጋር የተገናኙ ባህሪዎች ጠፍተዋል።"</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"የአስተያየት ጥቆማዎች (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"የአስተያየት ጥቆማዎች"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"አስወግድ"</string>
     <string name="color_temperature" msgid="2070126836910615605">"ቀዝቀዝ ያለ የቀለም ሙቀት"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ቀዝቀዝ ያሉ የማሳያ ቀለሞችን ይጠቀሙ"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"የShortcutManager ደረጃ-ገዳቢ ቆጣሪዎች ዳግም ይቀናበሩ?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"የማያ ገጽ መቆለፊያ ማሳወቂያዎችን ይቆጣጠሩ"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"የማሳወቂያ ይዘት አሳይ ወይም ደብቅ"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"ሁሉም"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"ድጋፍ"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> ዲፒ"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"አነስተኛ ስፋት"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ምንም የተጫኑ መተግበሪያዎች የፕሪሚየም ኤስኤምኤስ መዳረሻ አልጠየቁም"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"የፕሪሚየም ኤስኤምኤስ መዳረሻ"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"ተሰናክሏል"</string>
     <string name="demo_mode" msgid="2655748420527206870">"የተግባራዊነት ማሳይ ሁነታ"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"እርስዎን ለመርዳት እዚህ እንገኛለን"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"እዚህ ላይ 24/7 ለእርስዎ እንገኛለን"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"ማንኛቸውም ችግሮችን ለመፍታት የድጋፍ ቡድናችን እዚህ አለ"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"የድጋፍ ቡድናችን ሙሉ ቀን፣ በየቀኑ እዚህ ነው"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"የስልክ ድጋፍ ሰዓቶች (አካባቢያዊ ጊዜ)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"እርዳታ ይፈልጉ ወይም ጠቃሚ ምክሮችን እና ዘዴዎችን ያስሱ"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"ድጋፍ ለ፦"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"ወደ ውጭ አገር እየተጓዙ ነው?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"አለምአቀፍ ክፍያዎች ተፈጻሚ ሊሆኑ ይችላሉ"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"ስልክ"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"ውይይት"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"ጠቃሚ ምክሮችን እና ዘዴዎችን አስስ"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"እገዛን ፈልግ እና ግብረመልስ ላክ"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"ለድጋፍ ወደ መለያ ይግቡ"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"ግባ"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"መለያዎትን መድረስ አልቻሉም?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"የሥርዓት መረጃን ላክ"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"የእርስዎን ችግር በፍጥነት ለመፍታት ማገዝ እንዲቻል ለምርመራ የሥርዓት መረጃን ማግኘት ያስፈልገናል።"</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"ዳግም አታሳይ"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"የስራ መገለጫ ቅንብሮች"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"የእውቂያ ፍለጋ"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"በእርስዎ ድርጅት የሚደረጉ የእውቂያ ፍለጋዎች ደዋዮችን እና እውቂያዎችን እንዲለዩ ፍቀድ"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ሰዓቶች</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ሰዓቶች</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ደቂቃዎች</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ደቂቃዎች</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ሰከንዶች</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ሰከንዶች</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> ይጠብቁ"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"ኮምፒዩተር"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"ጆሮ ማዳመጫ"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"ስልክ"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"የጆሮ ማዳመጫ"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"የግቤት መለዋወጫ"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"ብሉቱዝ"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"የማከማቻ ባዶ ቦታን ነጻ ለማድረግ እንዲያግዝ የማከማቻ አስተዳዳሪ ከእርስዎ መሣሪያ ላይ በምትኬት የተቀመጡ ፎቶዎችን እና ቪዲዮዎችን አስወግዷል።"</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ፎቶዎች እና ቪዲዮዎች አስወግድ"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"የማከማቻ አስተዳዳሪ"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"ራስ-ሰር"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"በራስ"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"የእጅ ምልክቶች"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"ወደ ካሜራ ዝለል"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"ካሜራውን በፍጥነት ለመክፈት የኃይል አዝራሩን ሁለቴ ነካ ብቻ ያድርጉ። ከማናቸውም ማያ ገጽ ላይ ይሠራል።"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ካሜራ ወርወር ያድርጉ"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"በፊት እና ኋላ ካሜራ መካከል ለመቀያይር ድርብ ጠምዘዝ ያድርጉ።"</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"ፈጣን ማያ ገጽ ፍተሻ"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"ሙሉ በሙሉ ስልክዎን ሳያነቁት ለመፈተሽ፣ ያንፏቁት ወይም ያንሱት።"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"ለማስታወቂያዎች በጣት ጠረግ ያድርጉ"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"ከማናቸውም ማያ ገጽ ላይ የእርስዎን ማሳወቂያዎች ለመፈተሽ የአሻራ አነፍናፊው ላይ ወደ ታች በጣት ጠረግ ያድርጉ።"</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"በርቷል"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"ጠፍቷል"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"ማስነሻ አስቀድሞ ተከፍቷል"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"በመጀመሪያ ከበይነመረቡ ጋር ይገናኙ"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"በአገልግሎት አቅራቢ በተቆለፉ መሣሪያዎች ላይ አይገኝም"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index e553b01..b2078b6 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"قرنفلي"</item>
     <item msgid="6131821495505931173">"أحمر"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"أكثر من 30 يومًا"</item>
+    <item msgid="2900554746706302178">"أكثر من 60 يومًا"</item>
+    <item msgid="5692284879054004388">"أكثر من 90 يومًا"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-ar/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-ar/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-ar/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index cc7f446..7eef03f 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -43,6 +43,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"تمكين اتصال البيانات"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"تعطيل اتصال البيانات"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"‏خاضع لإدارة حسابات VoLTE"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"مكالمات الفيديو متوفِّرة"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"‏اتصال Wifi متوفِّر"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"الطاقة اللاسلكية الخلوية"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"‏عرض دفتر عناوين SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"عرض أرقام الاتصال الثابت"</string>
@@ -346,7 +348,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"إلغاء التأمين باستخدام بصمة الإصبع"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"كل ما عليك هو لمس مستشعر بصمات الإصبع لإلغاء تأمين هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات. وعليك توخي الحذر عند إضافة بصمة الإصبع لأشخاص آخرين؛ فأي بصمة من هذه البصمات يمكن أن تؤدي إلى تنفيذ أي إجراء من الإجراءات السابق ذكرها.\n\nملاحظة: يمكن أن تكون بصمة إصبعك أقل أمانًا من استخدام نقش أو رقم تعريف شخصي قوي. "<annotation id="url">"مزيد من المعلومات"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"كل ما عليك فعله هو لمس مستشعر بصمات الإصبع لإلغاء قفل هاتفك أو السماح بإجراء عمليات الشراء أو تسجيل الدخول إلى التطبيقات. عليك توخي الحذر عند إضافة بصمة الإصبع لأشخاص آخرين؛ فأي بصمة من هذه البصمات يمكن أن تؤدي إلى تنفيذ أي إجراء من الإجراءات السابق ذكرها.\n\nملاحظة: يمكن أن تكون بصمة إصبعك أقل أمانًا من استخدام نقش أو رقم تعريف شخصي قوي."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"إلغاء"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"متابعة"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"تخطٍ"</string>
@@ -367,12 +369,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"حذف"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"البدء"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ضع إصبعك على المستشعر وارفعه بعد الشعور بالاهتزاز"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"رائع! كرِّر ذلك الآن"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"استمر في المحاولة"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"حرِّك إصبعك قليلاً لإضافة جميع الأجزاء المختلفة لبصمة إصبعك"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"تمت إضافة بصمة إصبع"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"يمكنك استخدام بصمة إصبعك متى رأيت هذا الرمز لتحديد الهوية أو الإذن بعملية شراء."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"لن يلزمك سوى لمس مستشعر بصمات الإصبع لتنشيط الجهاز وإلغاء قفله."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"عند رؤية هذا الرمز، يمكنك استخدام بصمة الإصبع."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"عندما ترى هذا الرمز، يمكنك أيضًا السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"هل تريد تخطي إعداد بصمة الإصبع؟"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"لقد اخترت استخدام بصمة الإصبع كوسيلة لإلغاء تأمين هاتفك. إذا تخطيت ذلك الآن، فستحتاج إلى إعداده لاحقًا. لن يستغرق منك الإعداد سوى دقيقة تقريبًا."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"إعداد تأمين الشاشة"</string>
@@ -871,6 +873,8 @@
     <item msgid="6200207341126893791">"١"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"‏عند تشغيل الاتصال عبر Wi-Fi، يمكن للهاتف توجيه المكالمات عبر شبكات Wi-Fi أو عبر شبكة مشغّل شبكة الجوّال، حسب تفضيلك وحسب الإشارة الأقوى. وقبل تشغيل هذه الميزة، راجع رسوم مشغل شبكة الجوّال والتفاصيل الأخرى حول شبكة الجوّال."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"تحديث عنوان الطوارئ"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"‏العنوان الذي تستخدمه خدمات الطوارئ على أساس أنه موقعك في حالة إجرائك اتصالاً برقم 911 باستخدام WiFi"</string>
     <string name="home_settings" msgid="212375129455718176">"الشاشة الرئيسية"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"عرض"</string>
     <string name="sound_settings" msgid="5534671337768745343">"الصوت"</string>
@@ -1095,6 +1099,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"حذف"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"إعداد"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"استكشاف"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"إخلاء بعض المساحة"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"إدارة سعة التخزين"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"‏اتصال USB بالكمبيوتر"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"اتصال كـ"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"‏جهاز الوسائط (MTP)"</string>
@@ -1131,8 +1137,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"الصوت"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"البيانات المخزنة مؤقتًا"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"غير ذلك"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"النظام"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"استكشاف <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"‏ملفات أخرى تتضمن الملفات التي تمت مشاركتها وحفظتها التطبيقات والملفات التي تم تنزيلها من الإنترنت أو البلوتوث وملفات Android وغير ذلك. \n\nلعرض كامل محتوى <xliff:g id="NAME">^1</xliff:g>، انقر على \"استكشاف\"."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"‏يتضمن النظام ملفات يتم استخدامها داخليًا من قِبل نظام التشغيل Android. \n\n ولا يمكن عرض هذه  الملفات كل على حدة."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"يمكن أن يمتلك <xliff:g id="USER_0">^1</xliff:g> صورًا أو موسيقى أو أفلامًا أو تطبيقات أو بيانات أخرى محفوظة وتستهلك سعة تخزينية بمقدار <xliff:g id="SIZE">^2</xliff:g>. \n\nلعرض التفاصيل، عليك التبديل إلى <xliff:g id="USER_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>
@@ -1323,7 +1331,8 @@
     <string name="legal_information" msgid="5769301644270604095">"المعلومات القانونية"</string>
     <string name="contributors_title" msgid="5917703088825286504">"المساهمون"</string>
     <string name="manual" msgid="3025943393642974445">"الكتيب"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"المعلومات التنظيمية"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"التصنيفات التنظيمية"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"الأمان والمعلومات التنظيمية"</string>
     <string name="copyright_title" msgid="865906688917260647">"حقوق الطبع والنشر"</string>
     <string name="license_title" msgid="1990487604356037871">"الترخيص"</string>
     <string name="terms_title" msgid="7697580845616764642">"البنود والشروط"</string>
@@ -2298,6 +2307,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"‏شبكة ظاهرية خاصة (VPN) دائمة التشغيل"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"‏لم تتم إضافة أي شبكة ظاهرية خاصة (VPN)."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"تنشيط التشغيل دائمًا"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"عدم التوافق مع هذا التطبيق"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"‏حدد ملفًا شخصيًا للشبكة الظاهرية الخاصة (VPN) للاتصال الدائم بها. لن يتم السماح بحركة مرور الشبكة إلا عند الاتصال بهذه الشبكة الظاهرية الخاصة."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"لا شيء"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"‏تتطلب الشبكة الظاهرية الخاصة (VPN) دائمة التشغيل عنوان IP لكل من الخادم ونظام أسماء النطاقات."</string>
@@ -2582,6 +2592,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"مرر لإلغاء التأمين، كلمة مرور، نقش، رقم تعريف شخصي"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"المنافسة في العمل، عمل، ملف شخصي"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"الملف الشخصي للعمل، ملف شخصي مُدار، يوحِّد، توحيد، عمل، ملف شخصي"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"إيماءة"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏إعداد علامة NFC عبر Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"كتابة"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"انقر على كلمة علامة لكتابة..."</string>
@@ -3113,7 +3124,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"‏لا تتوفر بيانات الخلفية إلا عبر Wi-Fi. وقد يؤثر هذا في أداء بعض التطبيقات أو الخدمات عند عدم توفر خدمة Wi-Fi."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"تم تعطيل الملف الشخصي للعمل"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"تم تعطيل التطبيقات ومزامنة الخلفية والميزات الأخرى ذات الصلة بالملف الشخصي للعمل."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"الاقتراحات (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"الاقتراحات"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"أكثر من <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"إزالة"</string>
     <string name="color_temperature" msgid="2070126836910615605">"درجة حرارة لون رائعة"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"استخدم ألوان أكثر روعة للشاشة"</string>
@@ -3210,6 +3222,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"‏هل تريد إعادة تعيين عدادات تقييد المعدل في ShortcutManager؟"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"التحكم في إشعارات شاشة التأمين"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"إظهار محتوى الإشعار أو إخفاؤه"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"الكل"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"الدعم"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"أصغر عرض"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"‏لم تطلب أي تطبيقات مثبَّتة إمكانية إرسال رسائل قصيرة SMS للخدمات."</string>
@@ -3217,9 +3231,55 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"‏إمكانية إرسال رسائل قصيرة SMS للخدمات"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"معطّل"</string>
     <string name="demo_mode" msgid="2655748420527206870">"الوضع التجريبي"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"نحن هنا لمساعدتك"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"يمكنك التواصل معنا على مدار 24 ساعة طوال أيام الأسبوع."</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"يمكنك التواصل هنا مع فريق الدعم لحل أي مشكلات"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"فريق الدعم متوفر طوال اليوم، وكل يوم"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"‏ساعات عمل فريق الدعم عبر الهاتف (بالتوقيت المحلي)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"ابحث عن المساعدة أو استكشف النصائح والحيل"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"الدعم لبلد:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"هل أنت مسافر للخارج؟"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"قد تسري رسومًا للاتصالات الدولية."</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"الهاتف"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"دردشة"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"استكشاف النصائح والحيل"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"البحث في المساعدة وإرسال تعليقات"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"تسجيل الدخول للحصول على الدعم"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"تسجيل الدخول"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"ألا تستطيع الدخول إلى حسابك؟"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"إرسال معلومات النظام"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"للمساعدة في سرعة معالجة مشكلتك، يلزمنا معرفة معلومات النظام لاستخدامها في التشخيص."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"عدم عرض ذلك مجددًا"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"إعدادات الملف الشخصي للعمل"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"البحث في جهات الاتصال"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"السماح بعمليات البحث عن جهات اتصال بواسطة مؤسستك لتحديد المتصلين وجهات الاتصال"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="zero"><xliff:g id="NUMBER">%s</xliff:g> ساعات</item>
+      <item quantity="two">ساعتان (<xliff:g id="NUMBER">%s</xliff:g>)</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> ساعات</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> ساعة</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ساعة</item>
+      <item quantity="one">ساعة واحدة</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="zero"><xliff:g id="NUMBER">%s</xliff:g> دقائق</item>
+      <item quantity="two">دقيقتان (<xliff:g id="NUMBER">%s</xliff:g>)</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> دقائق</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> دقيقة</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> دقيقة</item>
+      <item quantity="one">دقيقة واحدة</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="zero"><xliff:g id="NUMBER">%s</xliff:g> ثانية</item>
+      <item quantity="two">ثانيتان (<xliff:g id="NUMBER">%s</xliff:g>)</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> ثوانٍ</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> ثانية</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ثانية</item>
+      <item quantity="one">ثانية واحدة</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"الانتظار <xliff:g id="ESTIMATE">%1$s</xliff:g> تقريبًا"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"كمبيوتر"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"سماعة رأس"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"هاتف"</string>
@@ -3227,4 +3287,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"سماعة أذن"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"جهاز إدخال طرفي"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"بلوتوث"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"للمساعدة في تفريغ مساحة التخزين، يزيل مدير سعة التخزين من جهاز الصور ومقاطع الفيديو التي تم الاحتفاظ بنسخة احتياطية منها."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"إزالة الصور ومقاطع الفيديو"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"مدير سعة التخزين"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"تلقائي"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"يدوي"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"الإيماءات"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"الانتقال سريعًا إلى الكاميرا"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"لفتح الكاميرا سريعًا، لن يلزمك سوى النقر نقرًا مزدوجًا على زر التشغيل. ويعمل ذلك في أي شاشة."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"تقليب الكاميرا"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"للتبديل بين الكاميرا الأمامية والخلفية، يمكنك إجراء لفٍّ مزدوج."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"فحص شاشة سريع"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"للتحقق من هاتفك بدون تنشيطه تمامًا، يمكنك تنبيهه أو حمله."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"التمرير سريعًا للإشعارات"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"للاطلاع على الإشعارات في أي شاشة، مرّّر سريعًا لأسفل على مستشعر بصمات الإصبع."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"تشغيل"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"إيقاف"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"تم إلغاء قفل برنامج التحميل مسبقاً"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"الاتصال بالإنترنت أولاً"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"عدم التوفر على الأجهزة التي يقفلها مشغل شبكة الجوال"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-az-rAZ/arrays.xml b/res/values-az-rAZ/arrays.xml
index f3b01b1..7e70de9 100644
--- a/res/values-az-rAZ/arrays.xml
+++ b/res/values-az-rAZ/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Çəhrayı"</item>
     <item msgid="6131821495505931173">"Qırmızı"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"30 gündən köhnədir"</item>
+    <item msgid="2900554746706302178">"60 gündən köhnədir"</item>
+    <item msgid="5692284879054004388">"90 gündən köhnədir"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-az-rAZ/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-az-rAZ/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-az-rAZ/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index dcb9027..e8bdbf4 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Data Bağlantısını Aktiv Edin"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Data Bağlantısını Deaktiv Edin"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE Təmin edildi"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Video Zəngi Təmin Edildi"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi Zəngi Təmin Edildi"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Mobil Radio Enerjisi"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM Ünvanları Kitabçasına Baxın"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Stabil Yığım Nömrələrinə Baxın"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Barmaq izi ilə kiliddən çıxarın"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Telefonunuzu kiliddən çıxarmaq, alışları təsdiqləmək və ya tətbiqlərə daxil olmaq üçün sadəcə barmaq izi sensoruna toxunun. Kimi əlavə etdiyinizə diqqət edin. Hətda əlavə edilmiş bir iz bunlardan hər hansı birini edə bilər. \n\nQeyd: Barmaq iziniz güclü model və ya PİN koddan az güvənlidir. "<annotation id="url">"Daha ətraflı"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Telefonunuzu kiliddən çıxarmaq, alışları təsdiqləmək və ya tətbiqlərə daxil olmaq üçün sadəcə barmaq izi sensoruna toxunun. Kimi əlavə etdiyinizə diqqət edin. Hətda əlavə edilmiş bir iz bunlardan hər hansı birini edə bilər.\n\nQeyd: Barmaq iziniz güclü model və ya PİN koddan daha az təhlükəsizdir."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Ləğv edin"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Davam edin"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Ötürün"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Silin"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Başlayaq!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Barmağı sensora qoyun və vibrasiyə hiss edənə qədər saxlayın"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Əla! İndi təkrarlayın"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Davam edin"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Barmaq izinizi tam əlavə etmək üçün barmağınızı yavaşca hərəkət etdirin"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Barmaq izi əlavə edildi!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Bu piktoqramı nə vaxtsa görsəniz, identifikasiya və ya satın almanı təsdiqləmək üçün barmaq izinizdən istifadə edə bilərsiniz."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Ayılmaq və cihaz kilidini açmaq üçün sadəcə barmaq izi sensoruna toxunun."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Bu ikonu gördüyünüz zaman, barmaq izinizi istifadə edə bilərsiniz."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Bu ikonanı gördükdə, həmçinin satınalmaları təsdiqləyə və ya tətbiqə daxil ola bilərsiniz."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Barmaq izi ayarları ötürülsün?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Telefon kilidini açmaq üçün barmaq izindən istifadə etməyi seçmisiniz. Bunu indi ötürsəniz, bu funksiyanı daha sonra ayarlamalı olacaqsınız. Ayarlamaq bir-iki dəqiqə vaxtınızı aparacaq."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Ekran kilidi quraşdırın"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi çağrısı aktiv olan zaman, tərcihinizdən və siqnalın gücündən asılı olaraq telefon Wi-Fi və ya mobil şəbəkə üzərindən çağrı edə bilər. Bu funksiyanı aktivləşdirmədən öncə operatorun tariflərini və digər şeylərini öyrənin."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"Fövqəladə Ünvanını yeniləyin"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"WiFi istifadə edərək 911 çağrısı etsəniz, ünvan təcili xidmətlər tərəfindən istifadə olunur"</string>
     <string name="home_settings" msgid="212375129455718176">"Əsas səhifə"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Göstər"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Səs"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Unudun"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Quraşdırın"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Kəşf edin"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Yer boşaldın"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Yaddaşı idarə edin"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB kompüter bağlantısı"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Qoşulmanı seçin"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Media cihaz (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Keşlənmiş data"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Digər"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> araşdırın"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Digərlərinə İnternet və ya Bluetooth, Android fayl və s. yerdən endirilmiş tətbiq və fayllarda saxlanılan paylaşılmış fayllar daxildir. \n\nBu <xliff:g id="NAME">^1</xliff:g> adlı kartın bütün kontentinə baxmaq üçün Kəşf edin seçiminə tıklayın."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Sistemin tərkibində Android əməliyyat sistemi tərəfindən internal olaraq istifadə olunmuş fayllar var. \n\nBu fayllara fərdi şəkildə baxıla bilməz."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> yaddaşda <xliff:g id="SIZE">^2</xliff:g> yer tutan foto, musiqi, film, tətbiq və digər datanı saxlamış ola bilər. \n\nDetallara baxmaq üçün <xliff:g id="USER_1">^1</xliff:g> adına keçin."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> cihazını quraşdırın"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Daşınan yaddaş ehtiyatı kimi istifadə edin"</string>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Hüquqi məlumat"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Yazarlar"</string>
     <string name="manual" msgid="3025943393642974445">"Dərslik"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Normativ informasiya"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Tənzimləyici etiketlər"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Təhlükəsizlik və tənzimləyici məlumat"</string>
     <string name="copyright_title" msgid="865906688917260647">"Müəlliflik hüququ"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisenziya"</string>
     <string name="terms_title" msgid="7697580845616764642">"Şərtlər"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN həmişə aktiv"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"VPN əlavə edilməyib."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Həmişə aktivdir"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Bu tətbiq tərəfindən dəstəklənmir"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Həmişə qoşulu qalmaq üçün VPN profili seçin. Yalnız bu VPN\'ə qoşulu olduqda şəbəkə trafikinə icazə veriləcək."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Heç biri"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Qoşulu VPN həmişə server və DNS üçün IP ünvan tələb edir."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"kilidi açmaq üçün sürüşdürün, parol, qrafik açar, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"iş məşqi, iş, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"iş profili, idarə olunan profil, birləşdirin, birləşmə, iş, profil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"jest"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC Teqi quraşdırın"</string>
     <string name="write_tag" msgid="8571858602896222537">"Yazın"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tazmaq üçü teqə tıklayın..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Arxa fon datası yalnız  Wi-Fi vasitəsilə əlçatandır. Wi-Fi əlçatan olmadıqda, bəzi tətbiq və ya xidmətlərə təsir edə bilər."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"İş profili deaktivdir"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Tətbiq, arxa fon sinxronizasiyası və iş profiliniz ilə bağlı digər xüsusiyyətlər deaktiv edildi."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Təkliflər (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Təkliflər"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Silin"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Sərin rəng temperaturu"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Serinləşdirici ekran rənglərini istifadə edin"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager reytinq limit hesablayıcı sıfırlansın?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Ekran kilidi bildirişlərinə nəzarət edin"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Bildiriş məzmununu göstərin və ya gizlədin"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Bütün"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Dəstək"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Ən kiçik en"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Heç bir quraşdırılmış tətbiq Premium SMS girişi tələb etməyib"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium SMS girişi"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Qeyri-aktiv"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Demo rejimi"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Yardım üçün buradayıq"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Sizin üçün 24/7 buradayıq"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Dəstək komandamız problemləri həll etmək üçün xidmətinizdədir"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Dəstək komandamız hər gün, hər saat əlçatandır"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Telefon dəstək saatları (yerli vaxt)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Yardım axtarın və ya məsləhət və tövsiyələri kəşf edin"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Dəstək:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Xaricə səyahət edirsiniz?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Beynəlxalq xərclər çıxıla bilər"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Söhbət"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Məsləhət və tövsiyələri kəşf edin"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Yardım axtarın və əks əlaqə göndərin"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Dəstək üçün daxil olun"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Giriş"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Hesabınıza daxil ola bilmirsiniz?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Sistem məlumatı göndərin"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Probleminizi daha cəld ünvanlamaq üçün bizə diaqnostikanın sistem məlumatı lazımdır."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Yenidən göstərməyin"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"İş profil ayarları"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontakt axtarışı"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Zəng edənləri və kontaktları təyin etmək üçün təşkilatınız tərəfindən kontakt axtarışlarına icazə verin"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> saat</item>
+      <item quantity="one">1 saat</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> dəqiqə</item>
+      <item quantity="one">1 dəqiqə</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> saniyə</item>
+      <item quantity="one">1 saniyə</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> gözləyin"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Kompüter"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Qulaqlıq"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telefon"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Qulaqlıq"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Daxiletmə periferiki"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Yaddaşda boş yer yaratmaq üçün, yaddaş meneceri yedəklənmiş foto və videoları cihazınızdan silir."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Foto və videoları silin"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Yaddaş Meneceri"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Avtomatik"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Təlimat"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Jestlər"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Kameraya keçin"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Kameranı cəld açmaq üçün, enerji düyməsinə iki dəfə klikləyin. Hər ekranda işləyir."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Kameranı çevirin"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Ön və arxa kameralar arasında seçim etmık üçün, iki dəfə burun."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Cəld ekran yoxlanışı"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Telefonunuzu tam olaraq oyatmadan yoxlamaq üçün, tərpədin və ya əlinizə götürün."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Bildirişlər üçün sürüşdürün"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Bildirişlərinizi hər hansı ekrandan yoxlamaq üçün, barmaqizi sensorunda aşağı sürüşdürün."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Aktiv"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Deaktiv"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Əməliyyat sistemi yükləyicisi artıq kiliddən çıxarılıb"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"İlk olaraq İnternetə qoşulun"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Operatoru kilidlənmiş cihazlarda əlçatan deyil"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index cd9d3a7..34026e0 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -37,28 +37,34 @@
     <string name="header_category_personal" msgid="3310195187905720823">"Lično"</string>
     <string name="header_category_access" msgid="7580499097416970962">"Pristup"</string>
     <string name="header_category_system" msgid="2816866961183068977">"Sistem"</string>
-    <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Omogući vezu za prenos podataka"</string>
-    <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Onemogući vezu za prenos podataka"</string>
-    <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Dodeljeno za VoLTE"</string>
-    <string name="radio_info_radio_power" msgid="1208229437948820417">"Napajanje za radio na mobilnim uređajima"</string>
-    <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Prikaži SIM adresar"</string>
+    <string name="turn_on_radio" msgid="8706561489788373676">"Uključi radio"</string>
+    <string name="turn_off_radio" msgid="1820294552893884115">"Isključi radio"</string>
+    <string name="sms_over_ims_on" msgid="5085290395865632925">"Uključi SMS preko IMS-a"</string>
+    <string name="sms_over_ims_off" msgid="8354792045992793959">"Isključi SMS preko IMS-a"</string>
+    <string name="ims_reg_required_on" msgid="3885152087309614653">"Potrebno je uključiti IMS registraciju"</string>
+    <string name="ims_reg_required_off" msgid="1720570343422743943">"Potrebno je da se isključi IMS registracija"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Uključi oznaku dodeljeno za VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Isključi oznaku dodeljeno za VoLTE"</string>
+    <string name="lte_ram_dump_on" msgid="8568568019520172177">"Uključi sirovu kopiju lte ram-a"</string>
+    <string name="lte_ram_dump_off" msgid="2514507918652378283">"Isključi sirovu kopiju lte ram-a"</string>
+    <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Prikaži SIM adresar"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Prikaži brojeve za fiksno biranje"</string>
     <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Prikaži brojeve za servisno biranje"</string>
-    <string name="radioInfo_menu_getPDP" msgid="8951059003824985976">"Preuzmi PDP listu"</string>
-    <string name="radioInfo_service_in" msgid="1697703164394784618">"Radi"</string>
-    <string name="radioInfo_service_out" msgid="7999094221728929681">"Ne radi"</string>
-    <string name="radioInfo_service_emergency" msgid="6274434235469661525">"Samo hitni pozivi"</string>
-    <string name="radioInfo_service_off" msgid="7536423790014501173">"Radio je isključen"</string>
+    <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Preuzmi PDP listu"</string>
+    <string name="radioInfo_service_in" msgid="1915416319177520020">"U usluzi"</string>
+    <string name="radioInfo_service_out" msgid="5238736759641916278">"Usluga nije moguća"</string>
+    <string name="radioInfo_service_emergency" msgid="2485604591272668370">"Samo hitni pozivi"</string>
+    <string name="radioInfo_service_off" msgid="1434084741785525415">"Radio je isključen"</string>
     <string name="radioInfo_roaming_in" msgid="9045363884600341051">"Roming"</string>
-    <string name="radioInfo_roaming_not" msgid="4849214885629672819">"Nije u romingu"</string>
+    <string name="radioInfo_roaming_not" msgid="2851853244069662307">"Nije u romingu"</string>
     <string name="radioInfo_phone_idle" msgid="7489244938838742820">"Neaktivan/na"</string>
     <string name="radioInfo_phone_ringing" msgid="4883724645684297895">"Zvonjava"</string>
-    <string name="radioInfo_phone_offhook" msgid="5873835692449118954">"Pozivanje je u toku"</string>
+    <string name="radioInfo_phone_offhook" msgid="4174402846862780998">"Poziv u toku"</string>
     <string name="radioInfo_data_disconnected" msgid="1959735267890719418">"Veza je prekinuta"</string>
     <string name="radioInfo_data_connecting" msgid="8404571440697917823">"Povezivanje"</string>
     <string name="radioInfo_data_connected" msgid="7074301157399238697">"Povezano"</string>
     <string name="radioInfo_data_suspended" msgid="5315325487890334196">"Obustavljeno"</string>
-    <string name="radioInfo_unknown" msgid="1476509178755955088">"Nepoznato"</string>
+    <string name="radioInfo_unknown" msgid="737385314432468266">"nepoznato"</string>
     <string name="radioInfo_display_packets" msgid="8654359809877290639">"pak."</string>
     <string name="radioInfo_display_bytes" msgid="4018206969492931883">"bajta(ova)"</string>
     <string name="radioInfo_display_dbm" msgid="3621221793699882781">"dBm"</string>
@@ -173,39 +179,41 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Uneli ste nevažeći port."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Pregledač koristi HTTP proksi, ali druge aplikacije ne mogu da ga koriste."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
-    <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Informacije o lokaciji predajnika (zastarelo):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Informacije o susednom predajniku (zastarelo):"</string>
-    <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Brzina osvežavanja informacija o predajniku:"</string>
-    <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Sve informacije o merenju za predajnik:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Informacije o vezi za prenos podataka u realnom vremenu:"</string>
-    <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Usluga prenosa podataka:"</string>
+    <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokacija:"</string>
+    <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Susedni ID klijenta:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informacije o ćeliji:"</string>
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
+    <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Pokušaji prenosa podataka:"</string>
+    <string name="radio_info_gprs_service_label" msgid="6699616076706524202">"Tehnologija za podatke:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
-    <string name="radio_info_call_redirect_label" msgid="2743797189722106231">"Preusmeravanje poziva:"</string>
-    <string name="radio_info_ppp_resets_label" msgid="3587319503902576102">"Broj PPP resetovanja od pokretanja:"</string>
-    <string name="radio_info_current_network_label" msgid="9151285540639134945">"Aktuelna mreža:"</string>
-    <string name="radio_info_ppp_received_label" msgid="363579470428151850">"Primljeni podaci:"</string>
-    <string name="radio_info_gsm_service_label" msgid="1370863866816125489">"Glasovna usluga:"</string>
-    <string name="radio_info_signal_strength_label" msgid="5155734002519307416">"Jačina signala:"</string>
-    <string name="radio_info_call_status_label" msgid="2611065018172747413">"Status glasovnog poziva:"</string>
-    <string name="radio_info_ppp_sent_label" msgid="7748668735880404586">"Poslati podaci:"</string>
-    <string name="radio_info_message_waiting_label" msgid="1037302619943328273">"Poruka na čekanju:"</string>
-    <string name="radio_info_phone_number_label" msgid="7942153178953255231">"Broj telefona:"</string>
-    <string name="radio_info_band_mode_label" msgid="8730871744887454509">"Izaberite radio opseg"</string>
-    <string name="radio_info_voice_network_type_label" msgid="1443496502370667071">"Tip glasovne mreže:"</string>
-    <string name="radio_info_data_network_type_label" msgid="7094323145105149312">"Tip mreže za prenos podataka:"</string>
-    <string name="radio_info_set_perferred_label" msgid="3511830813500105512">"Podesite željeni tip mreže:"</string>
+    <string name="radio_info_call_redirect_label" msgid="1654674226961476872">"Preusmeravanje poziva:"</string>
+    <string name="radio_info_ppp_resets_label" msgid="3241667824729310546">"Broj PPP ponovnog postavljanja od pokretanja:"</string>
+    <string name="radio_info_gsm_disconnects_label" msgid="1683069665736339820">"Prekidi GSM veze:"</string>
+    <string name="radio_info_current_network_label" msgid="3256402602440102610">"Trenutna mreža:"</string>
+    <string name="radio_info_data_successes_label" msgid="4417894113689054945">"Uspešni prenosi podataka:"</string>
+    <string name="radio_info_ppp_received_label" msgid="3345184342444878849">"Primljeno preko PPP protokola:"</string>
+    <string name="radio_info_gsm_service_label" msgid="8595694240281347716">"Tehnologija za glas:"</string>
+    <string name="radio_info_signal_strength_label" msgid="1931937920896925766">"Jačina signala:"</string>
+    <string name="radio_info_call_status_label" msgid="4896238900685510883">"Status poziva:"</string>
+    <string name="radio_info_ppp_sent_label" msgid="5009102250704375687">"Poslato preko PPP protokola:"</string>
+    <string name="radio_info_radio_resets_label" msgid="9211343458143291617">"Ponovna postavljanja radija:"</string>
+    <string name="radio_info_message_waiting_label" msgid="6981842420058672207">"Poruka na čekanju:"</string>
+    <string name="radio_info_phone_number_label" msgid="7192944627907412169">"Broj telefona:"</string>
+    <string name="radio_info_band_mode_label" msgid="441469694142042022">"Izaberi radio opseg"</string>
+    <string name="radio_info_network_type_label" msgid="3706382548257257987">"Tip mreže:"</string>
+    <string name="radio_info_set_perferred_label" msgid="9039200405863503267">"Podesite željeni tip mreže:"</string>
     <string name="radio_info_ping_hostname_v4" msgid="7045103377818314709">"IPv4 imena hosta za pingovanje (www.google.com):"</string>
     <string name="radio_info_ping_hostname_v6" msgid="1130906124160553954">"IPv6 imena hosta za pingovanje (www.google.com):"</string>
-    <string name="radio_info_http_client_test" msgid="2382286093023138339">"Test za HTTP klijenta:"</string>
-    <string name="ping_test_label" msgid="579228584343892613">"Pokreni test pingovanja"</string>
+    <string name="radio_info_http_client_test" msgid="5733604021077701555">"Test za HTTP klijenta:"</string>
+    <string name="ping_test_label" msgid="7255376471490860631">"Pokreni test pingovanja"</string>
     <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
     <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Ažuriraj"</string>
     <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"Osveži"</string>
-    <string name="radio_info_toggle_dns_check_label" msgid="6625185764803245075">"Uključi/isključi DNS proveru"</string>
+    <string name="radio_info_toggle_dns_check_label" msgid="8292252930563286858">"Uključi/isključi DNS proveru"</string>
     <string name="oem_radio_info_label" msgid="6163141792477958941">"Informacije/podešavanja specifična za OEM"</string>
-    <string name="band_mode_title" msgid="4071411679019296568">"Podesite režim radio opsega"</string>
-    <string name="band_mode_loading" msgid="3555063585133586152">"Učitava se lista opsega…"</string>
+    <string name="band_mode_title" msgid="954174198903776205">"Podešavanje GSM/UMTS opsega"</string>
+    <string name="band_mode_loading" msgid="548764766363847336">"Učitava se lista opsega..."</string>
     <string name="band_mode_set" msgid="5730560180249458484">"Podesi"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Neuspešno"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Uspešno"</string>
@@ -241,11 +249,6 @@
     <string name="dlg_remove_locales_error_title" msgid="2653242337224911425">"Nije moguće ukloniti sve jezike"</string>
     <string name="dlg_remove_locales_error_message" msgid="6697381512654262821">"Zadržite bar jedan željeni jezik"</string>
     <string name="locale_not_translated" msgid="516862628177166755">"Možda nije dostupno u nekim aplikacijama"</string>
-    <string name="action_drag_label_move_up" msgid="9052210023727612540">"Premesti nagore"</string>
-    <string name="action_drag_label_move_down" msgid="7448713844582912157">"Premesti nadole"</string>
-    <string name="action_drag_label_move_top" msgid="557081389352288310">"Premesti na vrh"</string>
-    <string name="action_drag_label_move_bottom" msgid="2468642142414126482">"Premesti na dno"</string>
-    <string name="action_drag_label_remove" msgid="2861038147166966206">"Ukloni jezik"</string>
     <string name="activity_picker_label" msgid="6295660302548177109">"Izbor aktivnosti"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Informacije o uređaju"</string>
     <string name="display_label" msgid="8074070940506840792">"Ekran"</string>
@@ -340,8 +343,6 @@
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Samo dodirnite senzor za otisak prsta da biste otključali telefon, ovlastili kupovine ili se prijavili na aplikacije. Ovo će biti moguće pomoću svih otisaka prstiju koje dodate, pa budite oprezni koga dodajete.\n\nNapomena: Otisak prsta može da bude manje bezbedan od jakog šablona ili PIN-a. "<annotation id="url">"Saznajte više"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Otkaži"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Nastavi"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Preskoči"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Dodaj otisak prsta"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Funkcije zaštite uređaja neće biti aktivirane. Nećete moći da sprečite druge da koriste ovaj tablet u slučaju gubitka, krađe ili brisanja."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Funkcije zaštite uređaja neće biti aktivirane. Nećete moći da sprečite druge da koriste ovaj uređaj u slučaju gubitka, krađe ili brisanja."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Funkcije zaštite uređaja neće biti aktivirane. Nećete moći da sprečite druge da koriste ovaj telefon u slučaju gubitka, krađe ili brisanja."</string>
@@ -422,9 +423,7 @@
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Otključajte pomoću otiska prsta"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Zaključavanje ekrana"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Izaberite zaključavanje za Work"</string>
-    <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Zaštitite tablet"</string>
-    <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Zaštitite uređaj"</string>
-    <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Zaštitite telefon"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Zaštitite telefon"</string>
     <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Otisak prsta može da bude manje bezbedan od jakog šablona, PIN-a ili lozinke. Podesite rezervni metod za zaključavanje ekrana radi dodatne bezbednosti."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Sprečite druge da koriste ovaj tablet bez dozvole tako što ćete aktivirati funkcije zaštite uređaja. Izaberite zaključavanje ekrana koje želite da koristite."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Sprečite druge da koriste ovaj uređaj bez dozvole tako što ćete aktivirati funkcije zaštite uređaja. Izaberite zaključavanje ekrana koje želite da koristite."</string>
@@ -503,7 +502,7 @@
     <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Ako u ovom pokušaju unesete netačnu lozinku za Work, sa ovog uređaja ćemo ukloniti profil za Work i povezane podatke."</string>
     <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Previše netačnih pokušaja. Uklonićemo profil za Work i povezane podatke sa ovog uređaja."</string>
     <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Odbaci"</string>
-    <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Lozinka mora da ima najmanje %d znak(ov)a"</string>
+    <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Minimalni broj znakova koji lozinka mora da sadrži je %d"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Minimalni broj cifara u PIN-u je %d"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Nastavi"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Lozinka mora da ima manje od <xliff:g id="NUMBER">%d</xliff:g> znak(ov)a."</string>
@@ -916,14 +915,14 @@
     <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Promenite pozadinu"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Personalizujte ekran"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Izaberite pozadinu iz"</string>
-    <string name="screensaver_settings_title" msgid="1770575686476851778">"Čuvar ekrana"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Sanjarenje"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Kada je na baznoj stanici ili u stanju spavanja i puni se"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Bilo koje od ova dva"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Tokom punjenja"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Dok je na baznoj stanici"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Isključeno"</string>
-    <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Da biste kontrolisali šta se dešava kada je telefon na baznoj stanici i/ili u stanju spavanja, uključite čuvar ekrana."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="8644479926302707286">"Pokreni čuvara ekrana"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Da biste kontrolisali šta se dešava kada je telefon na baznoj stanici i/ili u stanju spavanja, uključite Sanjarenje."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kad da se uključi sanjarenje"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Započni odmah"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Podešavanja"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatski nivo osvetljenosti"</string>
@@ -1214,7 +1213,6 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth privezivanje"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Povezivanje sa internetom"</string>
     <string name="tether_settings_title_all" msgid="8356136101061143841">"Povezivanje i prenosni hotspot"</string>
-    <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Nije moguće privezivanje niti korišćenje prenosivih hotspotova dok je Ušteda podataka uključena"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB povezivanje"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB povezan, proverite za privezivanje"</string>
@@ -1327,12 +1325,6 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Upotrebite šablon za profil za Work da biste nastavili"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Unesite PIN za profil za Work da biste nastavili"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Unesite lozinku za profil za Work da biste nastavili"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Upotrebite šablon uređaja da biste nastavili. Obavezan je kada ponovo pokrenete uređaj."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Unesite PIN uređaja da biste nastavili. Obavezan je kada ponovo pokrenete uređaj."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Unesite lozinku uređaja da biste nastavili. Obavezna je kada ponovo pokrenete uređaj."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Upotrebite šablon za profil za Work da biste nastavili. Obavezan je kada ponovo pokrenete uređaj."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Unesite PIN za profil za Work da biste nastavili. Obavezan je kada ponovo pokrenete uređaj."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Unesite lozinku za profil za Work da biste nastavili. Obavezna je kada ponovo pokrenete uređaj."</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Pogrešan PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Pogrešna lozinka"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Pogrešan šablon"</string>
@@ -1429,8 +1421,8 @@
     <string name="show_running_services" msgid="5736278767975544570">"Prikaži pokrenute usluge"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Prikaži keširane procese"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"Aplikacija za hitne slučajeve"</string>
-    <string name="reset_app_preferences" msgid="1321050641018356925">"Resetuj podešavanja aplikacije"</string>
-    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Želite da resetujete podešavanja aplikacije?"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Resetuj podešavanja aplik."</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Želite da resetujete podešavanja apl.?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Ovim ćete vratiti na početne vrednosti sva podešavanja za:\n\n "<li>"Onemogućene aplikacije"</li>\n" "<li>"Obaveštenja o onemogućenim aplikacijama"</li>\n" "<li>"Podrazumevane aplikacije za radnje"</li>\n" "<li>"Ograničenja za pozadinske podatke za aplikacije"</li>\n" "<li>"Bilo kakva ograničenja za dozvole"</li>\n\n" Nećete izgubiti podatke aplikacija."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Resetuj aplikacije"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Upravljaj prostorom"</string>
@@ -1480,7 +1472,6 @@
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Premesti u USB memoriju"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Premesti u SD karticu"</string>
     <string name="moving" msgid="6431016143218876491">"Premeštanje"</string>
-    <string name="another_migration_already_in_progress" msgid="7817354268848365487">"Drugi prenos je već u toku."</string>
     <string name="insufficient_storage" msgid="481763122991093080">"Nema dovoljno prostora u memoriji."</string>
     <string name="does_not_exist" msgid="1501243985586067053">"Aplikacija ne postoji."</string>
     <string name="app_forward_locked" msgid="6331564656683790866">"Aplikacija je zaštićena od kopiranja."</string>
@@ -1500,9 +1491,6 @@
     <string name="app_special_disable_dlg_text" msgid="1007112763234313018">"Ako onemogućite ovu aplikaciju, druge aplikacije možda više neće funkcionisati ispravno. Osim toga, podaci će biti izbrisani."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Želite li da isklj. obaveštenja?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ako isključite obaveštenja za ovu aplikaciju, možete da propustite važna obaveštenja i ažuriranja."</string>
-    <string name="app_install_details_group_title" msgid="7084623031296083574">"Prodavnica"</string>
-    <string name="app_install_details_title" msgid="6905279702654975207">"Detalji o aplikaciji"</string>
-    <string name="app_install_details_summary" msgid="6464796332049327547">"Aplikacija je instalirana iz prodavnice <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Operacije aplikacija"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Aktivno"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nikada nije korišćeno)"</string>
@@ -1571,14 +1559,12 @@
     <string name="keyboard_and_input_methods_category" msgid="212319666432360385">"Tastatura i metodi unosa"</string>
     <string name="virtual_keyboard_category" msgid="1012830752318677119">"Virtuelna tastatura"</string>
     <string name="available_virtual_keyboard_category" msgid="7645766574969139819">"Dostupna virtuelna tastatura"</string>
-    <string name="add_virtual_keyboard" msgid="3302152381456516928">"Upravljajte tastaturama"</string>
+    <string name="add_virtual_keyboard" msgid="5783399159348480135">"Dodaj ili izmeni virtuelne tastature"</string>
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"Pomoć za tastaturu"</string>
     <string name="physical_keyboard_title" msgid="8285149877925752042">"Fizička tastatura"</string>
     <string name="show_ime" msgid="2658582193437188227">"Prikaži virtuelnu tastaturu"</string>
     <string name="show_ime_summary" msgid="8164993045923240698">"Zadrži ga na ekranu dok je fizička tastatura aktivna"</string>
-    <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Pomoć za tasterske prečice"</string>
-    <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Prikaz dostupnih prečica"</string>
-    <string name="default_keyboard_layout" msgid="4172606673510531271">"Podrazumevano"</string>
+    <string name="physical_device_title" msgid="79889057252418427">"<xliff:g id="INPUT_METHOD_SUBTYPE">%1$s</xliff:g> – <xliff:g id="INPUT_METHOD_EDITOR">%2$s</xliff:g>"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Miš/dodirna tabla"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Brzina pokazivača"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Kontroler za igre"</string>
@@ -2228,7 +2214,7 @@
     <string name="vpn_done" msgid="8678655203910995914">"Odbaci"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Sačuvaj"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Poveži"</string>
-    <string name="vpn_replace" msgid="5442836256121957861">"Zameni"</string>
+    <string name="vpn_continue" msgid="846894478725673098">"Nastavi"</string>
     <string name="vpn_edit" msgid="8647191407179996943">"Izmena VPN profila"</string>
     <string name="vpn_forget" msgid="3684651372749415446">"Zaboravi"</string>
     <string name="vpn_connect_to" msgid="5965299358485793260">"Povezivanje na profil <xliff:g id="PROFILE">%s</xliff:g>"</string>
@@ -2237,9 +2223,9 @@
     <string name="vpn_version" msgid="1939804054179766249">"Verzija <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Zaboravi VPN"</string>
     <string name="vpn_replace_always_on_vpn_title" msgid="3010435028275752220">"Želite li da zamenite postojeći VPN?"</string>
-    <string name="vpn_replace_always_on_vpn_message" msgid="4764679857158814028">"Već ste povezani sa VPN-om. Kada biste se povezali sa nekim drugim VPN-om, postojeći VPN bi bio zamenjen."</string>
-    <string name="vpn_cant_connect_title" msgid="4517706987875907511">"Povezivanje sa VPN-om <xliff:g id="VPN_NAME">%1$s</xliff:g> nije uspelo"</string>
-    <string name="vpn_cant_connect_message" msgid="2593197919352621279">"Ova aplikacija ne podržava stalno uključeni VPN."</string>
+    <string name="vpn_replace_always_on_vpn_message" msgid="4766130211217825628">"Već ste povezali VPN sa ovim profilom. Kada biste se povezali sa novim, postojeći VPN bi bio zamenjen."</string>
+    <string name="vpn_cant_connect_notification_title" msgid="820999437026146960">"Povezivanje sa VPN-om <xliff:g id="VPN_NAME">%1$s</xliff:g> nije uspelo"</string>
+    <string name="vpn_tap_for_vpn_settings" msgid="582017057346927799">"Dodirnite za podešavanja VPN-a"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
     <string name="vpn_create" msgid="5628219087569761496">"Dodavanje VPN profila"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Izmeni profil"</string>
@@ -2278,27 +2264,10 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Sprovođenje"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Mreža se možda nadgleda"</string>
     <string name="done_button" msgid="1991471253042622230">"Gotovo"</string>
-    <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
-      <item quantity="one">Označite sertifikate kao pouzdane ili ih uklonite</item>
-      <item quantity="few">Označite sertifikate kao pouzdane ili ih uklonite</item>
-      <item quantity="other">Označite sertifikate kao pouzdane ili ih uklonite</item>
-    </plurals>
-    <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="1489335297837656666">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> je instalirao autoritete za izdavanje sertifikata na uređaju, što može da mu omogući da prati aktivnosti uređaja na mreži, uključujući imejlove, aplikacije i bezbedne veb-sajtove.\n\nKontaktirajte administratora da biste dobili više informacija o ovim sertifikatima.</item>
-      <item quantity="few"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> su instalirala autoritete za izdavanje sertifikata na uređaju, što može da im omogući da prate aktivnosti uređaja na mreži, uključujući imejlove, aplikacije i bezbedne veb-sajtove.\n\nKontaktirajte administratora da biste dobili više informacija o ovim sertifikatima.</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> su instalirala autoritete za izdavanje sertifikata na uređaju, što može da im omogući da prate aktivnosti uređaja na mreži, uključujući imejlove, aplikacije i bezbedne veb-sajtove.\n\nKontaktirajte administratora da biste dobili više informacija o ovim sertifikatima.</item>
-    </plurals>
-    <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="30645643499556573">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> je instalirao autoritete za izdavanje sertifikata za profil za Work, što može da mu omogući da prati aktivnosti na poslovnoj mreži, uključujući imejlove, aplikacije i bezbedne veb-sajtove.\n\nKontaktirajte administratora da biste dobili više informacija o ovim sertifikatima.</item>
-      <item quantity="few"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> su instalirala autoritete za izdavanje sertifikata na uređaju, što može da im omogući da prate aktivnosti uređaja na mreži, uključujući imejlove, aplikacije i bezbedne veb-sajtove.\n\nKontaktirajte administratora da biste dobili više informacija o ovim sertifikatima.</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> su instalirala autoritete za izdavanje sertifikata na uređaju, što može da im omogući da prate aktivnosti uređaja na mreži, uključujući imejlove, aplikacije i bezbedne veb-sajtove.\n\nKontaktirajte administratora da biste dobili više informacija o ovim sertifikatima.</item>
-    </plurals>
+    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Nadgledanje mreže"</string>
+    <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Ovim uređajem upravlja:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nAdministrator može da nadgleda mrežne aktivnosti, uključujući poruke e-pošte, aplikacije i bezbedne veb-sajtove.\n\nViše informacija potražite od administratora."</string>
     <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Treća strana može da prati vašu aktivnost na mreži, uključujući e-poštu, aplikacije i bezbedne veb-sajtove.\n\nTo omogućava pouzdani akreditiv koji je instaliran na uređaju."</string>
-    <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
-      <item quantity="one">Proveri sertifikate</item>
-      <item quantity="few">Proveri sertifikate</item>
-      <item quantity="other">Proveri sertifikate</item>
-    </plurals>
+    <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Proveri pouzdane akreditive"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Korisnici"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Korisnici i profili"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Dodaj korisnika ili profil"</string>
@@ -2431,7 +2400,7 @@
     <string name="wizard_back" msgid="5567007959434765743">"Nazad"</string>
     <string name="wizard_next" msgid="3606212602795100640">"Dalje"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"Završi"</string>
-    <string name="user_image_take_photo" msgid="1280274310152803669">"Slikaj"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Snimi sliku"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Izaberi sliku iz Galerije"</string>
     <string name="user_image_photo_selector" msgid="5492565707299454873">"Izaberite sliku"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
@@ -2550,7 +2519,6 @@
     <string name="emergency_tone_silent" msgid="1067515631635824291">"Nečujno"</string>
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Obaveštenje"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibracija"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Ne uznemiravaj"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Dozvoljeni su samo prioriteti"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatska pravila"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Podesite raspored za Ne uznemiravaj"</string>
@@ -2578,13 +2546,12 @@
     <string name="app_notifications_title" msgid="139788604658984593">"Obaveštenja"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Važnost"</string>
     <string name="notification_importance_none" msgid="3173515479356106227">"Nije podešeno"</string>
-    <string name="notification_importance_blocked" msgid="4348392266695847526">"Nikada ne prikazuj obaveštenja iz ove aplikacije"</string>
-    <string name="notification_importance_min" msgid="1859001310034196751">"Bez prekida režima celog ekrana, zavirivanja, zvuka ili vibracije. Prikazuju se u dnu liste obaveštenja. Sakrij na zaključanom ekranu i statusnoj traci."</string>
-    <string name="notification_importance_low" msgid="1466326143251705794">"Bez prekida režima celog ekrana, zavirivanja, zvuka ili vibracije."</string>
-    <string name="notification_importance_default" msgid="2857618184137114962">"Bez prekida režima celog ekrana ili zavirivanja."</string>
-    <string name="notification_importance_high" msgid="495354850199578732">"Uvek zaviruj. Bez prekida režima celog ekrana."</string>
-    <string name="notification_importance_max" msgid="7538045535631915413">"Uvek zaviruj i dozvoli prekid režima celog ekrana. Prikazuju se u vrhu liste obaveštenja."</string>
-    <string name="notification_importance_unspecified" msgid="6172151762388245221">"Aplikacija određuje važnost svakog obaveštenja"</string>
+    <string name="notification_importance_blocked" msgid="4764559498517003405">"Blokirana: Ova obaveštenja se nikada ne prikazuju"</string>
+    <string name="notification_importance_min" msgid="2370444628448134377">"Veoma mala: Prikazuju se u dnu liste obaveštenja bez zvuka"</string>
+    <string name="notification_importance_low" msgid="979932751695283877">"Mala: Ova obaveštenja se prikazuju bez zvuka"</string>
+    <string name="notification_importance_default" msgid="8789180840561778039">"Uobičajena: Dozvolite da ova obaveštenja emituju zvuk"</string>
+    <string name="notification_importance_high" msgid="5044607814670313040">"Visoka: Nakratko se prikazuju na ekranu i emituju zvuk"</string>
+    <string name="notification_importance_max" msgid="6036245535555486319">"Hitna: Prikazuju se u vrhu liste obaveštenja, nakratko se prikazuju na ekranu i emituju zvuk"</string>
     <string name="importance_reset" msgid="7458420788555607007">"Resetuj"</string>
     <string name="show_silently" msgid="2222875799232222056">"Prikazivanje bez zvuka"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Nema nikakvog zvuka ni vibracije niti se ova obaveštenja nakratko prikazuju na aktuelnom ekranu."</string>
@@ -2597,17 +2564,11 @@
     </plurals>
     <string name="no_notification_listeners" msgid="3487091564454192821">"Nijedna instalirana aplikacija nije zahtevala pristup obaveštenjima."</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"Želite li da omogućite pristup obaveštenjima za <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> će moći da čita sva obaveštenja, uključujući lične podatke, poput imena kontakata i teksta poruka koje primate. Moći će i da odbacuje obaveštenja ili da koristi dugmad za radnje koja sadrže. \n\nOvo će aplikaciji omogućiti i da uključuje ili isključuje režim Ne uznemiravaj i menja srodna podešavanja."</string>
-    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"Ako isključite pristup obaveštenjima za korisnika <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, isključićete i pristup režimu Ne uznemiravaj."</string>
-    <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"Isključi"</string>
-    <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"Otkaži"</string>
+    <string name="notification_listener_security_warning_summary" msgid="548925084229440829">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> će moći da čita sva obaveštenja, uključujući lične podatke, poput imena kontakata i teksta poruka koje primate. Moći će i da odbacuje obaveštenja ili da koristi dugmad za radnje koja sadrže."</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"Usluge pomagača za virtuelnu realnost"</string>
     <string name="no_vr_listeners" msgid="2689382881717507390">"Nijedna instalirana aplikacija nije zahtevala da se pokrene kao usluga pomagača za virtuelnu realnost."</string>
     <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"Želite li da dozvolite pristup usluzi virtuelne realnosti za uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"<xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> će moći da se pokrene kada koristite aplikacije u režimu virtuelne realnosti."</string>
-    <string name="display_vr_pref_title" msgid="7049857952347953979">"Kada je uređaj u režimu za virtuelnu realnost"</string>
-    <string name="display_vr_pref_low_persistence" msgid="6221441245293606681">"Koristi podešavanja za smanjenje zamagljivanja pokretom"</string>
-    <string name="display_vr_pref_off" msgid="1244880066079174840">"Ne radi ništa"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Pristup opciji Ne uznemiravaj"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nijedna instalirana aplikacija nije zahtevala pristup opciji Ne uznemiravaj"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Učitavaju se aplikacije..."</string>
@@ -2768,7 +2729,6 @@
     <string name="notifications_hidden" msgid="3619610536038757468">"Ne na zaključanom ekranu"</string>
     <string name="notifications_priority" msgid="1066342037602085552">"Režim Ne uznemiravaj je zamenjen"</string>
     <string name="notifications_summary_divider" msgid="9013807608804041387">" / "</string>
-    <string name="notification_summary_level" msgid="2726571692704140826">"%d. nivo"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> dozvola je odobrena</item>
       <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> dozvole su odobrene</item>
@@ -2882,7 +2842,7 @@
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Prenos datoteka"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Prenosi datoteke na drugi uređaj"</string>
     <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Prenos slika (PTP)"</string>
-    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Prenosi slike ili datoteke ako MTP nije podržan (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Prenosite slike ili datoteke ako MTP nije podržan (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"Korišćenje uređaja u MIDI režimu"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Koristi ovaj uređaj kao MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Upotrebite USB za:"</string>
@@ -2917,7 +2877,6 @@
     <string name="no_data_usage" msgid="9131454024293628063">"Ne koriste se nikakvi podaci"</string>
     <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Želite li da dozvolite pristup podešavanju Ne uznemiravaj za <xliff:g id="APP">%1$s</xliff:g>?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Aplikacija će moći da uključuje ili isključuje podešavanje Ne uznemiravaj i da unosi promene u srodna podešavanja."</string>
-    <string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Mora da ostane uključeno jer je pristup obaveštenjima uključen"</string>
     <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Želite li da opozovete pristup režimu Ne uznemiravaj za aplikaciju <xliff:g id="APP">%1$s</xliff:g>?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Uklonićemo sva pravila za režim Ne uznemiravaj koja je ova aplikacija napravila."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Ne optimizuj"</string>
@@ -3005,8 +2964,6 @@
     <string name="admin_device_owner_message" msgid="8734500370023898028">"Administrator može da nadgleda aplikacije i podatke povezane sa ovim uređajem, uključujući podešavanja, dozvole, korporativni pristup, mrežnu aktivnost i informacije o lokaciji uređaja, kao i da upravlja njima."</string>
     <string name="condition_turn_off" msgid="1960945836880080298">"Isključi"</string>
     <string name="condition_turn_on" msgid="9089876276117874591">"Uključi"</string>
-    <string name="condition_expand_show" msgid="608202020023489939">"Prikaži"</string>
-    <string name="condition_expand_hide" msgid="948507739223760667">"Sakrij"</string>
     <string name="condition_hotspot_title" msgid="7778958849468560027">"Hotspot je uključen"</string>
     <string name="condition_hotspot_summary" msgid="3433182779269409683">"Prenosni Wi-Fi hotspot <xliff:g id="ID_1">%1$s</xliff:g> je aktivan, Wi-Fi za ovaj uređaj je isključen."</string>
     <string name="condition_airplane_title" msgid="287356299107070503">"Režim rada u avionu je uključen"</string>
@@ -3041,22 +2998,20 @@
     <string name="billing_cycle_summary" msgid="9009106526129293752">"Mesečni ciklus počinje svakog <xliff:g id="ID_1">%1$s</xliff:g>. u mesecu"</string>
     <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Svakog meseca od <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Mrežna ograničenja"</string>
-    <string name="operator_warning" msgid="1862988028996859195">"Obračun podataka kod mobilnog operatera se možda razlikuje od obračuna uređaja."</string>
+    <string name="operator_warning" msgid="7206980278353372811">"Obračun podataka kod mobilnog operatera se možda razlikuje od uređaja."</string>
     <string name="data_used_template" msgid="3245919669966296505">"Potrošili ste <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="data_warning" msgid="209133958008062117">"Upozorenje za potrošnju podataka"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Podesi ograničenje za podatke"</string>
     <string name="data_limit" msgid="1885406964934590552">"Ograničenje za potrošnju podataka"</string>
     <string name="data_usage_template" msgid="392191945602400904">"Potrošili ste <xliff:g id="ID_1">%1$s</xliff:g> u periodu <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurišite"</string>
-    <string name="data_usage_other_apps" msgid="3272872663517382050">"Druge aplikacije uključene u upotrebu"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> aplikacija ima dozvolu da koristi neograničenu količinu podataka kada je Ušteda podataka uključena</item>
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> aplikacije imaju dozvolu da koriste neograničenu količinu podataka kada je Ušteda podataka uključena</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplikacija ima dozvolu da koristi neograničenu količinu podataka kada je Ušteda podataka uključena</item>
     </plurals>
-    <string name="data_saver_title" msgid="398458827917495765">"Ušteda podataka"</string>
+    <string name="data_saver_title" msgid="8034286939200289826">"Ušteda podataka"</string>
     <string name="unrestricted_data_saver" msgid="7019858887510062789">"Neograničeni pristup podacima"</string>
-    <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Prenos podataka u pozadini je isključen"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Uključeno"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Isključeno"</string>
     <string name="unrestricted_app_title" msgid="4465437191723332066">"Neograničena potrošnja podataka"</string>
@@ -3075,7 +3030,7 @@
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"Automatski se uključuje na %1$s baterije"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"Ne koristi optimizaciju baterije"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"Ako je uređaj zaključan, spreči unos odgovora ili drugog teksta u obaveštenja"</string>
-    <string name="default_spell_checker" msgid="8506899870026026660">"Podrazumevana provera pravopisa"</string>
+    <string name="default_spell_checker" msgid="8506899870026026660">"Podrazum. provera pravopisa"</string>
     <string name="choose_spell_checker" msgid="6596539862291699367">"Izaberite proveru pravopisa"</string>
     <string name="spell_checker_not_selected" msgid="8871083796179200696">"Nije izabrano"</string>
     <string name="notification_log_no_title" msgid="5678029849672024215">"(nijedno)"</string>
@@ -3104,8 +3059,6 @@
     <string name="notification_log_details_vibrate" msgid="6890065466625335940">"vibracija"</string>
     <string name="notification_log_details_default" msgid="2345249399796730861">"podrazumevano"</string>
     <string name="notification_log_details_none" msgid="184131801230614059">"nijedno"</string>
-    <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Nedostaje objekat za rangiranje."</string>
-    <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Objekat za rangiranje ne sadrži ovu šifru."</string>
     <string name="special_access" msgid="8275242424094109976">"Specijalan pristup"</string>
     <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"Želite li stvarno da izbrišete podatke korisnika i da konvertujete u šifrovanje datoteka?"</string>
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Izbriši i konvertuj"</string>
@@ -3116,19 +3069,10 @@
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Pregledajte ili sakrijte sadržaj obaveštenja"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Najmanja širina"</string>
-    <string name="premium_sms_none" msgid="8268105565738040566">"Nijedna instalirana aplikacija nije zahtevala pristup premijum SMS-ovima"</string>
-    <string name="premium_sms_warning" msgid="9086859595338944882">"Premijum SMS-ovi mogu da koštaju i povećaće račune kod mobilnog operatera. Ako omogućite dozvolu za neku aplikaciju, moći ćete da šaljete premijum SMS-ove pomoću te aplikacije."</string>
-    <string name="premium_sms_access" msgid="4660047004791638305">"Pristup premijum SMS-ovima"</string>
-    <string name="bluetooth_disabled" msgid="1558295505487648234">"Onemogućeno"</string>
-    <string name="demo_mode" msgid="2655748420527206870">"Režim demonstracije"</string>
-    <string name="managed_profile_settings_title" msgid="2729481936758125054">"Podešavanja poslovnog profila"</string>
-    <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Pretraga kontakata"</string>
-    <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Dozvolite da pretraživanje kontakata od strane vaše organizacije identifikuje pozivaoce i kontakte."</string>
-    <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Računar"</string>
-    <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Naglavne slušalice"</string>
-    <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Pozovi"</string>
-    <string name="bluetooth_talkback_imaging" msgid="551146170554589119">"Obrada slika"</string>
-    <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Slušalice"</string>
-    <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Periferni uređaj za unos"</string>
-    <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-be-rBY/arrays.xml b/res/values-be-rBY/arrays.xml
index ab08b7c..42abd0a 100644
--- a/res/values-be-rBY/arrays.xml
+++ b/res/values-be-rBY/arrays.xml
@@ -370,9 +370,9 @@
     <item msgid="334625385979270703">"Выконваць у фонавым рэжыме"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
-    <item msgid="3511504869290423954">"Кароткая"</item>
-    <item msgid="2560532955514699713">"Сярэдняя"</item>
-    <item msgid="2372711992605524591">"Доўгая"</item>
+    <item msgid="3511504869290423954">"Кароткі"</item>
+    <item msgid="2560532955514699713">"Сярэдні"</item>
+    <item msgid="2372711992605524591">"Доўгі"</item>
   </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="1319652728542138112">"Стандартная"</item>
diff --git a/res/values-be-rBY/strings.xml b/res/values-be-rBY/strings.xml
index d6c607f..8e72a33 100644
--- a/res/values-be-rBY/strings.xml
+++ b/res/values-be-rBY/strings.xml
@@ -20,7 +20,7 @@
     <string name="no" msgid="6731231425810196216">"Не"</string>
     <string name="create" msgid="3578857613172647409">"Стварыць"</string>
     <string name="allow" msgid="3349662621170855910">"Дазволіць"</string>
-    <string name="deny" msgid="6947806159746484865">"Адмовіць"</string>
+    <string name="deny" msgid="6947806159746484865">"Забараніць"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Закрыць"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Пераключыць"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Невядома"</string>
@@ -38,28 +38,34 @@
     <string name="header_category_personal" msgid="3310195187905720823">"Асабістае"</string>
     <string name="header_category_access" msgid="7580499097416970962">"Доступ"</string>
     <string name="header_category_system" msgid="2816866961183068977">"Сістэма"</string>
-    <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Уключыць злучэнне для перадачы даных"</string>
-    <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Адключыць перадачу даных"</string>
-    <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE уключана"</string>
-    <string name="radio_info_radio_power" msgid="1208229437948820417">"Сілкаванне сотавага перадатчыка"</string>
-    <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Прагляд адраснай кнігі на SIM-карце"</string>
+    <string name="turn_on_radio" msgid="8706561489788373676">"Уключыць радыё"</string>
+    <string name="turn_off_radio" msgid="1820294552893884115">"Выключыць радыё"</string>
+    <string name="sms_over_ims_on" msgid="5085290395865632925">"Уключыце перадачу SMS-паведамленняў праз IMS"</string>
+    <string name="sms_over_ims_off" msgid="8354792045992793959">"Выключыце перадачу SMS-паведамленняў праз IMS"</string>
+    <string name="ims_reg_required_on" msgid="3885152087309614653">"Патрабуецца ўключыць рэгістрацыю IMS"</string>
+    <string name="ims_reg_required_off" msgid="1720570343422743943">"Патрабуецца выключыць рэгістрацыю IMS"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Паставіць сцяжок VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Зняць сцяжок VoLTE"</string>
+    <string name="lte_ram_dump_on" msgid="8568568019520172177">"Уключыць запіс у аператыўную памяць LTE"</string>
+    <string name="lte_ram_dump_off" msgid="2514507918652378283">"Выключыць запіс у аператыўную памяць LTE"</string>
+    <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Прагляд адраснай кнігі SIM-карты"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Прагляд фіксаваных нумароў"</string>
     <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Паглядзець сэрвісныя нумары набору"</string>
-    <string name="radioInfo_menu_getPDP" msgid="8951059003824985976">"Атрымаць спіс PDP"</string>
-    <string name="radioInfo_service_in" msgid="1697703164394784618">"Працуе"</string>
-    <string name="radioInfo_service_out" msgid="7999094221728929681">"Не працуе"</string>
-    <string name="radioInfo_service_emergency" msgid="6274434235469661525">"Толькі экстранныя выклікі"</string>
-    <string name="radioInfo_service_off" msgid="7536423790014501173">"Перадатчык выключаны"</string>
+    <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Атрымаць спіс PDP"</string>
+    <string name="radioInfo_service_in" msgid="1915416319177520020">"У эксплуатацыі"</string>
+    <string name="radioInfo_service_out" msgid="5238736759641916278">"Не працуе"</string>
+    <string name="radioInfo_service_emergency" msgid="2485604591272668370">"Толькі экстраныя выклікі"</string>
+    <string name="radioInfo_service_off" msgid="1434084741785525415">"Радыё выключанае"</string>
     <string name="radioInfo_roaming_in" msgid="9045363884600341051">"Роўмінг"</string>
-    <string name="radioInfo_roaming_not" msgid="4849214885629672819">"Не ў роўмінгу"</string>
+    <string name="radioInfo_roaming_not" msgid="2851853244069662307">"Не ў роўмінгу"</string>
     <string name="radioInfo_phone_idle" msgid="7489244938838742820">"Бяздзейнасць"</string>
     <string name="radioInfo_phone_ringing" msgid="4883724645684297895">"Званіць"</string>
-    <string name="radioInfo_phone_offhook" msgid="5873835692449118954">"Ідзе выклік…"</string>
+    <string name="radioInfo_phone_offhook" msgid="4174402846862780998">"Ідзе выклік"</string>
     <string name="radioInfo_data_disconnected" msgid="1959735267890719418">"Адключана"</string>
     <string name="radioInfo_data_connecting" msgid="8404571440697917823">"Падключэнне"</string>
     <string name="radioInfo_data_connected" msgid="7074301157399238697">"Злучаны"</string>
     <string name="radioInfo_data_suspended" msgid="5315325487890334196">"Прыпынена"</string>
-    <string name="radioInfo_unknown" msgid="1476509178755955088">"Невядома"</string>
+    <string name="radioInfo_unknown" msgid="737385314432468266">"невядома"</string>
     <string name="radioInfo_display_packets" msgid="8654359809877290639">"пак."</string>
     <string name="radioInfo_display_bytes" msgid="4018206969492931883">"байтаў"</string>
     <string name="radioInfo_display_dbm" msgid="3621221793699882781">"дБм"</string>
@@ -70,7 +76,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Адключыць SD-карту"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Ачысціць USB-назапашвальнiк"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Сцерці SD-карту"</string>
-    <string name="preview_pager_content_description" msgid="8926235999291761243">"Перадпрагляд"</string>
+    <string name="preview_pager_content_description" msgid="8926235999291761243">"Папярэдні прагляд"</string>
     <string name="preview_page_indicator_content_description" msgid="4821343428913401264">"Папярэдні прагляд, старонка <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> з <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
     <string name="font_size_summary" msgid="1690992332887488183">"Павелічэнне або памяншэнне тэксту на экране."</string>
     <string name="small_font" msgid="2295331917424072635">"Маленькі"</string>
@@ -149,7 +155,7 @@
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> спрабуе атрымаць доступ да вашай SIM-карты. Прадастаўленне доступу да SIM-карты адключыць перадачу даных на прыладзе на час падлучэння. Даць доступ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Дата і час"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Вылучыце гадзінны пояс"</string>
-    <string name="display_preview_label" msgid="1127597250917274792">"Перадпрагляд:"</string>
+    <string name="display_preview_label" msgid="1127597250917274792">"Прагляд:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Памер шрыфту:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
     <skip />
@@ -174,39 +180,41 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Вы ўвялі несапраўднае імя порта."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Проксі HTTP выкарыстоўваецца браўзэрам, але ён не можа выкарыстоўвацца іншымі прыкладаннямi"</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL аўтаканфіг. проксі: "</string>
-    <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Інфармацыя пра месцазнаходжанне сотавай ячэйкі (састарэлая):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Даныя суседняй сотавай ячэйкі (састарэлыя):"</string>
-    <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Частата абнаўлення даных сотавай ячэйкі:"</string>
-    <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Усе даныя вымярэнняў сотавай ячэйкі:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Інфармацыя злучэння для перадачы даных у рэальным часе:"</string>
-    <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Служба перадачы даных:"</string>
+    <string name="radio_info_signal_location_label" msgid="16475158265551708">"Месцазнаходжанне:"</string>
+    <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Суседнія CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Звесткi ячэйкi:"</string>
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
+    <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Спробы перадачы дадзеных:"</string>
+    <string name="radio_info_gprs_service_label" msgid="6699616076706524202">"Тэхналогія перадачы даных:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Роўмінг:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
-    <string name="radio_info_call_redirect_label" msgid="2743797189722106231">"Перанакіраванне выкліку:"</string>
-    <string name="radio_info_ppp_resets_label" msgid="3587319503902576102">"Колькасць PPP, скінутых з моманту загрузкі:"</string>
-    <string name="radio_info_current_network_label" msgid="9151285540639134945">"Бягучая сетка:"</string>
-    <string name="radio_info_ppp_received_label" msgid="363579470428151850">"Атрыманыя даныя:"</string>
-    <string name="radio_info_gsm_service_label" msgid="1370863866816125489">"Галасавая служба:"</string>
-    <string name="radio_info_signal_strength_label" msgid="5155734002519307416">"Сіла сігналу:"</string>
-    <string name="radio_info_call_status_label" msgid="2611065018172747413">"Статус галасавога выкліку:"</string>
-    <string name="radio_info_ppp_sent_label" msgid="7748668735880404586">"Перададзеныя даныя:"</string>
-    <string name="radio_info_message_waiting_label" msgid="1037302619943328273">"Паведамленне ў рэжыме чакання:"</string>
-    <string name="radio_info_phone_number_label" msgid="7942153178953255231">"Нумар тэлефона:"</string>
-    <string name="radio_info_band_mode_label" msgid="8730871744887454509">"Выберыце радыёдыяпазон"</string>
-    <string name="radio_info_voice_network_type_label" msgid="1443496502370667071">"Тып галасавой сеткі:"</string>
-    <string name="radio_info_data_network_type_label" msgid="7094323145105149312">"Тып сеткі перадачы даных:"</string>
-    <string name="radio_info_set_perferred_label" msgid="3511830813500105512">"Задаць прыярытэтны тып сеткі:"</string>
+    <string name="radio_info_call_redirect_label" msgid="1654674226961476872">"Перанапраўленне выкліка:"</string>
+    <string name="radio_info_ppp_resets_label" msgid="3241667824729310546">"Колькасць PPP, скінутых з моманту загрузкі:"</string>
+    <string name="radio_info_gsm_disconnects_label" msgid="1683069665736339820">"GSM адключаецца:"</string>
+    <string name="radio_info_current_network_label" msgid="3256402602440102610">"Бягучая сетка:"</string>
+    <string name="radio_info_data_successes_label" msgid="4417894113689054945">"Паспяхова перададзена дадзеных:"</string>
+    <string name="radio_info_ppp_received_label" msgid="3345184342444878849">"PPP атрымана:"</string>
+    <string name="radio_info_gsm_service_label" msgid="8595694240281347716">"Галасавая тэхналогія:"</string>
+    <string name="radio_info_signal_strength_label" msgid="1931937920896925766">"Магутнасць сігналу:"</string>
+    <string name="radio_info_call_status_label" msgid="4896238900685510883">"Стан выкліка:"</string>
+    <string name="radio_info_ppp_sent_label" msgid="5009102250704375687">"PPP адпраўлена:"</string>
+    <string name="radio_info_radio_resets_label" msgid="9211343458143291617">"Скід радыё:"</string>
+    <string name="radio_info_message_waiting_label" msgid="6981842420058672207">"Чакае паведамленне:"</string>
+    <string name="radio_info_phone_number_label" msgid="7192944627907412169">"Нумар тэлефона:"</string>
+    <string name="radio_info_band_mode_label" msgid="441469694142042022">"Выберыце дыяпазон радыё"</string>
+    <string name="radio_info_network_type_label" msgid="3706382548257257987">"Тып сеткі:"</string>
+    <string name="radio_info_set_perferred_label" msgid="9039200405863503267">"Усталяваць пераважны тып сеткі:"</string>
     <string name="radio_info_ping_hostname_v4" msgid="7045103377818314709">"Каманда ping для вузла(www.google.com) IPv4:"</string>
     <string name="radio_info_ping_hostname_v6" msgid="1130906124160553954">"Каманда ping для вузла(www.google.com) IPv6:"</string>
-    <string name="radio_info_http_client_test" msgid="2382286093023138339">"Тэст HTTP-кліента:"</string>
-    <string name="ping_test_label" msgid="579228584343892613">"Выканаць праверку ping"</string>
+    <string name="radio_info_http_client_test" msgid="5733604021077701555">"Тэст HTTP-кліенту:"</string>
+    <string name="ping_test_label" msgid="7255376471490860631">"Выканаць Ping Test"</string>
     <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
     <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Абнавіць"</string>
     <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"Абнавіць"</string>
-    <string name="radio_info_toggle_dns_check_label" msgid="6625185764803245075">"Пераключыць праверку DNS"</string>
+    <string name="radio_info_toggle_dns_check_label" msgid="8292252930563286858">"Пераключыць праверку DNS"</string>
     <string name="oem_radio_info_label" msgid="6163141792477958941">"Інфармацыя/налады для пастаўшчыка"</string>
-    <string name="band_mode_title" msgid="4071411679019296568">"Задаць рэжым радыёдыяпазону"</string>
-    <string name="band_mode_loading" msgid="3555063585133586152">"Загрузка спіса дыяпазонаў…"</string>
+    <string name="band_mode_title" msgid="954174198903776205">"Усталяваць дыяпазон GSM/UMTS"</string>
+    <string name="band_mode_loading" msgid="548764766363847336">"Загрузка спіса дыяпазона…"</string>
     <string name="band_mode_set" msgid="5730560180249458484">"Задаць"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Няўдала"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Паспяхова"</string>
@@ -243,11 +251,6 @@
     <string name="dlg_remove_locales_error_title" msgid="2653242337224911425">"Не атрымалася выдаліць усе мовы"</string>
     <string name="dlg_remove_locales_error_message" msgid="6697381512654262821">"Пакіньце па меншай меры адну прыярытэтную мову"</string>
     <string name="locale_not_translated" msgid="516862628177166755">"Можа быць недаступна ў некаторых праграмах"</string>
-    <string name="action_drag_label_move_up" msgid="9052210023727612540">"Перамясціць вышэй"</string>
-    <string name="action_drag_label_move_down" msgid="7448713844582912157">"Перамясціць ніжэй"</string>
-    <string name="action_drag_label_move_top" msgid="557081389352288310">"Перамясціць уверх"</string>
-    <string name="action_drag_label_move_bottom" msgid="2468642142414126482">"Перамясціць уніз"</string>
-    <string name="action_drag_label_remove" msgid="2861038147166966206">"Выдаліць мову"</string>
     <string name="activity_picker_label" msgid="6295660302548177109">"Выберыце дзеянне"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Звесткі аб прыладзе"</string>
     <string name="display_label" msgid="8074070940506840792">"Экран"</string>
@@ -256,14 +259,14 @@
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB-назапашвальнік"</string>
     <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" msgid="6859253417269739139">"Адмяніць"</string>
     <string name="okay" msgid="1997666393121016642">"ОК"</string>
     <string name="forget" msgid="1400428660472591263">"Iгнараваць"</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>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Цэтлік налад"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Рэжым самалёту"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"Яшчэ"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Бесправадныя і правадныя сеткі"</string>
@@ -273,9 +276,9 @@
     <string name="sms_messages_title" msgid="1778636286080572535">"SMS-паведамленні"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Дазволіць выкарыст. даных па маб. сетцы"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Дазволіць выкарыстанне даных у роўмінгу"</string>
-    <string name="roaming" msgid="3596055926335478572">"Перадача даных у роўмінгу"</string>
-    <string name="roaming_enable" msgid="3737380951525303961">"Падключацца да сэрвісаў перадачы даных у роўмінгу"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"Падключацца да сэрвісаў перадачы даных у роўмінгу"</string>
+    <string name="roaming" msgid="3596055926335478572">"Перадача дадзеных у роўмінгу"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Злучацца з паслугамі перадачы дадзеных ў роўмінгу"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Злучацца са службамi перадачы дадзеных ў роўмінгу"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Вы страцілі падключэнне для перадачы дадзеных, таму што вы пакінулі сваю хатнюю сетку з адключаным параметрам перадачы дадзеных у роўмінгу."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Уключыць"</string>
     <string name="roaming_warning" msgid="4275443317524544705">"Гэта можа прывесці да значных выплат."</string>
@@ -287,22 +290,22 @@
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Дата і час"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Усталяваць дату і час"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Задаць дату, час, гадзiнны пояс і фарматы"</string>
-    <string name="date_time_auto" msgid="7076906458515908345">"Аўтавызначэнне даты і часу"</string>
-    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Выкарыстоўваць час, атрыманы з сеткі"</string>
-    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Выкарыстоўваць час, атрыманы з сеткі"</string>
-    <string name="zone_auto" msgid="334783869352026648">"Аўтавызначэнне часавага пояса"</string>
-    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Выкарыстоўваць часавы пояс, атрыманы з сеткі"</string>
-    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Выкарыстоўваць часавы пояс, атрыманы з сеткі"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Аўтаматычныя дата і час"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Выкарыстоўваць час, вызначаны сеткай"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Выкарыстоўваць час, вызначаны сеткай"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Аўтаматычны гадзінны пояс"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Выкарыстанне гадзіннага поясу, вызначаннага сеткай"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Выкарыстанне гадзіннага поясу, вызначаннага сеткай"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24‑гадзінны фармат"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Выкарыстоўваць 24-гадзінны фармат"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Час"</string>
-    <string name="date_time_set_time" msgid="5716856602742530696">"Задаць час"</string>
+    <string name="date_time_set_time" msgid="5716856602742530696">"Усталяваць час"</string>
     <string name="date_time_set_timezone_title" msgid="3047322337368233197">"Гадзінны пояс"</string>
-    <string name="date_time_set_timezone" msgid="5045627174274377814">"Часавы пояс"</string>
+    <string name="date_time_set_timezone" msgid="5045627174274377814">"Вызначце гадзінны пояс"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Дата"</string>
-    <string name="date_time_set_date" msgid="7021491668550232105">"Задаць дату"</string>
-    <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Сартаваць па алфавіце"</string>
-    <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Сартаваць па часавым поясе"</string>
+    <string name="date_time_set_date" msgid="7021491668550232105">"Усталяваць дату"</string>
+    <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Упарадкаваць па алфавіце"</string>
+    <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Сартаваць па гадзінным поясе"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Дата"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Час"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Аўтаматычная блакіроўка"</string>
@@ -310,7 +313,7 @@
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Адразу ж пасля сну, за выключэннем выпадкаў, калі разблакіроўваецца <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> пасля сну, за выключэннем выпадкаў, калі разблакіроўваецца <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Паказаць інфармацыю аб уладальніку на экране блакавання"</string>
-    <string name="owner_info_settings_title" msgid="5530285568897386122">"Тэкст на экране блакіроўкі"</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">"Павед. экрана блак."</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Уключыць віджэты"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Адключана адміністратарам"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Няма"</string>
@@ -340,11 +343,9 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Разблакірав. адбіткам пальца"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Проста дакранайцеся да датчыка адбіткаў пальцаў, каб разблакіраваць свой тэлефон, аўтарызаваць куплі або ўваходзіць у праграмы. Уважліва сачыце за тым, чые адбіткі пальцаў вы дадаяце. Любое з гэтых дзеянняў будзе даступна для ўладальніка нават аднаго з адбіткаў пальцаў.\n\nЗаўвага. Выкарыстанне адбітка пальца можа быць менш бяспечным, чым складаны ўзор або PIN-код. "<annotation id="url">"Даведацца больш"</annotation></string>
-    <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Скасаваць"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Проста дакранайцеся да датчыка адбіткаў пальцаў, каб разблакіраваць свой тэлефон, аўтарызаваць куплі або ўваходзіць у праграмы. Уважліва сачыце за тым, чые адбіткі пальцаў вы дадаяце. Любое з гэтых дзеянняў будзе даступна для ўладальніка нават аднаго з адбіткаў пальцаў.\n\nЗаўвага: выкарыстанне адбітка пальца можа быць менш бяспечным, чым складаны ўзор або PIN-код. "<annotation id="url">"Даведацца больш"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Адмена"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Далей"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Прапусціць"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Дадаць адбітак пальца"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Функцыі Абароны прылады не будуць актываваны. Вы не зможаце прадухіліць выкарыстанне гэтага планшэта ў выпадку страты, кражы або скіду налад."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Функцыі Абароны прылады не будуць актываваны. Вы не зможаце прадухіліць выкарыстанне гэтай прылады ў выпадку страты, крадзяжу або сцірання інфармацыі."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Функцыі Абароны прылады не будуць актываваны. Вы не зможаце прадухіліць выкарыстанне гэтага тэлефона ў выпадку страты, крадзяжу або сцірання інфармацыі."</string>
@@ -353,14 +354,14 @@
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Функцыі Абароны прылады не будуць актываваны. Вы не зможаце прадухіліць выкарыстанне гэтага тэлефона ў выпадку страты або крадзяжу."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Усё роўна прапусціць"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Назад"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Знайдзіце сэнсар"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Знайсці сэнсар"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Знайдзіце датчык адбіткаў пальцаў на задняй панэлі тэлефона."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Малюнак, які паказвае, дзе размяшчаецца датчык адбіткаў пальцаў на прыладзе"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Імя"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ОК"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Выдаліць"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Прыступім!"</string>
-    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Прыкладзіце палец да сэнсара і ўтрымлівайце яго, пакуль не адчуеце вібрацыю"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Давайце пачнем!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Прыкладзіце палец да сэнсара і падніміце яго, калі пачуеце вібрацыю"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Добра! Паўтарыце дзеянне"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Злёгку паварушыце пальцам, каб дадаць усе часткі вашага пальца"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Адбітак пальца дададзены!"</string>
@@ -372,7 +373,7 @@
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Наладзіць блакіроўку экрана"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Гатова"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ой, гэта не датчык"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Скарыстайце сэнсар адбіткаў пальцаў на прыладзе."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Выкар. сэнсар адбіткаў пальцаў на прыладзе."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Рэгістрацыя адбітка не была завершана"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Час на рэгістрацыю адбіткаў скончыўся. Паспрабуйце яшчэ раз."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Рэгістрацыя адбітка не атрымалася. Калі ласка, паўтарыце спробу або выкарыстайце іншы палец."</string>
@@ -423,17 +424,15 @@
     <string name="suggested_lock_settings_title" msgid="5022405858647120434">"Блакіроўка экрана"</string>
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Абараніце сваю прыладу"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Разблакіруйце з дапамогай адбітка пальца"</string>
-    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Спосаб блакіроўкі экрана"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Выберыце спосаб блак. экрана"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Выб. блак. прац. проф."</string>
-    <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Абараніце свой планшэт"</string>
-    <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Абараніце сваю прыладу"</string>
-    <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Абараніце свой тэлефон"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Выкарыстанне адбітка пальца можа быць менш надзейным, чым складаны ўзор, PIN-код або пароль. Для большай бяспекі наладзьце запасны спосаб блакіроўкі экрана."</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Абараніце свой тэлефон"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Выкарыстанне адбітка пальца можа быць менш надзейным, чым складаны графічны ключ, PIN-код або пароль. Для большай бяспекі наладзьце альтэрнатыўны спосаб блакіроўкі экрана."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Прадухіліце выкарыстанне гэтага планшэта без вашага дазволу, актываваўшы функцыі абароны прылады. Выберыце спосаб блакіроўкі экрана, які вы хочаце выкарыстоўваць."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Прадухіліце выкарыстанне гэтай прылады без вашага дазволу, актываваўшы функцыі абароны прылады. Выберыце спосаб блакіроўкі экрана, які вы хочаце выкарыстоўваць."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Прадухіліце выкарыстанне гэтага тэлефона без вашага дазволу, актываваўшы функцыі абароны прылады. Выберыце спосаб блакіроўкі экрана, які вы хочаце выкарыстоўваць."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Выберыце дадатковы спосаб блакіроўкі экрана"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Блакіроўка экрана"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Блакоўка экрана"</string>
     <string name="unlock_set_unlock_launch_picker_title_profile" msgid="124176557311393483">"Блакір. прац. профілю"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Змена блакавання экрана"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Змяніць або адключыць шаблон, PIN-код або пароль бяспекі"</string>
@@ -442,40 +441,40 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Правядзенне пальцам"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Функцыі бяспекі адключаныя"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Узор"</string>
+    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Шаблон"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Сярэдні ўзровень бяспекі"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN-код"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Узровень бяспекі ад сярэдняга да высокага"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Пароль"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Высокі ўзровень бяспекі"</string>
     <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Не зараз"</string>
-    <string name="current_screen_lock" msgid="4104091715420072219">"Бягучы спосаб блакіроўкі"</string>
-    <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Адбітак пальца + узор"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Бягучыя налады блакіроўкі экрана"</string>
+    <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Адбітак пальца + графічны ключ"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Адбітак пальца + PIN-код"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"Адбіткак пальца + пароль"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Выключана адміністратарам, палітыкай шыфравання ці сховішчам уліковых дадзеных"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Няма"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Правядзенне пальцам"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Узор"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Ключ"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN-код"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Пароль"</string>
     <string name="unlock_setup_wizard_fingerprint_details" msgid="7893457665921363009">"Пасля таго як вы наладзіце блакіроўку экрана, вы зможаце наладзіць выкарыстанне адбітка пальца ў меню Налады &gt; Бяспека."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Выключыць блакаванне экрана"</string>
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Выдаліць абарону прылады?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Выдаліць абарону профілю?"</string>
-    <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Функцыі абароны прылады не будуць працаваць без узору."</string>
+    <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Абарона прылады не функцыянуе без вашага графічнага ключа."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Абарона прылады не функцыянуе без вашага графічнага ключа.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Вашы захаваныя адбіткі пальцаў таксама будуць выдаленыя з гэтай прылады, і вы не зможаце выкарыстоўваць іх для разблакіроўкі свайго тэлефона, аўтарызацыі пакупак і ўваходу ў дадаткі.\""</string>
-    <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Функцыі абароны прылады не будуць працаваць без PIN-кода."</string>
+    <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Абарона прылады не функцыянуе без вашага PIN-кода."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Абарона прылады не функцыянуе без вашага PIN-кода.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Вашы захаваныя адбіткі пальцаў таксама будуць выдаленыя з гэтай прылады, і вы не зможаце выкарыстоўваць іх для разблакіроўкі свайго тэлефона, аўтарызацыі пакупак і ўваходу ў дадаткі.\""</string>
-    <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Функцыі абароны прылады не будуць працаваць без пароля."</string>
+    <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Абарона прылады не функцыянуе без вашага паролю."</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Абарона прылады не функцыянуе без вашага паролю.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Вашы захаваныя адбіткі пальцаў таксама будуць выдаленыя з гэтай прылады, і вы не зможаце выкарыстоўваць іх для разблакіроўкі свайго тэлефона, аўтарызацыі пакупак і ўваходу ў дадаткі.\""</string>
-    <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Функцыі абароны прылады не будуць працаваць без блакіроўкі экрана."</string>
+    <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Абарона прылады не функцыянуе без вашага спосабу блакіроўкі экрана."</string>
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Абарона прылады не функцыянуе без вашага спосабу блакіроўкі экрана.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Вашы захаваныя адбіткі пальцаў таксама будуць выдаленыя з гэтай прылады, і вы не зможаце выкарыстоўваць іх для разблакіроўкі свайго тэлефона, аўтарызацыі пакупак і ўваходу ў дадаткі.\""</string>
@@ -506,8 +505,8 @@
     <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Калі вы зараз увядзеце няправільны рабочы пароль, ваш рабочы профіль і звязаныя з імі даныя будуць выдалены з гэтай прылады."</string>
     <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Занадта шмат няўдалых спробаў. Ваш рабочы профіль і звязаныя з імі даныя будуць выдалены з гэтай прылады."</string>
     <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Адхіліць"</string>
-    <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Мінімальная колькасць сімвалаў у паролі: %d"</string>
-    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Мінімальная колькасць лічбаў у PIN-кодзе: %d."</string>
+    <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Пароль павінен быць не менш за пэўную колькасць знакаў: %d"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-код павінен утрымлiваць не менш за пэўную колькасць лічбаў: %d."</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Працягнуць"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Максiмальная колькасць знакаў, якую можа змяшчаць пароль: <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN-код павiнен змяшчаць менш за пэўную колькасць лiчбаў (<xliff:g id="NUMBER">%d</xliff:g>)."</string>
@@ -556,16 +555,16 @@
     <string name="lockpassword_password_recently_used" msgid="4687102591995446860">"Адміністратар прылады не дазваляе выкарыстоўваць апошні пароль."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Забаронена ўводзіць узрастаючую, убываючую або паўторную паслядоўнасць лічбаў"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ОК"</string>
-    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Скасаваць"</string>
-    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Скасаваць"</string>
+    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Адмяніць"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Адмена"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Наступны"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Усталяванне скончана."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Адміністраванне прылады"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Адміністратары прылады"</string>
-    <string name="manage_device_admin_summary" msgid="7672709110988761075">"Праглядзець або дэактываваць адміністратараў прылады"</string>
+    <string name="manage_device_admin_summary" msgid="7672709110988761075">"Праглядаць або адключаць адміністратараў прылады"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Давераныя агенты"</string>
-    <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Перад выкарыстаннем задайце блакіроўку экрана"</string>
-    <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Праглядзець або дэактываваць давераных агентаў"</string>
+    <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Каб выкарыстоўваць, спачатку ўсталюйце блакіроўку экрана"</string>
+    <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Прагляд і адключэнне давераных агентаў"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Уключыць Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -582,7 +581,7 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Каб падключыцца да прылады &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;пераканайцеся, што яна адлюстроўвае ключ доступу:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Ад: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>Падключыцца да гэтай прылады?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Каб падключыцца да прылады <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>, увядзiце <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, затым нацiснiце \"Назад\" або Enter"</string>
-    <string name="bluetooth_pairing_shares_phonebook" msgid="2277931851483023208">"Дазволіць прыладзе <xliff:g id="DEVICE_NAME">%1$s</xliff:g> доступ да вашых кантактаў і гісторыі выклікаў"</string>
+    <string name="bluetooth_pairing_shares_phonebook" msgid="2277931851483023208">"Адкрыць <xliff:g id="DEVICE_NAME">%1$s</xliff:g> доступ да вашых кантактаў і гісторыі выклікаў"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
     <string name="bluetooth_connecting_error_message" msgid="1397388344342081090">"Не атрымалася падлучыцца да прылады <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Шукаць прылады"</string>
@@ -652,7 +651,7 @@
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Дазволіць абмен дадзенымі, калі тэлефон закранае іншыя прылады"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Гатовы перадаваць змесцiва прыкладанняў з дапамогай прылад NFC"</string>
-    <string name="android_beam_off_summary" msgid="4663095428454779138">"Выключана"</string>
+    <string name="android_beam_off_summary" msgid="4663095428454779138">"Адключана"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Недаступна, таму што NFC выключаная"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="1828555626055290684">"Калі гэта функцыя ўключана, вы можаце перадаваць змесціва праграмы на іншыя сумяшчальныя з NFC прылады, утрымліваючы прылады блізка адна да адной. Напрыклад, вы можаце перадаваць старонкi з Браўзера, відэа з YouTube, кантакты з праграмы Людзі і многае іншае.\n\nТолькі наблізьце прылады (звычайна заднімі бакамі) і дакраніцеся да экрана. Праграма вызначыць, якое змесціва перадаецца."</string>
@@ -759,7 +758,7 @@
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Каб павысіць дакладнасць размяшчэння і для іншых мэтаў, <xliff:g id="APP_NAME">%1$s</xliff:g> хоча ўключыць сеткавае сканаванне, нават калі Wi-Fi выключаны.\n\nДазволіць для ўсіх прыкладанняў, якія патрабуецца адсканаваць?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Каб адключыць гэту наладу, перайдзіце да пункту «Пашыраныя» меню перапаўнення."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Дазволіць"</string>
-    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Адмовіць"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Адхiлiць"</string>
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Увайсці, каб падлучыцца?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"Для <xliff:g id="APP_NAME">%1$s</xliff:g> патраб. уваход анлайн перад падлуч. да сеткі."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ПАДЛУЧЫЦЦА"</string>
@@ -771,7 +770,7 @@
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Не атрымалася iгнараваць сетку"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Захаваць"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Не атрымалася захаваць сетку"</string>
-    <string name="wifi_cancel" msgid="6763568902542968964">"Скасаваць"</string>
+    <string name="wifi_cancel" msgid="6763568902542968964">"Адмяніць"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"Усё роўна прапусціць"</string>
     <string name="wifi_dont_skip" msgid="3615535136327231588">"Назад"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ПАПЯРЭДЖАННЕ: калі вы прапусціце крок налад Wi‑Fi, ваш планшэт выкарыстае даныя мабільнай сувязі толькі для пачатковых спамповак і абнаўленняў. Каб пазбегнуць спагнання платы за перадачу даных, падлучыцеся да Wi‑Fi."</string>
@@ -792,7 +791,7 @@
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Налады IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Пашыраныя налады Wi-Fi не даступныя для гэтага карыстальніка"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Захаваць"</string>
-    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Скасаваць"</string>
+    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Адмяніць"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"Увядзіце сапраўдны IP-адрас."</string>
     <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"Увядзіце сапраўдны адрас шлюза."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="8744583948328391047">"Увядзіце сапраўдны адрас DNS."</string>
@@ -834,16 +833,8 @@
     <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Выкарыстоўваць Wi-Fi замест мабільнай сеткі"</string>
     <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_mode_choices:2 (3132912693346866895) -->
+    <!-- no translation found for wifi_calling_mode_values:2 (3194458950573886239) -->
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="5782108782860004851">"Прыярытэт Wi-Fi"</item>
     <item msgid="9006785365352731433">"Прыярытэт мабільнай сеткі"</item>
@@ -907,7 +898,7 @@
     <string name="accessibility_personal_account_title" msgid="2169071663029067826">"Асабісты ўліковы запіс – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="search_settings" msgid="1910951467596035063">"Пошук"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Кіраваць наладамі і гісторыяй пошуку"</string>
-    <string name="display_settings" msgid="7965901687241669598">"Дысплэй"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Паказаць"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Аўтаматычны паварот экрана"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Аўтаматычна змяняць арыентацыю экрана пры павароце планшэта"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Аўтаматычна змяняць арыентацыю экрана пры павароце тэлефона"</string>
@@ -925,14 +916,14 @@
     <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Змена шпалер"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Персаналізуйце свой экран"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Выбраць шпалеры ў"</string>
-    <string name="screensaver_settings_title" msgid="1770575686476851778">"Экранная застаўка"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Мроi"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Калі падключаны, у рэжыме сну цi зараджаецца"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"У абодвух выпадках"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Або"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Падчас зарадкі"</string>
-    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Пры прыстыкоўцы"</string>
-    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Выключана"</string>
-    <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Каб кантраляваць тое, што адбываецца, калі тэлефон прыстыкаваны і/або знаходзіцца ў рэжыме сну, уключыце экранную застаўку."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="8644479926302707286">"Калі ўключаць экранную застаўку"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Пакуль падключаны"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Адключана"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Каб кантраляваць тое, што адбываецца, калі тэлефон падкючаны або ў стане сну, уключыце \"Мроi\"."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Калі трэба марыць"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Пачаць"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Налады"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Аўтаматычная яркасць"</string>
@@ -963,7 +954,7 @@
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN-код SIM-карты паспяхова зменены"</string>
     <string name="sim_lock_failed" msgid="2489611099235575984">"Немагч. разблак. SIM.\nМагч., няправ. PIN."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"ОК"</string>
-    <string name="sim_enter_cancel" msgid="6240422158517208036">"Скасаваць"</string>
+    <string name="sim_enter_cancel" msgid="6240422158517208036">"Адмяніць"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Знойдзена некалькі SIM-карт"</string>
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Выберыце SIM-карту, якую вы б хацелі выкарыстоўваць для даных мабільнай сувязі."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Змяніць SIM-карту для даных?"</string>
@@ -1105,8 +1096,8 @@
     <string name="storage_internal_forget_details" msgid="9028875424669047327">"Каб выкарыстоўваць дадаткі, фатаграфіі або даныя на гэтай <xliff:g id="NAME">^1</xliff:g>, устаўце яе паўторна. \n\nАкрамя таго, вы можаце ігнараваць гэта сховішча, калі прылада недаступна. \n\nКалі вы праігнаруеце гэту прыладу, усе даныя на ёй будуць страчаныя назаўсёды. \n\nВы можаце пераўсталяваць дадаткі пазней, але іх даныя, якія захоўваліся на гэтай прыладзе, будуць страчаныя."</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"Ігнараваць <xliff:g id="NAME">^1</xliff:g>?"</string>
     <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"Усе дадаткі, фатаграфіі і даныя, якія захоўваюцца на гэтай <xliff:g id="NAME">^1</xliff:g>, будуць страчаны назаўсёды."</string>
-    <string name="storage_detail_apps" msgid="6141154016753507490">"Праграмы"</string>
-    <string name="storage_detail_images" msgid="6950678857740634769">"Відарысы"</string>
+    <string name="storage_detail_apps" msgid="6141154016753507490">"Дадаткі"</string>
+    <string name="storage_detail_images" msgid="6950678857740634769">"Выявы"</string>
     <string name="storage_detail_videos" msgid="2919743464827110953">"Відэа"</string>
     <string name="storage_detail_audio" msgid="1197685141676483213">"Аўдыё"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Кэшаваныя даныя"</string>
@@ -1114,7 +1105,7 @@
     <string name="storage_detail_explore" msgid="7911344011431568294">"Праглядзець <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Раздзел Іншае уключае абагуленыя файлы, захаваныя праграмамі, файлы, спампаваныя з інтэрнэту або па Bluetooth, файлы Android і іншыя. \n\nКаб праглядзець усё змесціва <xliff:g id="NAME">^1</xliff:g>, краніце Азнаёміцца."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> можа захоўваць фатаграфіі, музыку, фільмы, дадаткі або іншыя даныя, якія займаюць <xliff:g id="SIZE">^2</xliff:g> месца ў памяці. \n\nДля прагляду падрабязнай інфармацыі пераключыцеся на <xliff:g id="USER_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_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>
@@ -1224,7 +1215,6 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-мадэм"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Мадэм"</string>
     <string name="tether_settings_title_all" msgid="8356136101061143841">"Мадэм і партатыўны хотспот"</string>
-    <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Немагчыма выкарыстоўваць мадэм або партатыўныя хот-споты, калі ўключана Эканомія трафіка"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-мадэм"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB падлучаны, выберыце, каб уключыць мадэм"</string>
@@ -1247,10 +1237,10 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Немагчыма падлучыць больш прылад, чым <xliff:g id="MAXCONNECTION">%1$d</xliff:g>."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Адбудзецца адключэнне прылады <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Даведка"</string>
-    <string name="network_settings_title" msgid="4871233236744292831">"Сотавыя сеткі"</string>
+    <string name="network_settings_title" msgid="4871233236744292831">"Мабільныя сеткі"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Тарыфны план"</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_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>
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"Змяніць памочніка Wi‑Fi?"</string>
@@ -1320,53 +1310,47 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Падлучэнне да Iнтэрнэту адсутнiчае. Каб прагледзець гэтую інфармацыю зараз, наведайце %s з любога камп\'ютара, падлучанага да Iнтэрнэту."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Загрузка..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Выберыце пароль"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Выберыце ўзор разблакіроўкі"</string>
+    <string name="lockpassword_choose_your_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_pattern_header" msgid="7543433733032330821">"Пацвердзіце ўзор"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Пацвердзіце PIN-код"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Пацвердзіце свой шаблон"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Пацвердзіць PIN-код"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Паролі не супадаюць"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-коды не супадаюць"</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Выбар спосабу разблакіроўкі"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Разблакаваць выбар"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Пароль усталяваны"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-код усталяваны"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Шаблон усталяваны"</string>
-    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Каб працягнуць, выкарыстайце ўзор разблакіроўкі прылады"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Каб працягнуць, выкарыстайце ўзор прылады"</string>
     <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Каб працягнуць, увядзіце PIN-код прылады"</string>
     <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Каб працягнуць, увядзіце пароль прылады"</string>
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Каб працягнуць, выкарыстайце ўзор свайго працоўнага профілю"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Каб працягнуць, увядзіце PIN-код свайго працоўнага профілю."</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Каб працягнуць, увядзіце пароль свайго працоўнага профілю"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Каб працягнуць, выкарыстайце ўзор разблакіроўкі прылады. Патрабуецца пасля перазапуску прылады."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Каб працягнуць, увядзіце PIN-код прылады. Патрабуецца пасля перазапуску прылады."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Каб працягнуць, увядзіце пароль прылады. Патрабуецца пасля перазапуску прылады."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Каб працягнуць, выкарыстайце ўзор разблакіроўкі свайго працоўнага профілю. Патрабуецца пасля перазапуску прылады."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Каб працягнуць, увядзіце PIN-код свайго працоўнага профілю. Патрабуецца пасля перазапуску прылады."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Каб працягнуць, увядзіце пароль свайго працоўнага профілю. Патрабуецца пасля перазапуску прылады."</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Няправільны PIN-код"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Няправiльны пароль"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Няправільны ўзор"</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_recording_intro_header" msgid="308287052221942814">"Нарысуйце ўзор разблакіроўкі"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Выканайце камбінацыю разблакоўкі"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Націсніце \"Меню\", каб атрымаць даведку."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Адпусціце палец, калі скончыце"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Злучыце не менш за <xliff:g id="NUMBER">%d</xliff:g> кропкі. Паспрабуйце яшчэ раз."</string>
-    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Узор разблакіроўкі запісаны"</string>
-    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Каб пацвердзіць узор разблакіроўкі, нарысуйце яго яшчэ раз"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Ваш новы ўзор разблакіроўкі:"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Графічны ключ захаваны"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Для пацвярджэння ўвядзіце графічны ключ яшчэ раз"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Ваш новы графічны ключ для разблакіроўкі:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Пацвердзіць"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Выканаць зноў"</string>
     <string name="lockpattern_retry_button_text" msgid="3480423193273588166">"Ачысціць"</string>
-    <string name="lockpattern_continue_button_text" msgid="4723771754714471410">"Працягнуць"</string>
+    <string name="lockpattern_continue_button_text" msgid="4723771754714471410">"Працяг"</string>
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Камбінацыя разблакоўкі"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Патрабаваць камбінацыю разблакавання"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Патрабаваць камбінацыю разблакоўкі, каб разблакаваць экран"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Зрабіць шаблон бачным"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Зрабіць узор разблакіроўкі профілю бачным"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Вібрацыя пры дотыку"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Блакір. кнопкай сілкавання"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Кнопка сiлк. блакiр. імгненна"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"За выключэннем выпадкаў, калі разблакіроўваецца <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Усталяваць камбінацыю разблакоўкі"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Змяніць камбінацыю разблакоўкі"</string>
@@ -1385,7 +1369,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Аднолькава з блакіроўкай экрана прылады"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Кіраванне прыкладаннямі"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Кіраванне ўсталяванымi прыкладаннямi і iх выдаленне"</string>
-    <string name="applications_settings" msgid="1721442176406964682">"Праграмы"</string>
+    <string name="applications_settings" msgid="1721442176406964682">"Прыкладаннi"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Кіраванне прыкладаннямі, налады шляхоў хуткага доступу"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Налады прыкладання"</string>
     <string name="install_applications" msgid="4872012136210802181">"Невядомыя крыніцы"</string>
@@ -1393,7 +1377,7 @@
     <string name="install_unknown_applications_title" msgid="663831043139080992">"Дазваляе вам усталёўваць дадаткі з крыніц, іншых чым Google Play"</string>
     <string name="install_unknown_applications" msgid="176855644862942064">"Дазволіць усталёўку прыкладанняў з невядомых крыніц"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Планшэт і асабістыя дадзеныя больш уразлівыя да нападаў прыкладанняў з невядомых крыніц. Вы згаджаецеся, што нясеце поўную адказнасць за любыя пашкоджанні планшэта ці страту дадзеных, якія могуць паўстаць у працэсе выкарыстання гэтых прыкладанняў."</string>
-    <string name="install_all_warning" product="default" msgid="8113734576826384682">"Тэлефон і асабістыя даныя больш прыступныя перад атакамі праграм з невядомых крыніц. Вы згаджаецеся, што несяце выключную адказнасць за любыя пашкоджанні тэлефона ці страту даных, якія могуць здарыцца у працэсе выкарыстання гэтых праграм."</string>
+    <string name="install_all_warning" product="default" msgid="8113734576826384682">"Тэлефон і асабістыя дадзеныя больш уразлівыя для нападаў прыкладанняў з невядомых крыніц. Вы згаджаецеся, што нясеце поўную адказнасць за любыя пашкоджанні тэлефона ці страты дадзеных, якія могуць паўстаць у працэсе выкарыстання гэтых прыкладанняў."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Пашыраныя налады"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Уключыць дадатковыя параметры налад"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Звесткі пра прыкладанне"</string>
@@ -1440,10 +1424,10 @@
     <string name="show_running_services" msgid="5736278767975544570">"Паказаць запушчаныя службы"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Паказаць кэшаваныя працэсы"</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>
-    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Скінуць праграмы"</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>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Скід прыкладанняў"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Кіраванне вольным месцам"</string>
     <string name="filter" msgid="2018011724373033887">"Фільтр"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Выберыце параметры фільтра"</string>
@@ -1464,7 +1448,7 @@
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"Выдаліць дадзеныя прыкладання?"</string>
     <string name="clear_data_dlg_text" msgid="3951297329833822490">"Усе даныя гэтага дадатку будуць назаўсёды выдаленыя. Гэта датычыцца ўсiх файлаў, налад, уліковых запісаў, баз даных і г. д."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"ОК"</string>
-    <string name="dlg_cancel" msgid="1674753358972975911">"Скасаваць"</string>
+    <string name="dlg_cancel" msgid="1674753358972975911">"Адмяніць"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
     <string name="app_not_found_dlg_text" msgid="4893589904687340011">"Дадатак не знойдзены ў спісе ўсталяваных дадаткаў."</string>
     <string name="clear_data_failed" msgid="7214074331627422248">"Не атрымалася выдалiць даныя дадаткаў."</string>
@@ -1491,7 +1475,6 @@
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Перах. да USB-назап."</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Перамясціць на SD-карту"</string>
     <string name="moving" msgid="6431016143218876491">"Перамяшчэнне"</string>
-    <string name="another_migration_already_in_progress" msgid="7817354268848365487">"Іншы перанос ужо выконваецца."</string>
     <string name="insufficient_storage" msgid="481763122991093080">"Не хапае месца для захоўвання."</string>
     <string name="does_not_exist" msgid="1501243985586067053">"Дадатак не існуе."</string>
     <string name="app_forward_locked" msgid="6331564656683790866">"Прыкладанне абаронена ад капіявання."</string>
@@ -1509,11 +1492,8 @@
     <string name="app_disable_dlg_text" msgid="7824930380425568584">"Калі вы адключыце гэты дадатак, іншыя дадаткі могуць працаваць неналежным чынам."</string>
     <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Выдаліць дадзеныя і адключыць прыкладанне?"</string>
     <string name="app_special_disable_dlg_text" msgid="1007112763234313018">"Калі вы адключыце гэты дадатак, іншыя дадаткі могуць працаваць неналежным чынам. Вашы даныя таксама будуць выдаленыя."</string>
-    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Выключыць апавяшчэнні?"</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Адключыць апавяшчэнні?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Калі адключыць паведамлення для гэтага прыкладання, вы можаце прапусціць важныя сігналы і абнаўленні."</string>
-    <string name="app_install_details_group_title" msgid="7084623031296083574">"Крама"</string>
-    <string name="app_install_details_title" msgid="6905279702654975207">"Звесткi пра праграму"</string>
-    <string name="app_install_details_summary" msgid="6464796332049327547">"Праграма ўсталявана з <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <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>
@@ -1540,14 +1520,14 @@
     <string name="running_processes_header_title" msgid="6588371727640789560">"Памяць прылады"</string>
     <string name="running_processes_header_footer" msgid="723908176275428442">"Выкарыстанне аператыўнай памяці дадаткамі"</string>
     <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"Сістэма"</string>
-    <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"Праграмы"</string>
+    <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"Дадаткі"</string>
     <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"Свабодна"</string>
     <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"Выкарыстоўваецца"</string>
     <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"Кэшаваныя"</string>
     <string name="running_processes_header_ram" msgid="996092388884426817">"<xliff:g id="RAM_0">%1$s</xliff:g> аператыўнай памяці"</string>
     <string name="runningservicedetails_settings_title" msgid="3224004818524731568">"Запуск прыкладанняў"</string>
     <string name="no_services" msgid="7133900764462288263">"Неактыўна"</string>
-    <string name="runningservicedetails_services_title" msgid="391168243725357375">"Сэрвісы"</string>
+    <string name="runningservicedetails_services_title" msgid="391168243725357375">"Службы"</string>
     <string name="runningservicedetails_processes_title" msgid="928115582044655268">"Працэсы"</string>
     <string name="service_stop" msgid="6369807553277527248">"Спыніць"</string>
     <string name="service_manage" msgid="1876642087421959194">"Налады"</string>
@@ -1568,7 +1548,7 @@
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Замяняць аўтаматычна"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Паправіць памылкова ўведзенае слова"</string>
-    <string name="auto_caps" msgid="6379232078052591265">"Аўтаматычна рабіць літары вялікімі"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Аўт. ставіць вял. літары"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Вялікая першая літара ў сказах"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Аўтаматычная пунктуацыя"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Налады фізічнай клавіятуры"</string>
@@ -1582,14 +1562,12 @@
     <string name="keyboard_and_input_methods_category" msgid="212319666432360385">"Клавіятура і спосабы ўводу"</string>
     <string name="virtual_keyboard_category" msgid="1012830752318677119">"Віртуальная клавіятура"</string>
     <string name="available_virtual_keyboard_category" msgid="7645766574969139819">"Даступная віртуальная клавіятура"</string>
-    <string name="add_virtual_keyboard" msgid="3302152381456516928">"Кіраванне клавіятурамі"</string>
+    <string name="add_virtual_keyboard" msgid="5783399159348480135">"Даданне ці рэдагав. вірт. клавіятур"</string>
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"Дапамога пры ўжыванні клавіятуры"</string>
     <string name="physical_keyboard_title" msgid="8285149877925752042">"Фізічная клавіятура"</string>
     <string name="show_ime" msgid="2658582193437188227">"Паказаць віртуальную клавіятуру"</string>
     <string name="show_ime_summary" msgid="8164993045923240698">"Захоўваць яе на экране ў той час, калі фізічная клавіятура актыўная"</string>
-    <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Даведка пра спалучэнні клавіш"</string>
-    <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Паказаць даступныя спалучэнні клавіш"</string>
-    <string name="default_keyboard_layout" msgid="4172606673510531271">"Стандартная"</string>
+    <string name="physical_device_title" msgid="79889057252418427">"<xliff:g id="INPUT_METHOD_SUBTYPE">%1$s</xliff:g> – <xliff:g id="INPUT_METHOD_EDITOR">%2$s</xliff:g>"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Мыш/трэкпад"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Хуткасць указальніка"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Прылада кiравання гульнёй"</string>
@@ -1600,7 +1578,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Каб перакл., націсніце Ctrl-Space"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Па змаўчанні"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Раскладкі клавіятуры"</string>
-    <string name="user_dict_settings_title" msgid="3427169369758733521">"Асабісты слоўнік"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Персанальны слоўнік"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Дадаць"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Дадаць у слоўнік"</string>
@@ -1609,14 +1587,14 @@
     <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Асн. параметры"</string>
     <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"ОК"</string>
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Слова:"</string>
-    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Гарачая клавіша:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Шлях хуткага доступу:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Мова:"</string>
     <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Увядзіце слова"</string>
-    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Неабавязковая гарачая клавіша"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Дадатковы цэтлiк"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Рэдагаваць слова"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Рэдагаваць"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Выдаліць"</string>
-    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"У карыстальніцкім слоўніку няма ніводнага слова. Каб дадаць слова, дакраніце да кнопкі \"Дадаць\" (+)."</string>
+    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"У вашым карыстальніцкім слоўніку няма ніводнага слова. Каб дадаць слова, краніце кнопку Дадаць (+)."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Для ўсіх моў"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Іншыя мовы..."</string>
     <string name="testing" msgid="6584352735303604146">"Праверка"</string>
@@ -1650,7 +1628,7 @@
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> с."</string>
     <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>д. <xliff:g id="HOURS">%2$d</xliff:g>гадз. <xliff:g id="MINUTES">%3$d</xliff:g>хв."</string>
     <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>гадз. <xliff:g id="MINUTES">%2$d</xliff:g>хв."</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>хв"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>хв."</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Статыстыка выкарыстання"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Статыстыка выкарыстання"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Упарадкаваць па:"</string>
@@ -1659,33 +1637,33 @@
     <string name="usage_time_label" msgid="295954901452833058">"Час выкарыстання"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Спецыяльныя магчымасці"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Налады спецыяльных магчымасцей"</string>
-    <string name="vision_settings_title" msgid="4204111425716868288">"Налады для слабых зрокам"</string>
+    <string name="vision_settings_title" msgid="4204111425716868288">"Спецмагчымасці - зрок"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Вы можаце наладзіць гэту прыладу так, каб яна адпавядала вашым патрэбам. Гэтыя спецыяльныя функцыі можна змяніць у Наладах."</string>
-    <string name="accessibility_services_title" msgid="2592221829284342237">"Сэрвісы"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Службы"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
     <string name="talkback_summary" msgid="8331244650729024963">"Праграма для чытання з экрана прызначана ў першую чаргу для сляпых людзей і людзей са слабым зрокам"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Сістэма"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Экран"</string>
-    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Цітры"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Подпісы"</string>
     <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Жэст павелічэння"</string>
-    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Тройчы дакраніцеся, каб змяніць маштаб"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Краніце 3 разы, каб павялічыць"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7798920976388197258"><b>"Каб павялічыць маштаб"</b>", хутка краніце экран 3 разы адным пальцам.\n"<ul><li>"Каб пракруціць, правядзіце 2 або некалькімі пальцамі"</li>\n<li>"Звядзіце 2 або некалькі пальцаў разам або развядзіце іх у бакі, каб адрэгуляваць маштаб"</li></ul>\n\n<b>"Каб часова павялічыць маштаб"</b>", хутка краніце экран 3 разы і ўтрымлівайце палец падчас трэцяга дотыку.\n"<ul><li>"Праводзьце пальцам, каб перамяшчацца па экране"</li>\n<li>"Падыміце палец, каб паменшыць маштаб"</li></ul>\n\n"Немагчыма павялічыць маштаб клавіятуры і панэлі навігацыі."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Хуткі доступ да спец. магчымасцей"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Цэтлiк даступнасцi"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Укл."</string>
-    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Выключана"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="1605107799571936715">"Калі гэта функцыя ўключана, вы можаце хутка актываваць функцыі доступу ў два крокі:\n\nКрок 1: націсніце і ўтрымлівайце кнопку сілкавання, пакуль не пачуеце гук ці не адчуеце вібрацыю.\n\nКрок 2: дакраніцеся да экрана двума пальцамі і ўтрымлівайце іх, пакуль не пачуеце гук пацвярджэння.\n\nКалі прылада мае некалькі карыстальнікаў, скарыстайцеся хуткім доступам на экране блакіроўкi, каб часова ўключыць спецыяльныя магчымасці, пакуль прылада не будзе разблакіравана."</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Адключана"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="1605107799571936715">"Калі гэта функцыя ўключана, вы можаце хутка актываваць функцыі доступу ў два крокі:\n\n.Крок 1: націсніце і ўтрымлівайце кнопку сілкавання, пакуль не пачуеце гук ці не адчуце вібрацыю.\n\nКрок 2: дакраніцеся да экрана двума пальцамі і ўтрымлівайце іх, пакуль не пачуеце гук пацвярджэння.\n\nКалі прылада мае некалькі карыстальнікаў, скарыстайцеся гэтым ярлыком на экране блакіроўкi, каб часова ўключыць спецыяльныя магчымасці, пакуль прылада не будзе разблакіравана."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Высокая кантраснасць тэксту"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Аўтаматычнае абнаўленне павелiчэння экрана"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Абнаўленне павелiчэння экрану падчас перахода з прыкладання"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Нац. на кнопку сілкавання зав. выклік"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Прамаўляць паролі"</string>
+    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Прамовіць паролі"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Вялікі ўказальнік мышы"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Монафанія"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Аб\'ядноўваць каналы пры прайграванні аўдыя"</string>
-    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Затрымка пры націсканні і ўтрыманні"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Дакраніцеся і затрымайце"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Інверсія колеру"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="8658240868230680912">"(Эксперыментальная) Можа паўплываць на прадукцыйнасць"</string>
-    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Націсканне пасля спынення руху указальніка"</string>
+    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Націсканне пасля таго, як указальнік перастае рухацца"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Затрымка перад націсканнем"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Паказваць у Хуткіх наладах"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Рэжым карэкцыі"</string>
@@ -1720,9 +1698,9 @@
       <item quantity="other">Вельмі доўгая затрымка (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> мс)</item>
     </plurals>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Налады"</string>
-    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Уключана"</string>
-    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Выключана"</string>
-    <string name="captioning_preview_title" msgid="1234015253497016890">"Перадпрагляд"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"На"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Адключана"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Папярэдні прагляд"</string>
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"Стандартныя опцыі"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"Мова"</string>
     <string name="captioning_text_size" msgid="6737002449104466028">"Памер тэксту"</string>
@@ -1780,7 +1758,7 @@
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Налады"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Дадаць прынтары"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Уключана"</string>
-    <string name="print_feature_state_off" msgid="7294876968403966040">"Выключана"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Адключана"</string>
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Дадаць службу"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Дадаць прынтар"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Пошук"</string>
@@ -1789,7 +1767,7 @@
     <string name="print_print_jobs" msgid="3582094777756968793">"Заданні друку"</string>
     <string name="print_print_job" msgid="7563741676053287211">"Заданне друку"</string>
     <string name="print_restart" msgid="8373999687329384202">"Перазапусціць"</string>
-    <string name="print_cancel" msgid="3621199386568672235">"Скасаваць"</string>
+    <string name="print_cancel" msgid="3621199386568672235">"Адмена"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"Друк <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_cancelling_state_title_template" msgid="7102968925358219875">"Адмена <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
@@ -1798,7 +1776,7 @@
     <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"Паказваецца поле пошуку"</string>
     <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"Поле пошуку схавана"</string>
     <string name="printer_info_desc" msgid="5824995108703060003">"Больш падрабязная інфармацыя пра гэты прынтар"</string>
-    <string name="power_usage_summary_title" msgid="7190304207330319919">"Акумулятар"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Батарэя"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"На што расходуецца акумулятар"</string>
     <string name="power_usage_not_available" msgid="3109326074656512387">"Дан. пра выкар. зараду недаст."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
@@ -1916,7 +1894,7 @@
     <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Выкарыстанне аператыўнай памяці (фонавае)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Працягласць"</string>
     <string name="processes_subtitle" msgid="6827502409379462438">"Працэсы"</string>
-    <string name="services_subtitle" msgid="4296402367067266425">"Сэрвісы"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Службы"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Працягласць"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Падрабязная інфармацыя пра памяць"</string>
     <string name="mem_state_subtitle" msgid="2407238869781011933">"Стан памяці"</string>
@@ -1971,19 +1949,19 @@
     <string name="gadget_brightness_state_off" msgid="946382262872753084">"выкл."</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Сховішча ўліковых дадзеных"</string>
-    <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Усталяваць са сховішча"</string>
+    <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Усталяваць з назапашвальніка"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Усталёўка з SD-карты"</string>
-    <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Усталяваць сертыфікаты са сховішча"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Усталяваць сертыфікаты з назапашвальніка"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Усталяваць сертыфікаты з SD-карты"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Выдаліць уліковыя дадзеныя"</string>
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Выдаліць усе сертыфікаты"</string>
-    <string name="trusted_credentials" msgid="4266945289534242402">"Давераныя ўліковыя даныя"</string>
-    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Паказаць давераныя сертыфікаты ЦС"</string>
+    <string name="trusted_credentials" msgid="4266945289534242402">"Давераныя паўнамоцтвы"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Паказаць правераныя сертыфікаты CA"</string>
     <string name="user_credentials" msgid="3719013347787187083">"Уліковыя даныя карыстальніка"</string>
     <string name="user_credentials_summary" msgid="7271228342106080167">"Прагляд і рэдагаванне захаваных уліковых даных"</string>
     <string name="advanced_security_title" msgid="2434776238010578865">"Пашыраныя"</string>
-    <string name="credential_storage_type" msgid="8629968543494001364">"Тып сховішча"</string>
-    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Апаратнымі сродкамі"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Тып захоўвання"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Рэзерваванае апаратнымі сродкамі"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Толькі праграмнае забеспячэнне"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Сертыфікаты недаступныя для гэтага карыстальніка"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1997,12 +1975,12 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Захаваныя ўліковыя дадзеныя сціраюцца."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Нельга ачысц. схов. сертыфік."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Сховішча ўлік. дадз. уключанае."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Перад выкарыстаннем сховішча ўліковых даных, трэба задаць PIN-код або пароль для блакіроўкі экрана."</string>
-    <string name="usage_access_title" msgid="332333405495457839">"Праграмы з доступам да даных"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Перш чым выкарыстоўваць сховішча ўліковых дадзеных, усталюйце PIN-код для блакавання экрана або пароль."</string>
+    <string name="usage_access_title" msgid="332333405495457839">"Дад-кі з дост. да дан. аб вык."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Надзвычайны гук"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Задаць паводзіны на выпадак экстранага выкліку"</string>
-    <string name="privacy_settings" msgid="5446972770562918934">"Рэзервовае капіраванне і скід"</string>
-    <string name="privacy_settings_title" msgid="4856282165773594890">"Рэзервовае капіраванне і скід"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Рэзервовае капіраванне і скідванне"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Рэзервовае капіраванне і скідванне"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Рэзервовае капіяванне і аднаўленне"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Асабістыя дадзеныя"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Рэзервовае капіяванне дадзеных"</string>
@@ -2019,7 +1997,7 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Аўтаматычна ствараць рэзервовыя копіі даных прылады (такіх як паролі Wi-Fi і гісторыя выклікаў) і дадаткаў (такіх як налады і файлы, якія захоўваюцца ў дадатках) аддалена.\n\nКалі аўтаматычнае рэзеравовае капіраванне даных уключана, даныя прылады і дадаткаў перыядычна аддалена захоўваюцца. Даныя дадаткаў – гэта любыя даныя, якія захоўваюцца дадаткам (у залежнасці ад налад распрацоўшчыка), у тым ліку патэнцыяльна ўразлівыя даныя, такія як кантакты, паведамленні і фатаграфіі."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Налады адміністравання прылады"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Адміністратар прылады"</string>
-    <string name="remove_device_admin" msgid="7736174723276745230">"Дэактываваць гэтага адміністратара прылады"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Дэактываваць адміністратара гэтай прылады"</string>
     <string name="uninstall_device_admin" msgid="271120195128542165">"Выдалiць праграму"</string>
     <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Дэактывацыя і выдаленне"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Адміністратары прылады"</string>
@@ -2028,10 +2006,10 @@
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Рабочыя"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Няма даступных давераных агентаў"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Актываваць адміністратара прылады?"</string>
-    <string name="add_device_admin" msgid="1349673618141610506">"Актываваць гэтага адміністратара прылады"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Актываваць адміністратара гэтай прылады"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Адміністратар прылады"</string>
-    <string name="device_admin_warning" msgid="2026747446313628233">"Актывацыя гэтага адміністратара дазволіць праграме <xliff:g id="APP_NAME">%1$s</xliff:g> выконваць наступныя дзеянні:"</string>
-    <string name="device_admin_status" msgid="4252975713178851910">"Гэты адміністратар з\'яўляецца актыўным і дазваляе праграме <xliff:g id="APP_NAME">%1$s</xliff:g> выконваць наступныя аперацыі:"</string>
+    <string name="device_admin_warning" msgid="2026747446313628233">"Актывацыя гэтага адміністратара дазволіць прыкладанню <xliff:g id="APP_NAME">%1$s</xliff:g> выконваць наступныя дзеянні:"</string>
+    <string name="device_admin_status" msgid="4252975713178851910">"Гэты адміністратар з\'яўляецца актыўным і дазваляе прыкладанню <xliff:g id="APP_NAME">%1$s</xliff:g> выконваць наступныя аперацыі:"</string>
     <string name="profile_owner_add_title" msgid="6249331160676175009">"Актываваць Менеджар профіляў?"</string>
     <string name="adding_profile_owner_warning" msgid="8081841501073689534">"Калі вы працягнеце, ваш Карыстальнік будзе знаходзіцца пад кіраваннем вашага Адміністратара, які, акрамя вашых асабістых даных, зможа захоўваць таксама звязаныя даныя.\n\nУ вашага Адміністратара ёсць правы на маніторынг і кіраванне наладамі, доступам, дадаткамі і данымі, звязанымі з гэтым Карыстальнікам, у тым ліку інфармацыяй пра сеткавую актыўнасць і месцазнаходжанне прылады."</string>
     <string name="admin_disabled_other_options" msgid="4564776259414246934">"Іншыя параметры адключаны вашым адміністратарам."</string>
@@ -2056,7 +2034,7 @@
     <string name="wifi_setup_connect" msgid="7954456989590237049">"Падключыцца"</string>
     <string name="wifi_setup_forget" msgid="2562847595567347526">"Забыць"</string>
     <string name="wifi_setup_save" msgid="3659235094218508211">"Захаваць"</string>
-    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Скасаваць"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Адмена"</string>
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"Сканаванне сетак..."</string>
     <string name="wifi_setup_status_select_network" msgid="3960480613544747397">"Каб падлучыцца да сеткі, краніце яе назву"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Падключэнне да існуючай сеткі"</string>
@@ -2123,7 +2101,7 @@
     <string name="enter_password" msgid="8035706727471334122">"Каб запусціць Android, увядзіце пароль"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Каб запусціць Android, увядзіце PIN-код"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Каб запусціць Android, увядзіце графічны ключ"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Няправільны ўзор"</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Няправільны графічны ключ"</string>
     <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Няправiльны пароль"</string>
     <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Няправільны PIN-код"</string>
     <string name="checking_decryption" msgid="8287458611802609493">"Праверка..."</string>
@@ -2133,8 +2111,8 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"выбрана <xliff:g id="NUMBER">%1$d</xliff:g> з <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> з <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Выбраць усё"</string>
-    <string name="data_usage_summary_title" msgid="3804110657238092929">"Выкарыстанне трафіку"</string>
-    <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Трафік праграм"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Выкарыстанне дадзеных"</string>
+    <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Выкарыст. даных дадаткам"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Улік даных аператара можа адрознівацца ад уліку вашай прылады."</string>
     <string name="data_usage_app" msgid="4970478397515423303">"Выкарыстанне памяці"</string>
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"ІНФАРМАЦЫЯ ПРА ДАДАТАК"</string>
@@ -2142,7 +2120,7 @@
     <string name="data_usage_data_limit" msgid="1193930999713192703">"Усталяваць ліміт даных"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Цыкл выкарыст. дадзеных"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"Выкарыстанне памяці"</string>
-    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Перадача даных у роўмінгу"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Роўмінг дадзеных"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Абмежаваць фонавыя дадзеныя"</string>
     <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"Дазвол. выкар. фон. даных"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Незалежнае выкарыстанне 4G"</string>
@@ -2153,7 +2131,7 @@
     <string name="data_usage_menu_metered" msgid="6235119991372755026">"Сеткавыя абмежаванні"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Аўтаматычная сiнхранiзацыя дадзеных"</string>
     <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"SIM-карты"</string>
-    <string name="data_usage_menu_cellular_networks" msgid="5243515735055652279">"Сотавыя сеткі"</string>
+    <string name="data_usage_menu_cellular_networks" msgid="5243515735055652279">"Мабільныя сеткі"</string>
     <string name="data_usage_cellular_data_summary" msgid="8413357481361268285">"Паўза пры дасягненні ліміту"</string>
     <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"Аўтамат. сiнхранiзацыя даных"</string>
     <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"Аўтам. сінхран. асабіст. даных"</string>
@@ -2161,7 +2139,7 @@
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"Змяніць цыкл..."</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Дзень месяца для скіду цыкла выкарыстання дадзеных"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"Зараз ніякія прыкладаннi не выкарыстоўваюць дадзеныя."</string>
-    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Асноўны рэжым"</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"У асноўным рэжыме"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"Фонавы рэжым"</string>
     <string name="data_usage_app_restricted" msgid="3568465218866589705">"абмежавана"</string>
     <string name="data_usage_disable_mobile" msgid="2613595056882494652">"Адключыць перадачу даных па мабільнай сетцы?"</string>
@@ -2188,10 +2166,10 @@
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Абмежаваць зыходныя дадзеныя?"</string>
     <string name="data_usage_app_restrict_dialog" msgid="5871168521456832764">"Гэта функцыя можа выклікаць спыненне працы дадатку, якi залежыць ад фонавых даных, калі даступны толькі мабільныя сеткі.\n\nВы можаце знайсці больш адпаведныя налады выкарыстання даных у наладах гэтага дадатку."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="1493134803720421674">"Абмежаваць выкарыстанне фонавых даных можна толькі тады, калі вы ўсталявалі ліміт мабільных даных."</string>
-    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Уключыць аўтасінхр. даных?"</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Уключыць аўтасінхр. дадзеных?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Любыя змены, унесеныя ва ўліковы запіс на вэб-сайце, будуць аўтаматычна скапіраваны ў памяць планшэта.\n\nНекаторыя ўліковыя запісы таксама могуць аўтаматычна капіраваць любыя змены, якія вы робіце ў планшэце, на вэб-сайт. Уліковы запіс Google працуе такім чынам."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Любыя змены, унесеныя ва ўліковы запіс на вэб-сайце, будуць аўтаматычна скапіраваныя ў памяць тэлефона.\n\nНекаторыя ўліковыя запісы таксама могуць аўтаматычна капіраваць любыя змены, якія вы робіце ў тэлефоне, на вэб-сайт. Уліковы запіс Google працуе такім чынам."</string>
-    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Адключыць аўтасінхр. даных?"</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Адключыць аўтасінхр. дадзеных?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Гэта дасць магчымасць захаваць трафік і зарад акумулятара, але вам трэба будзе сінхранiзаваць кожны ўліковы запіс уручную, каб збіраць свежую інфармацыю. І вы не будзеце атрымліваць апавяшчэнні, калі з\'явяцца абнаўленні."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Дата скіду цыкла выкарыстання"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Дата кожнага месяца:"</string>
@@ -2214,8 +2192,8 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: паводле даных планш., выкар. прыкл. <xliff:g id="TOTAL">%1$s</xliff:g>. Ваш аператар можа ўлічваць выкар. даных па-іншаму."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: паводле даных тэл., выкар. прыкл. <xliff:g id="TOTAL">%1$s</xliff:g>. Ваш аператар можа ўлічваць выкар. даных па-іншаму."</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"Сеткавыя абмежаванні"</string>
-    <string name="data_usage_metered_body" msgid="3262343834446126044">"Калі перадача даных у фонавым рэжыме абмежавана, сеткі з тарыфікацыяй разглядаюцца як сотавыя. Праграмы могуць паказваць папярэджанні перад выкарыстаннем такіх сетак для спампавання вялікіх файлаў."</string>
-    <string name="data_usage_metered_mobile" msgid="2326986339431119372">"Сотавыя сеткі"</string>
+    <string name="data_usage_metered_body" msgid="3262343834446126044">"Калі ўсталявана абмежаванне на выкарыстанне фонавых даных, сеткі з абмежаваннем па трафіку разглядаюцца як мабільныя. Дадаткі могуць паказваць папярэджанні перад выкарыстаннем такіх сетак для спампоўкі вялікіх файлаў."</string>
+    <string name="data_usage_metered_mobile" msgid="2326986339431119372">"Мабільныя сеткі"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Сеткі Wi‑Fi з абмеж. па трафіку"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Каб выбраць сеткі з абежаваннем па трафіку, уключыце Wi‑Fi."</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Улік даных аператара можа адрознівацца ад уліку вашай прылады."</string>
@@ -2241,11 +2219,11 @@
     <string name="vpn_not_used" msgid="9094191054524660891">"(Не выкарыстоўваецца)"</string>
     <string name="vpn_no_ca_cert" msgid="8776029412793353361">"(не правяраць сервер)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(атрыманыя з сервера)"</string>
-    <string name="vpn_cancel" msgid="1979937976123659332">"Скасаваць"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Адмяніць"</string>
     <string name="vpn_done" msgid="8678655203910995914">"Адхіліць"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Захаваць"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Злучыцца"</string>
-    <string name="vpn_replace" msgid="5442836256121957861">"Замяніць"</string>
+    <string name="vpn_continue" msgid="846894478725673098">"Працягнуць"</string>
     <string name="vpn_edit" msgid="8647191407179996943">"Рэдагаваць профіль VPN"</string>
     <string name="vpn_forget" msgid="3684651372749415446">"Iгнараваць"</string>
     <string name="vpn_connect_to" msgid="5965299358485793260">"Падключэнне да профiлю <xliff:g id="PROFILE">%s</xliff:g>"</string>
@@ -2254,9 +2232,9 @@
     <string name="vpn_version" msgid="1939804054179766249">"Версія <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Забыць VPN"</string>
     <string name="vpn_replace_always_on_vpn_title" msgid="3010435028275752220">"Замяніць існуючую VPN?"</string>
-    <string name="vpn_replace_always_on_vpn_message" msgid="4764679857158814028">"Вы ўжо падключаны да VPN. Калі вы падключыцеся да іншай, ваша існуючая VPN будзе заменена."</string>
-    <string name="vpn_cant_connect_title" msgid="4517706987875907511">"<xliff:g id="VPN_NAME">%1$s</xliff:g> не можа падключыцца"</string>
-    <string name="vpn_cant_connect_message" msgid="2593197919352621279">"Гэта праграма не падтрымлівае пастаянна ўключаную VPN."</string>
+    <string name="vpn_replace_always_on_vpn_message" msgid="4766130211217825628">"У вас ужо ёсць VPN, падключаная да гэтага профілю. Калі вы падключыцеся да іншай, існуючая VPN будзе заменена."</string>
+    <string name="vpn_cant_connect_notification_title" msgid="820999437026146960">"<xliff:g id="VPN_NAME">%1$s</xliff:g> не можа падключыцца"</string>
+    <string name="vpn_tap_for_vpn_settings" msgid="582017057346927799">"Краніце, каб наладзіць VPN"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
     <string name="vpn_create" msgid="5628219087569761496">"Дадаць профіль VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Рэдагаваць профiль"</string>
@@ -2271,12 +2249,12 @@
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Сертыфікат адсутнічае. Адрэдагуйце профіль."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Сістэма"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Карыстальнік"</string>
-    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Адключыць"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Выключыць"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Уключыць"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Выдаліць"</string>
     <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Давяраць"</string>
-    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Уключыць сістэмны сертыфікат ЦС?"</string>
-    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Адключыць сістэмны сертыфікат ЦС?"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Уключыць CA-сертыфікат сістэмы?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Адключыць CA-сертыфікат сістэмы?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Канчаткова выдаліць сертыфікат карыстальніка CA?"</string>
     <string name="one_userkey" msgid="6034020579534914349">"адзін ключ карыстальніка"</string>
     <string name="one_usercrt" msgid="2150319011101639509">"адзін сертыфікат карыстальніка"</string>
@@ -2288,38 +2266,17 @@
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Тут увядзіце новы пароль для поўнага рэзервовага капіравання"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Увядзіце тут новы пароль для поўнага рэзервовага капіявання"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Пазначце пароль рэзервовага капіравання"</string>
-    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Скасаваць"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Адмена"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Дадатк. абнаўл. сістэмы"</string>
     <string name="selinux_status_disabled" msgid="924551035552323327">"Выключана"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Дазвол"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Забеспячэнне"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"За сеткай можа назіраць"</string>
     <string name="done_button" msgid="1991471253042622230">"Гатова"</string>
-    <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
-      <item quantity="one">Давяраць сертыфікатам або выдаліць іх</item>
-      <item quantity="few">Давяраць сертыфікатам або выдаліць іх</item>
-      <item quantity="many">Давяраць сертыфікатам або выдаліць іх</item>
-      <item quantity="other">Давяраць сертыфікатам або выдаліць іх</item>
-    </plurals>
-    <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="1489335297837656666">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> усталяваў цэнтр сертыфікацыі на вашай прыладзе, які можа дазволіць яму кантраляваць сеткавую дзейнасць вашай прылады, у тым ліку электронную пошту, праграмы і бяспечныя вэб-сайты.\n\nДля атрымання дадатковай інфармацыі аб гэтых сертыфікатах звярніцеся да адміністратара.</item>
-      <item quantity="few"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> усталяваў цэнтр сертыфікацыі на вашай прыладзе, які можа дазволіць яму кантраляваць сеткавую дзейнасць вашай прылады, у тым ліку электронную пошту, праграмы і бяспечныя вэб-сайты.\n\nДля атрымання дадатковай інфармацыі аб гэтых сертыфікатах звярніцеся да адміністратара.</item>
-      <item quantity="many"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> усталяваў цэнтр сертыфікацыі на вашай прыладзе, які можа дазволіць яму кантраляваць сеткавую дзейнасць вашай прылады, у тым ліку электронную пошту, праграмы і бяспечныя вэб-сайты.\n\nДля атрымання дадатковай інфармацыі аб гэтых сертыфікатах звярніцеся да адміністратара.</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> усталяваў цэнтр сертыфікацыі на вашай прыладзе, які можа дазволіць яму кантраляваць сеткавую дзейнасць вашай прылады, у тым ліку электронную пошту, праграмы і бяспечныя вэб-сайты.\n\nДля атрымання дадатковай інфармацыі аб гэтых сертыфікатах звярніцеся да адміністратара.</item>
-    </plurals>
-    <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="30645643499556573">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> усталяваў цэнтр сертыфікацыі для вашага працоўнага профілю, які можа дазволіць яму кантраляваць працу працоўнай сеткі, у тым ліку электронную пошту, праграмы і бяспечныя вэб-сайты.\n\nДля атрымання дадатковай інфармацыі аб гэтых сертыфікатах звярніцеся да адміністратара.</item>
-      <item quantity="few"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> усталяваў цэнтр сертыфікацыі для вашага працоўнага профілю, які можа дазволіць яму кантраляваць працу працоўнай сеткі, у тым ліку электронную пошту, праграмы і бяспечныя вэб-сайты.\n\nДля атрымання дадатковай інфармацыі аб гэтых сертыфікатах звярніцеся да адміністратара.</item>
-      <item quantity="many"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> усталяваў цэнтр сертыфікацыі для вашага працоўнага профілю, які можа дазволіць яму кантраляваць працу працоўнай сеткі, у тым ліку электронную пошту, праграмы і бяспечныя вэб-сайты.\n\nДля атрымання дадатковай інфармацыі аб гэтых сертыфікатах звярніцеся да адміністратара.</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> усталяваў цэнтр сертыфікацыі для вашага працоўнага профілю, які можа дазволіць яму кантраляваць працу працоўнай сеткі, у тым ліку электронную пошту, праграмы і бяспечныя вэб-сайты.\n\nДля атрымання дадатковай інфармацыі аб гэтых сертыфікатах звярніцеся да адміністратара.</item>
-    </plurals>
+    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Маніторынг сеткі"</string>
+    <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Гэта прылада знаходзіцца пад кіраваннем:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nАдміністратар мае магчымасць маніторынгу вашай сеткавай актыўнасці, у тым ліку электроннай пошты, дадаткаў і абароненых вэб-сайтаў.\n\nДля атрымання больш падрабязнай інфармацыі звярніцеся да адміністратара."</string>
     <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Трэцяя асоба мае магчымасць маніторынгу вашай сеткавай актыўнасці, у тым ліку электроннай пошты, дадаткаў і абароненых вэб-сайтаў.\n\nГэта магчыма з-за даверанага сертыфіката, усталяванага на вашай прыладзе."</string>
-    <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
-      <item quantity="one">Праверыць сертыфікаты</item>
-      <item quantity="few">Праверыць сертыфікаты</item>
-      <item quantity="many">Праверыць сертыфікаты</item>
-      <item quantity="other">Праверыць сертыфікаты</item>
-    </plurals>
+    <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Прагляд давераных сертыфікатаў"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Карыстальнікі"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Карыстальнікi і профілi"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Дадаць карыстальніка або профіль"</string>
@@ -2341,7 +2298,7 @@
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Абмежаваны профiль"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Дадаць новага карыстальніка?"</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_add_user_message_short" msgid="1511354412249044381">"Калі вы дадаеце новага карыстальніка, ён павінен наладзіць свой раздзел.\n\nЛюбы карыстальнік можа абнаўляць дадаткі для ўсіх астатніх карыстальнікаў."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Наладзiць карыстальнiкаў?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Пераканайцеся, што чалавек мае магчымасць узяць прыладу і наладзіць свой раздзел"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Наладзiць профiль?"</string>
@@ -2357,14 +2314,14 @@
     <string name="user_new_user_name" msgid="369856859816028856">"Новы карыстальнік"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Новы профiль"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Выдаляеце сябе?"</string>
-    <string name="user_confirm_remove_title" msgid="1163721647646152032">"Выдаліць гэтага карыстальніка?"</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="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"Ваш раздзел і даныя будуць выдаленыя з гэтага планшэта. Гэта дзеянне нельга адмяніць."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="7943645442479360048">"Ваш раздзел і даныя будуць выдаленыя з гэтага тэлефона. Гэта дзеянне нельга адмяніць."</string>
-    <string name="user_confirm_remove_message" msgid="1020629390993095037">"Усе праграмы і даныя будуць выдалены."</string>
+    <string name="user_confirm_remove_message" msgid="1020629390993095037">"Усе дадаткі і даныя будуць выдаленыя."</string>
     <string name="work_profile_confirm_remove_message" msgid="323856589749078140">"Калі вы працягнеце, усе дадаткі і даныя гэтага профілю будуць выдаленыя."</string>
-    <string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"Усе праграмы і даныя будуць выдалены."</string>
+    <string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"Усе дадаткі і даныя будуць выдаленыя."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Даданне новага карыстальніка..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Выдалiць карыстальніка"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Выдаліць"</string>
@@ -2389,7 +2346,7 @@
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Гэты параметр распаўсюджвае на ўсіх карыстальнікаў гэтага планшэта."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Гэты параметр распаўсюджвае на ўсіх карыстальнікаў гэтага тэлефона."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Змяніць мову"</string>
-    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Аплата дотыкам"</string>
+    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Бескантактныя плацяжы"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"Як гэта працуе"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"Плаціце ў крамах з дапамогай свайго тэлефона"</string>
     <string name="nfc_payment_default" msgid="8648420259219150395">"Аплата па змаўчанні"</string>
@@ -2419,7 +2376,7 @@
     <string name="severe_threats_summary" msgid="8848126509420177320">"Атрым. абвесткі аб сур\'ёзных пагрозах для жыцця і маёмасці"</string>
     <string name="amber_alerts_title" msgid="2772220337031146529">"Абвесткі сістэмы AMBER"</string>
     <string name="amber_alerts_summary" msgid="4312984614037904489">"Атрымліваць бюлетэні пра выкраданні дзяцей"</string>
-    <string name="repeat_title" msgid="6473587828597786996">"Паўтараць"</string>
+    <string name="repeat_title" msgid="6473587828597786996">"Паўтор"</string>
     <string name="call_manager_enable_title" msgid="7718226115535784017">"Уключыць Call Manager (Менеджар выклікаў)"</string>
     <string name="call_manager_enable_summary" msgid="8458447798019519240">"Дазволіць гэтай службе кіраваць тым, як робяцца выклікі."</string>
     <string name="call_manager_title" msgid="4479949569744516457">"Call Manager (Менеджар выклікаў)"</string>
@@ -2430,7 +2387,7 @@
     <string name="access_point_names" msgid="1381602020438634481">"Назвы пунктаў доступу"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Рэжым пашыранага 4G LTE"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"Выкарыстоўвайце даныя LTE, каб палепшыць галасавы ўвод і сувязь (рэкамендавана)"</string>
-    <string name="preferred_network_type_title" msgid="3431041717309776341">"Прыярытэтны тып сеткі"</string>
+    <string name="preferred_network_type_title" msgid="3431041717309776341">"Тып пажаданай сеткі"</string>
     <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (рэкамендуецца)"</string>
     <string name="work_sim_title" msgid="4843322164662606891">"Рабочая SIM-карта"</string>
     <string name="user_restrictions_title" msgid="5794473784343434273">"Доступ да дадаткаў і змесціва"</string>
@@ -2453,7 +2410,7 @@
     <string name="wizard_next" msgid="3606212602795100640">"Далей"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"Завершыць"</string>
     <string name="user_image_take_photo" msgid="1280274310152803669">"Зрабіць фота"</string>
-    <string name="user_image_choose_photo" msgid="7940990613897477057">"Выбраць фота з Галерэі"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Выберыце фатаграфію з галерэі"</string>
     <string name="user_image_photo_selector" msgid="5492565707299454873">"Выбраць фота"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
     <string name="sim_setup_wizard_title" msgid="1732682852692274928">"SIM-карты"</string>
@@ -2571,7 +2528,6 @@
     <string name="emergency_tone_silent" msgid="1067515631635824291">"Ціхі рэжым"</string>
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Абвестка"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вібрацыя"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Не турбаваць"</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_automation_suggestion_title" msgid="3373871113435938830">"Задаць графік рэж. \"Не турб.\""</string>
@@ -2584,10 +2540,10 @@
     <string name="configure_notification_settings" msgid="3558846607192693233">"Наладзіць апавяшчэнні"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Пашыраныя"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Апавяшчэнні працоўнага профілю"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Мігценне індыкатара апавяшчэння"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Імпульснае святло апавяшчэння"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"На экране блакіроўкі"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Паказваць усё змесціва ў апавяшчэннях"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Хаваць канфідэнцыяльнае змесціва ў апавяшчэннях"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Схаваць канфідэнцыяльнае змесціва ў апавяшчэннях"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Ніколі не паказваць апавяшчэнні"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Як павінны паказвацца апавяшчэнні, калі прылада заблакіравана?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Апавяшчэнні"</string>
@@ -2599,13 +2555,12 @@
     <string name="app_notifications_title" msgid="139788604658984593">"Апавяшчэнні"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Важнасць"</string>
     <string name="notification_importance_none" msgid="3173515479356106227">"Не зададзена"</string>
-    <string name="notification_importance_blocked" msgid="4348392266695847526">"Ніколі не паказваць апавяшчэнні ад гэтай праграмы"</string>
-    <string name="notification_importance_min" msgid="1859001310034196751">"Не перапын. рэжым поўнага экрана, не дазвал. кароткі паказ, гук або вібрацыю. Паказв. унізе спіса апав. Хаваць з экрана блак. і панэлі стану."</string>
-    <string name="notification_importance_low" msgid="1466326143251705794">"Не перапыняць рэжым поўнага экрана, не дазваляць кароткі паказ, прайгранне гуку або вібрацыю."</string>
-    <string name="notification_importance_default" msgid="2857618184137114962">"Не перапыняць рэжым поўнага экрана і не дазваляць кароткі паказ."</string>
-    <string name="notification_importance_high" msgid="495354850199578732">"Заўсёды дазваляць кароткі паказ. Не перапыняць рэжым поўнага экрана."</string>
-    <string name="notification_importance_max" msgid="7538045535631915413">"Заўсёды дазваляць кароткі паказ і перапыненне рэжыму поўнага экрана. Паказваць уверсе спіса апавяшч."</string>
-    <string name="notification_importance_unspecified" msgid="6172151762388245221">"Праграма вызначае важнасць кожнага апавяшчэння"</string>
+    <string name="notification_importance_blocked" msgid="4764559498517003405">"Заблакіравана: ніколі не паказваць гэтыя апавяшчэнні"</string>
+    <string name="notification_importance_min" msgid="2370444628448134377">"Мінімальная важнасць: паказваць унізе спіса апавяшчэнняў бязгучна"</string>
+    <string name="notification_importance_low" msgid="979932751695283877">"Нізкая важнасць: паказваць гэтыя апавяшчэнні бязгучна"</string>
+    <string name="notification_importance_default" msgid="8789180840561778039">"Звычайная важнасць: дазволіць гэтым апавяшчэнням прайграваць гукі"</string>
+    <string name="notification_importance_high" msgid="5044607814670313040">"Высокая важнасць: хутка паказаць на экране і прайграць гук"</string>
+    <string name="notification_importance_max" msgid="6036245535555486319">"Пільна: паказваць уверсе спіса апавяшчэнняў, хутка паказаць на экране і дазволіць прайграванне гуку"</string>
     <string name="importance_reset" msgid="7458420788555607007">"Скінуць"</string>
     <string name="show_silently" msgid="2222875799232222056">"Паказваць бязгучна"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Не прайграваць гук, не вібрыраваць і не паказваць гэтыя апавяшчэнні хутка ў полі зроку на бягучым экране."</string>
@@ -2619,24 +2574,18 @@
     </plurals>
     <string name="no_notification_listeners" msgid="3487091564454192821">"Запытаў ад усталяваных дадаткаў на доступ да апавяшчэнняў не паступала."</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"Адкрыць доступ да апавяшчэнняў для <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"Праграма <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> атрымае доступ да ўсіх апавяшчэнняў, у тым ліку асабістай інфармацыі, такой як кантакты і тэкст паведамленняў, якія вы атрымліваеце. Яна таксама зможа адхіляць апавяшчэнні і актываваць у іх кнопкі дзеянняў. \n\nГэта таксама дасwm праграме магчымасць уключаць і выключаць рэжым \"Не турбаваць\", а таксама змяняць звязаныя з ім налады."</string>
-    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"Калі вы адключыце доступ да апавяшчэнняў для <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, доступ да рэжыму \"Не турбаваць\" можа быць таксама адключаны."</string>
-    <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"Адключыць"</string>
-    <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"Скасаваць"</string>
+    <string name="notification_listener_security_warning_summary" msgid="548925084229440829">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> атрымае доступ да ўсіх апавяшчэнняў, у тым ліку асабістай інфармацыі, такой як кантакты і тэкст паведамленняў, якія вы атрымліваеце. Гэты карыстальнік таксама зможа адхіляць апавяшчэнні і націскаць у іх кнопкі дзеянняў."</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"Службы-памочнікі віртуальнай рэальнасці (VR)"</string>
     <string name="no_vr_listeners" msgid="2689382881717507390">"Усталяваныя праграмы не запытвалі выканання ў якасці службы-памочніка віртуальнай рэальнасці (VR)."</string>
-    <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"Дазволіць сэрвісу віртуальнай рэальнасці (VR) доступ да <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"Адкрыць службе віртуальнай рэальнасці (VR) доступ да <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"<xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> зможа выконвацца, калі вы выкарыстоўваеце праграмы ў рэжыме віртуальнай рэальнасці."</string>
-    <string name="display_vr_pref_title" msgid="7049857952347953979">"Калі прылада знаходзіцца ў рэжыме віртуальнай рэальнасці"</string>
-    <string name="display_vr_pref_low_persistence" msgid="6221441245293606681">"Выкарыстоўвайце налады нізкага размыцця падчас руху"</string>
-    <string name="display_vr_pref_off" msgid="1244880066079174840">"Нічога не рабіць"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Доступ да рэжыму «Не турбаваць»"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Запытаў доступу да рэжыму «Не турбаваць» ад усталяваных дадаткаў не паступала"</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>
+    <string name="app_notification_block_summary" msgid="9049487483231233726">"Ніколі не паказваць апавяшчэнні ад гэтага дадатку"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ігнараваць рэжым «Не турбаваць»"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Паказваць гэтыя апавяшчэнні, калі ў рэжыме «Не турбаваць» выбрана «Толькі прыярытэтныя»"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Дазволіць гэтым апавяшчэнням працягваць умяшанні, калі ў рэжыме «Не турбаваць» уключана опцыя «Толькі прыярытэтныя»"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"На экране блакіроўкі"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Заблакiравана"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Прыярытэтны"</string>
@@ -2720,7 +2669,7 @@
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"Блакіраваць, калі экран выключаны"</string>
     <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Прадухіліць уключэнне экрана або пульсацыю індыкатара апавяшчэнняў для апавяшчэнняў, паказ якіх адключаны ў рэжыме «Не турбаваць»"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Не дазваляць уключэнне экрана для апавяшчэнняў, паказ якіх адключаны ў рэжыме «Не турбаваць»"</string>
-    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Выключана"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Адключана"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Калі экран уключаны"</string>
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Калі экран выключаны"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Калі экран уключаны або выключаны"</string>
@@ -2728,10 +2677,10 @@
     <string name="device_feedback" msgid="3238056036766293294">"Адправіць водгук пра гэту прыладу"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Увядзіце PIN-код адміністратара"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Уключана"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Выключана"</string>
+    <string name="switch_off_text" msgid="1139356348100829659">"Адключана"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Замацаванне экрана"</string>
     <string name="screen_pinning_description" msgid="3360904523688769289">"Калі гэта налада ўключана, вы можаце замацоўваць бягучы экран, каб захоўваць яго ў полі зроку, пакуль не адмацуеце.\n\nКаб замацаваць экран:\n\n1. Упэўніцеся, што замацаванне экрана ўключана.\n\n2. Адкрыйце экран, які хочаце замацаваць.\n\n3. Краніце Агляд.\n\n4. Правядзіце пальцам уверх і краніце значок замацавання."</string>
-    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Запытваць узор разблакіроўкі перад адмацаваннем"</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Запытваць графічны ключ разблакіроўкі перад адмацаваннем"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Запытваць PIN-код перад адмацаваннем"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Запытваць пароль перад адмацаваннем"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Заблакіраваць прыладу падчас адмацавання"</string>
@@ -2746,20 +2695,20 @@
     <string name="imei_information_title" msgid="8499085421609752290">"Інфармацыя IMEI"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Бяспечны запуск"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Далей"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Вы можаце абараніць гэту прыладу яшчэ надзейней, задаўшы ўвод PIN-кода пры яе запуску. Пакуль прылада не запусціцца, яна не будзе прымаць выклікі, паведамленні або апавяшчэнні, а таксама на ёй не будуць працаваць функцыі будзільніка. \n\nГэта дапамагае абараніць даныя у выпадку страты ці крадзяжу прылады."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Вы можаце абараніць гэту прыладу яшчэ надзейней, задаўшы ўвод графічнага ключа пры яе запуску. Пакуль прылада не запусціцца, яна не будзе прымаць выклікі, паведамленні або апавяшчэнні, а таксама на ёй не будуць працаваць функцыі будзільніка. \n\nГэта дапамагае абараніць даныя у выпадку страты ці крадзяжу прылады."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Вы можаце абараніць гэту прыладу яшчэ надзейней, задаўшы ўвод пароля пры яе запуску. Пакуль прылада не запусціцца, яна не будзе прымаць выклікі, паведамленні або апавяшчэнні, а таксама на ёй не будуць працаваць функцыі будзільніка. \n\nГэта дапамагае абараніць даныя у выпадку страты ці крадзяжу прылады."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"У дадатак да выкарыстання адбітка пальца для разблакіроўкі прылады, вы можаце абараніць гэту прыладу яшчэ надзейней, задаўшы ўвод PIN-кода пры яе запуску. Пакуль прылада не запусціцца, яна не будзе прымаць выклікі, паведамленні або апавяшчэнні, а таксама на ёй не будуць працаваць функцыі будзільніка. \n\nГэта дапамагае абараніць даныя у выпадку страты ці крадзяжу прылады."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"У дадатак да выкарыстання адбітка пальца для разблакіроўкі прылады, вы можаце абараніць гэту прыладу яшчэ надзейней, задаўшы ўвод узору пры яе запуску. Пакуль прылада не запусціцца, яна не будзе прымаць выклікі, паведамленні або апавяшчэнні, а таксама на ёй не будуць працаваць функцыі будзільніка. \n\nГэта дапамагае абараніць даныя у выпадку страты ці крадзяжу прылады."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"У дадатак да выкарыстання адбітка пальца для разблакіроўкі прылады, вы можаце абараніць гэту прыладу яшчэ надзейней, задаўшы ўвод пароля пры яе запуску. Пакуль прылада не запусціцца, яна не будзе прымаць выклікі, паведамленні або апавяшчэнні, а таксама на ёй не будуць працаваць функцыі будзільніка. \n\nГэта дапамагае абараніць даныя у выпадку страты ці крадзяжу прылады."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Патрабаваць PIN-код пры запуску прылады"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Патрабаваць узор для запуску прылады"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Патрабаваць пароль для запуску прылады"</string>
+    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Вы можаце абараніць сваю прыладу яшчэ надзейней, наладзіўшы функцыю патрабавання PIN-кода пры загрузцы. Пакуль прылада не загружана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка. \n\nГэта дапамагае абараніць даныя на страчаных або скрадзеных прыладах."</string>
+    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Вы можаце абараніць сваю прыладу яшчэ надзейней, наладзіўшы функцыю патрабавання ўводу графічнага ключа пры загрузцы. Пакуль прылада не загружана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка. \n\nГэта дапамагае абараніць даныя на страчаных або скрадзеных прыладах."</string>
+    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Вы можаце абараніць сваю прыладу яшчэ надзейней, наладзіўшы функцыю патрабавання паролю пры загрузцы. Пакуль прылада не загружана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка. \n\nГэта дапамагае абараніць даныя на страчаных або скрадзеных прыладах."</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"У дадатак да выкарыстання адбітка пальца для разблакіроўкі прылады, вы можаце абараніць сваю прыладу, наладзіўшы функцыю патрабавання PIN-кода пры загрузцы. Пакуль прылада не загружана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка.\n\nГэта дапамагае абараніць даныя на страчаных або скрадзеных прыладах."</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"У дадатак да выкарыстання адбітка пальца для разблакіроўкі прылады, вы можаце абараніць сваю прыладу, наладзіўшы функцыю патрабавання ўводу графічнага ключа пры загрузцы. Пакуль прылада не загружана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка.\n\nГэта дапамагае абараніць даныя на страчаных або скрадзеных прыладах."</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"У дадатак да выкарыстання адбітка пальца для разблакіроўкі прылады, вы можаце абараніць сваю прыладу, наладзіўшы функцыю патрабавання паролю пры загрузцы. Пакуль прылада не загружана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка.\n\nГэта дапамагае абараніць даныя на страчаных або скрадзеных прыладах."</string>
+    <string name="encrypt_require_pin" msgid="2063945047845243752">"Для загрузкі прылады патрабуецца PIN-код"</string>
+    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Для загрузкі прылады патрабуецца графічны ключ"</string>
+    <string name="encrypt_require_password" msgid="8770628366276570518">"Для загрузкі прылады патрабуецца пароль"</string>
     <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Не, дзякуй"</string>
     <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Не, дзякуй"</string>
     <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Не, дзякуй"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Запытваць PIN-код?"</string>
-    <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Патрабаваць узор?"</string>
+    <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Патрабаваць графічны ключ?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Запытваць пароль?"</string>
     <string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Калі вы ўводзіце свой PIN-код для загрузкі прылады, службы доступу, такія як <xliff:g id="SERVICE">%1$s</xliff:g>, яшчэ не будуць даступнымі."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Калі вы ўводзіце свой графічны ключ для загрузкі прылады, службы доступу, такія як <xliff:g id="SERVICE">%1$s</xliff:g>, яшчэ не будуць даступнымі."</string>
@@ -2779,7 +2728,7 @@
     <string name="storage_type_external" msgid="8928374515368986503">"знешняя памяць"</string>
     <string name="storage_type_internal" msgid="6042049833565674948">"Унутранае сховішча"</string>
     <string name="storage_type_external" msgid="7738894330670001898">"Знешняе сховішча"</string>
-    <string name="app_data_usage" msgid="7942375313697452803">"Трафік праграм"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Выкарыстанне даных дадаткам"</string>
     <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> выкарыстана з <xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="storage_used" msgid="7128074132917008743">"Сховішча для выкарыстання"</string>
     <string name="change" msgid="6657848623929839991">"Змяніць"</string>
@@ -2792,7 +2741,6 @@
     <string name="notifications_hidden" msgid="3619610536038757468">"Не паказваецца на экране блакіроўкі"</string>
     <string name="notifications_priority" msgid="1066342037602085552">"Рэжым «Не турбаваць» ігнаруецца"</string>
     <string name="notifications_summary_divider" msgid="9013807608804041387">" / "</string>
-    <string name="notification_summary_level" msgid="2726571692704140826">"Узровень %d"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> дазвол атрыманы</item>
       <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> дазволы атрыманыя</item>
@@ -2813,13 +2761,13 @@
     </plurals>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Няма дазволаў"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Няма запытаў дазволаў"</string>
-    <string name="filter_all_apps" msgid="1988403195820688644">"Усе праграмы"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Усе дадаткі"</string>
     <string name="filter_enabled_apps" msgid="3318021007093070639">"Уключаныя"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Персанальныя"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Працоўныя"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Заблакiраваныя"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"З URL дамена"</string>
-    <string name="filter_notif_priority_apps" msgid="5056470299318500609">"Ігнаруюць рэжым «Не турбаваць»"</string>
+    <string name="filter_notif_priority_apps" msgid="5056470299318500609">"Ігнаруе рэжым «Не турбаваць»"</string>
     <string name="filter_notif_sensitive_apps" msgid="3847012996691991486">"Не пак.сакр.змесц.на экр.блак."</string>
     <string name="filter_notif_hide_notifications_apps" msgid="3977513041080404368">"Зусім не паказ.на экране блак."</string>
     <string name="filter_notif_silent" msgid="8533960664617048281">"Паказваюцца бязгучна"</string>
@@ -2859,7 +2807,7 @@
     <string name="default_browser_title" msgid="8101772675085814670">"Дадатак-браўзер"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"Няма браўзера па змаўчанні"</string>
     <string name="default_phone_title" msgid="282005908059637350">"Дадатак для выклікаў"</string>
-    <string name="default_app" msgid="6864503001385843060">"(Стандартная)"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Па змаўчанні)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Сістэмныя)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Стандартныя сістэмныя)"</string>
     <string name="apps_storage" msgid="4353308027210435513">"Памяць дадаткаў"</string>
@@ -2910,7 +2858,8 @@
     <string name="usb_use_power_only_desc" msgid="4912352581010190141">"Забяспечваць сілкаванне іншай падключанай прылады"</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Перадаваць файлы"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Перадача файлаў на іншую прыладу"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Перадача фатаграфій (PTP)"</string>
+    <!-- no translation found for usb_use_photo_transfers (7794775645350330454) -->
+    <skip />
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Перадача фатаграфій або файлаў, калі МТР не падтрымліваецца (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"Выкарыстоўваць прыладу ў якасці MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Выкарыстоўваць гэту прыладу ў якасці MIDI"</string>
@@ -2918,9 +2867,9 @@
     <string name="background_check_pref" msgid="7550258400138010979">"Фонавая праверка"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Поўны доступ у фоне"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Выкарыстоўваць тэкст з экрана"</string>
-    <string name="assist_access_context_summary" msgid="1991421283142279560">"Дазволіць праграме-памочніку доступ да змесціва на экране ў выглядзе тэксту"</string>
+    <string name="assist_access_context_summary" msgid="1991421283142279560">"Адкрыць дадатку-памочніку доступ да змесціва на экране ў выглядзе тэксту"</string>
     <string name="assist_access_screenshot_title" msgid="4034721336291215819">"Выкарыстоўваць скрыншот"</string>
-    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"Дазволіць праграме-памочніку доступ да відарыса на экране"</string>
+    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"Даць дадатку-памочніку доступ да выявы на экране"</string>
     <string name="assist_footer" msgid="1982791172085896864">"Дадаткі-памочнікі могуць дапамагаць вам на аснове інфармацыі з экрана, які вы праглядаеце. Пэўныя дадаткі падтрымліваюць як службы запуску, так і службы галасавога ўводу, каб забяспечыць вам комплексную дапамогу."</string>
     <string name="average_memory_use" msgid="829566450150198512">"Сяр. знач. выкарыстання памяці"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"Максімальнае выкарыст. памяці"</string>
@@ -2947,7 +2896,6 @@
     <string name="no_data_usage" msgid="9131454024293628063">"Даныя не выкарыстоўваюцца"</string>
     <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Адкрыць доступ да рэжыму «Не турбаваць» для <xliff:g id="APP">%1$s</xliff:g>?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Дадатак зможа уключаць/выключаць рэжым «Не турбаваць» і змяняць звязаныя з ім налады."</string>
-    <string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Павінен заставацца ўключаным, таму што ўключаны доступ да апавяшчэнняў"</string>
     <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Адклікаць доступ да рэжыму «Не турбаваць» для <xliff:g id="APP">%1$s</xliff:g>?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Усе правілы рэжыму «Не турбаваць», створаныя гэтай праграмай, будуць выдалены."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Не аптымізаваць"</string>
@@ -2961,9 +2909,9 @@
     <string name="draw_overlay_title" msgid="4003905926278954971">"Дадаткі з прыярытэтам перад іншымі"</string>
     <string name="draw_overlay" msgid="9078696044299199938">"Прыярытэт перад інш. дад-камі"</string>
     <string name="system_alert_window_settings" msgid="1757821151143694951">"Прыярытэт перад іншымі дадаткамі"</string>
-    <string name="system_alert_window_apps_title" msgid="7005760279028569491">"Праграмы"</string>
+    <string name="system_alert_window_apps_title" msgid="7005760279028569491">"Дадаткі"</string>
     <string name="system_alert_window_access_title" msgid="8811695381437304132">"Прыярытэт перад іншымі дадаткамі"</string>
-    <string name="permit_draw_overlay" msgid="6606018549732046201">"Дазволіць адлюстраванне паверх іншых праграм"</string>
+    <string name="permit_draw_overlay" msgid="6606018549732046201">"Дазволіць адлюстроўваць паверх іншых дадаткаў"</string>
     <string name="app_overlay_permission_preference" msgid="8355410276571387439">"Дазвол адлюстроўваць дадатак зверху"</string>
     <string name="allow_overlay_description" msgid="7895191337585827691">"Дадатак з гэтым дазволам можа адлюстроўвацца паверх іншых дадаткаў, якія вы выкарыстоўваеце, і можа перашкодзіць выкарыстанню інтэрфейсу ў іншых дадатках або змяніць тое, што вы бачыце ў іншых дадатках."</string>
     <string name="keywords_vr_listener" msgid="7441221822576384680">"vr віртуальная рэальнасць сродак праслухоўвання стэрэа служба-памочнік"</string>
@@ -2992,15 +2940,15 @@
     <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Павелічэнне або памяншэнне элементаў на экране"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"шчыльнасць дысплэя, маштаб экрана, маштаб, маштабаванне"</string>
     <string name="screen_zoom_summary" msgid="6445488991799015407">"Павелічэнне або памяншэнне элементаў на экране. Становішча некаторых праграм на вашым экране можа змяніцца."</string>
-    <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Перадпрагляд"</string>
+    <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Папярэдні прагляд"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Паменшыць"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Павялічыць"</string>
     <string name="screen_zoom_conversation_icon_alex" msgid="8443032489384985820">"A"</string>
     <string name="screen_zoom_conversation_icon_pete" msgid="998709701837681129">"П"</string>
-    <string name="screen_zoom_conversation_message_1" msgid="6546951024984852686">"Здароў, Пятро!"</string>
-    <string name="screen_zoom_conversation_message_2" msgid="6935424214137738647">"І табе не хварэць. Пайшлі на каву?"</string>
-    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"О, я якраз знаю адну добрую кавярню непадалёк."</string>
-    <string name="screen_zoom_conversation_message_4" msgid="5564676794767555447">"Цудоўненька!"</string>
+    <string name="screen_zoom_conversation_message_1" msgid="6546951024984852686">"Прывітанне, Пётр!"</string>
+    <string name="screen_zoom_conversation_message_2" msgid="6935424214137738647">"Эй, хочаш пабалбатаць сёння за чашачкай кавы?"</string>
+    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"Гучыць нядрэнна. Я ведаю адно добрае месца недалёка адсюль."</string>
+    <string name="screen_zoom_conversation_message_4" msgid="5564676794767555447">"Выдатна!"</string>
     <string name="screen_zoom_conversation_timestamp_1" msgid="7453710416319650556">"Аўторак, 18:00"</string>
     <string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"Аўторак, 18:01"</string>
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"Аўторак, 18:02"</string>
@@ -3008,7 +2956,7 @@
     <string name="see_all" msgid="8883901630052886984">"Прагледзець усё"</string>
     <string name="see_less" msgid="1250265310929558370">"Паказаць менш"</string>
     <string name="disconnected" msgid="5787956818111197212">"Адлучана"</string>
-    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> трафіку выкарыстана"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> даных выкарыстана"</string>
     <plurals name="notification_summary" formatted="false" msgid="4019451362120557382">
       <item quantity="one">Адпраўка заблакіравана ў <xliff:g id="COUNT_1">%d</xliff:g> праграме</item>
       <item quantity="few">Адпраўка заблакіравана ў <xliff:g id="COUNT_1">%d</xliff:g> праграмах</item>
@@ -3024,7 +2972,7 @@
     <string name="memory_summary" msgid="8080825904671961872">"У сярэднім <xliff:g id="USED_MEMORY">%1$s</xliff:g> з <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> памяці выкарыстана"</string>
     <string name="user_summary" msgid="1617826998097722499">"Выкананы ўваход як <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> з\'яўляецца стандартнай праграмай"</string>
-    <string name="location_on_summary" msgid="5127631544018313587">"УКЛ. / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+    <string name="location_on_summary" msgid="5127631544018313587">"У РЭЖЫМЕ / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
     <string name="location_off_summary" msgid="6474350053215707957">"ВЫКЛ."</string>
     <string name="backup_disabled" msgid="485189128759595412">"Рэзервовае капіраванне адключана"</string>
     <string name="about_summary" msgid="8460677224778433924">"Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
@@ -3036,8 +2984,6 @@
     <string name="admin_device_owner_message" msgid="8734500370023898028">"Ваш адміністратар можа адсочваць праграмы і даныя, звязаныя з гэтай прыладай, у тым ліку пра налады, дазволы, карпаратыўны доступ, сеткавую актыўнасць і месцазнаходжанне прылады, і кіраваць імі."</string>
     <string name="condition_turn_off" msgid="1960945836880080298">"Выключыць"</string>
     <string name="condition_turn_on" msgid="9089876276117874591">"Уключыць"</string>
-    <string name="condition_expand_show" msgid="608202020023489939">"Паказаць"</string>
-    <string name="condition_expand_hide" msgid="948507739223760667">"Схаваць"</string>
     <string name="condition_hotspot_title" msgid="7778958849468560027">"Хот-спот уключаны"</string>
     <string name="condition_hotspot_summary" msgid="3433182779269409683">"Партатыўны хот-спот Wi-Fi <xliff:g id="ID_1">%1$s</xliff:g> даступны, Wi-Fi для гэтай прылады выключаны."</string>
     <string name="condition_airplane_title" msgid="287356299107070503">"Рэжым палёту ўключаны"</string>
@@ -3072,33 +3018,31 @@
     <string name="billing_cycle_summary" msgid="9009106526129293752">"Штомесячны цыкл пачынаецца <xliff:g id="ID_1">%1$s</xliff:g> кожнага месяца"</string>
     <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Штомесячна пачынаючы з <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Сеткавыя абмежаванні"</string>
-    <string name="operator_warning" msgid="1862988028996859195">"Улік даных аператара можа адрознівацца ад уліку прылады"</string>
+    <string name="operator_warning" msgid="7206980278353372811">"Улік даных аператара можа адрознівацца ад уліку вашай прылады."</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> выкарыстана"</string>
     <string name="data_warning" msgid="209133958008062117">"Папярэджанне пра трафік"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Задаць ліміт трафіку"</string>
     <string name="data_limit" msgid="1885406964934590552">"Ліміт трафіку"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> выкарыстана ў перыяд <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Наладзіць"</string>
-    <string name="data_usage_other_apps" msgid="3272872663517382050">"Іншыя праграмы, уключаныя ў выкарыстанне даных"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <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="data_saver_title" msgid="398458827917495765">"Эканомія трафіку"</string>
+    <string name="data_saver_title" msgid="8034286939200289826">"Эканомія трафіку"</string>
     <string name="unrestricted_data_saver" msgid="7019858887510062789">"Неабмежаваны доступ да даных"</string>
-    <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Фонавая перадача даных выключана"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Уключана"</string>
-    <string name="data_saver_off" msgid="6892309031162738794">"Выключана"</string>
-    <string name="unrestricted_app_title" msgid="4465437191723332066">"Неабмежаваная перадача даных"</string>
-    <string name="unrestricted_app_summary" msgid="6458008993501723912">"Не абмяжоўваць перадачу даных пры ўключанай Эканоміі трафіку"</string>
+    <string name="data_saver_off" msgid="6892309031162738794">"Адключана"</string>
+    <string name="unrestricted_app_title" msgid="4465437191723332066">"Неабмежав. выкарыстанне даных"</string>
+    <string name="unrestricted_app_summary" msgid="6458008993501723912">"Дазв. неабм. доступ да даных, калі ўкл. Экан. трафіку"</string>
     <string name="home_app" msgid="4066188520886810030">"Праграма Галоўнай старонкі"</string>
     <string name="no_default_home" msgid="7184117487704520238">"Няма стандартнай Галоўнай старонкі"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"Бяспечны запуск"</string>
-    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"Патрабаваць узор для запуску прылады. У час, калі прылада адключана, на ёй нельга прымаць выклікі, паведамленні, апавяшчэнні і не працуе функцыя будзільніка."</string>
-    <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"Патрабаваць PIN-код для запуску прылады. У час, калі прылада адключана, на ёй нельга прымаць выклікі, паведамленні, апавяшчэнні і не працуе функцыя будзільніка."</string>
-    <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"Патрабаваць пароль для запуску прылады. У час, калі прылада адключана, на ёй нельга прымаць выклікі, паведамленні, апавяшчэнні і не працуе функцыя будзільніка."</string>
+    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"Запытваць графічны ключ для запуску прылады. У час, калі прылада адключана, на ёй нельга прымаць выклікі, паведамленні, апавяшчэнні і не працуе функцыя будзільніка."</string>
+    <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"Запытваць PIN-код для запуску прылады. У час, калі прылада адключана, на ёй нельга прымаць выклікі, паведамленні, апавяшчэнні і не працуе функцыя будзільніка."</string>
+    <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"Запытваць пароль для запуску прылады. У час, калі прылада адключана, на ёй нельга прымаць выклікі, паведамленні, апавяшчэнні і не працуе функцыя будзільніка."</string>
     <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Дадаць яшчэ адзін адбітак"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="2298186278816316599">"Разблакіроўка з дапамогай іншага адбітка"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"Укл. / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -3136,8 +3080,6 @@
     <string name="notification_log_details_vibrate" msgid="6890065466625335940">"вібрацыя"</string>
     <string name="notification_log_details_default" msgid="2345249399796730861">"стандартна"</string>
     <string name="notification_log_details_none" msgid="184131801230614059">"няма"</string>
-    <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Аб\'ект ранжыравання адсутнічае."</string>
-    <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Аб\'ект ранжыравання не ўтрымлівае гэты сімвал."</string>
     <string name="special_access" msgid="8275242424094109976">"Спецыяльны доступ"</string>
     <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"Вы сапраўды хочаце сцерці карыстальніцкія даныя і перайсці на шыфраванне файлаў?"</string>
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Сцерці і перайсці..."</string>
@@ -3146,21 +3088,12 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Скінуць лічыльнікі абмежавання частаты ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Кіраванне апавяшчэннямі экрана блакір."</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Паказваць ці хаваць змесціва апавяшчэнняў"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> пікселяў, не залежных ад шчыльнасці"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Найменшая шырыня"</string>
-    <string name="premium_sms_none" msgid="8268105565738040566">"Запыты ад усталяваных праграм на прэміум SMS-доступ не паступалі"</string>
-    <string name="premium_sms_warning" msgid="9086859595338944882">"За прэміум SMS-доступ з вас можа спаганяцца аплата, гэта можа павялічыць вашыя рахункі за паслугі аператара. Калі вы ўключыце дазвол для праграмы, вы будзеце мець магчымасць адпраўляць прэміум SMS з гэтай праграмы."</string>
-    <string name="premium_sms_access" msgid="4660047004791638305">"Прэміум SMS-доступ"</string>
-    <string name="bluetooth_disabled" msgid="1558295505487648234">"Адключана"</string>
-    <string name="demo_mode" msgid="2655748420527206870">"Дэманстрацыйны рэжым"</string>
-    <string name="managed_profile_settings_title" msgid="2729481936758125054">"Налады працоўнага профілю"</string>
-    <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Пошук кантактаў"</string>
-    <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Дазволіць вашай арганізацыі пошук кантактаў, каб вызначаць абанентаў і кантакты"</string>
-    <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Камп\'ютар"</string>
-    <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Гарнітура"</string>
-    <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Тэлефон"</string>
-    <string name="bluetooth_talkback_imaging" msgid="551146170554589119">"Прылада апрацоўкі відарысаў"</string>
-    <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Навушнікі"</string>
-    <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Перыферыйная прылада ўводу"</string>
-    <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 87265bb..e0519cf 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"розово"</item>
     <item msgid="6131821495505931173">"червено"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"На повече от 30 дни"</item>
+    <item msgid="2900554746706302178">"На повече от 60 дни"</item>
+    <item msgid="5692284879054004388">"На повече от 90 дни"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-bg/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-bg/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-bg/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index b86cee5..cf60522 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Активиране на връзката за данни"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Деактивиране на връзката за данни"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Обезпечено за VoLTE"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Видеообажданията са обезпечени"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Обажданията през Wi-Fi са обезпечени"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Мощност на клетъчното радио"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Преглед на указателя на SIM картата"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Преглед на фиксирани номера за набиране"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Отключване с отпечатък"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Трябва само да докоснете сензора за отпечатъци, за да отключите телефона си, да оторизирате покупка или да влезете в приложение. Внимавайте чии отпечатъци добавяте – с всеки един от тях ще могат да се извършват изброените действия.\n\nЗабележка: Отпечатъкът ви може да е по-малко сигурен в сравнение с надеждна фигура или ПИН код. "<annotation id="url">"Научете повече"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Трябва само да докоснете сензора за отпечатъци, за да отключите телефона си, да оторизирате покупки или да влизате в приложения. Внимавайте чии отпечатъци добавяте – с всеки един от тях ще могат да се извършват изброените действия.\n\nЗабележка: Отпечатъкът ви може да е по-малко сигурен в сравнение с надеждна фигура или ПИН код."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Отказ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Напред"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Пропускане"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Изтриване"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Да започваме!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Поставете пръста си върху сензора и го вдигнете, след като усетите вибриране"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Отлично! Сега повторете"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Продължавайте"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Движете пръста си леко, за да добавите всички различни части от отпечатъка си"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Отпечатъкът е добавен!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Когато видите тази икона, можете да използвате отпечатъка си за идентификация или за оторизиране на покупка."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Трябва само да докоснете сензора за отпечатъци, за да „събудите“ и отключите устройството си."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Когато видите тази икона, можете да използвате отпечатъка си."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Когато видите тази икона, можете също да оторизирате покупки или да влизате в приложения."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Пропуск. на настройването на отпечатък?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Избрахте да използвате отпечатъка си като един от начините за отключване на телефона си. Ако пропуснете сега, ще трябва да настроите по-късно. Настройването отнема около минута."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Заключване на екрана: Настройване"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Когато функцията за обаждания през Wi-Fi е включена, телефонът ви може да маршрутизира обажданията през Wi-Fi мрежи или мрежата на оператора ви в зависимост от предпочитанието ви и от това, кой сигнал е по-силен. Преди да включите тази функция, потърсете от оператора си информация относно таксите и други подробности."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"Актуализиране на адреса за спешни случаи"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Адресът, който спешните служби ще използват като ваше местоположение, ако се обадите на 112 посредством 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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Забравяне"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Настройване"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Разглеждане"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Освобождаване на място"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Управление на хранилището"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB връзка с компютър"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Свързване като"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Мултимедийно устройство (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Аудио"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Кеширани данни"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Други"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Система"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g>: Разглеждане"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Категорията „Други“ включва споделените файлове, запазени от приложенията, файловете, изтеглени от интернет или през Bluetooth, тези на Android и др.\n\nЗа да видите цялото съдържание на това хранилище (<xliff:g id="NAME">^1</xliff:g>), докоснете „Разглеждане“."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Системата включва файлове, използвани вътрешно от операционната система Android. \n\nТе не могат да се преглеждат поотделно."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Потребителят <xliff:g id="USER_0">^1</xliff:g> може да е запазил снимки, музика, филми, приложения или други данни, които заемат <xliff:g id="SIZE">^2</xliff:g> от хранилището. \n\nЗа да прегледате подробностите, превключете към <xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Правна информация"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Сътрудници"</string>
     <string name="manual" msgid="3025943393642974445">"Ръководство"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Регулативна информация"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Регулативни етикети"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Инф. за безопасността и норм. изисквания"</string>
     <string name="copyright_title" msgid="865906688917260647">"Авторски права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лиценз"</string>
     <string name="terms_title" msgid="7697580845616764642">"Общи условия"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Винаги включена VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Няма добавени виртуални частни мрежи (VPN)."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Режимът „Винаги включено“ е активен"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Не се поддържа от това приложение"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Изберете потребителски профил за виртуална частна мрежа (VPN), за да останете винаги свързани с нея. Мрежовият трафик ще бъде разрешен само при връзка с тази VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Няма"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Винаги включената виртуална частна мрежа (VPN) изисква IP адрес както за сървъра, така и за DNS."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"отключване чрез плъзгане, парола, фигура, ПИН код"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"служебно предизвикателство, работа, потребителски профил"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"служебен потребителски профил, управляван потребителски профил, обединение, обединяване, работа, потребителски профил"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"жест"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Маркер за КБП за Wi-Fi: Настр."</string>
     <string name="write_tag" msgid="8571858602896222537">"Записване"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"За записване докоснете маркер..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Данните на заден план са налице само през Wi-Fi. Липсата на такава мрежа може да засегне някои приложения или услуги."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Служ. потр. профил е изключен"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Приложенията, синхронизирането на заден план и другите функции, свързани със служебния ви потребителски профил, са изключени."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Предложения (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Предложения"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Премахване"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Студена цветова гама"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Използване на по-студени цветове за дисплея"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Да се нулират ли броячите за ограничаване на скоростта в ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Известия на заключения екран: Управление"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Показване или скриване на съдържанието на известията"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Всички"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Поддръжка"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Най-малката ширина"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Няма инсталирани приложения, които са заявили достъп до SMS съобщения, за които се таксува получателят"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Достъп до SMS съобщения, за които се таксува получателят"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Деактивирано"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Демонстрационен режим"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Тук сме, за да помогнем"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"На линия сме денонощно 7 дни в седмицата"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Екипът ни за поддръжка е тук, за да помогне с решаването на каквито и да било проблеми"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Екипът ни за поддръжка е на линия денонощно всеки ден"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Работно време на екипа за поддръжка по телефона (местно време)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Потърсете помощ или разгледайте съветите и похватите"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Поддръжка за:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> – <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Ще пътувате в чужбина?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Може да бъдете таксувани по международните тарифи"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Телефон"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Чат"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Разглеждане на съветите и похватите"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Търсене на помощ и изпращане на отзиви"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Влезте в профила си, за да се свържете с екипа за поддръжка"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Вход"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Нямате достъп до профила си?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Изпращане на системна информация"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"За да ви помогнем да решите бързо проблема си, се нуждаем от системна информация за диагностика."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Да не се показва отново"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Настройки за служебния потребителски профил"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Търсене на контакт"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Разрешете търсене на контакти от организацията ви с цел идентифициране на обаждащите се и контактите"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> часа</item>
+      <item quantity="one">1 час</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> минути</item>
+      <item quantity="one">1 минута</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> секунди</item>
+      <item quantity="one">1 секунда</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Време за изчакване: ~ <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Компютър"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Слушалки"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Телефон"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Слушалки"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Периферен вход"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"За да ви помогне да освободите място за съхранение, мениджърът на хранилището премахва от устройството ви резервните копия на снимки и видеоклипове."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Премахване на снимките и видеоклиповете"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Мениджър на хранилището"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Автоматично"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Ръчни"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Жестове"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Бързо отваряне на камерата"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"За да отворите бързо камерата, трябва само да докоснете двукратно бутона за захранване. Функцията работи на всеки екран."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Превключване на камерата със завъртане"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"За да превключите между предната и задната камера, завъртете устройството два пъти."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Бърза проверка на екрана"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Раздвижете или повдигнете телефона си, за да го проверите, без да излизате напълно от спящия режим."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Преглед на известията с прекарване на пръст"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"За да проверите известията си от който и да е екран, прекарайте пръст надолу през сензора за отпечатъци."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Вкл."</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Изкл."</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Програмата за зареждане на опер. с-ма вече е отключена"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Първо, се свържете с интернет"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Не е налице на заключени към оператор устройства"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-bn-rBD/arrays.xml b/res/values-bn-rBD/arrays.xml
index 8ad540c..d4d4d93 100644
--- a/res/values-bn-rBD/arrays.xml
+++ b/res/values-bn-rBD/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"গোলাপী"</item>
     <item msgid="6131821495505931173">"লাল"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"৩০ দিনের বেশি পুরানো"</item>
+    <item msgid="2900554746706302178">"৬০ দিনের বেশি পুরানো"</item>
+    <item msgid="5692284879054004388">"৯০ দিনের বেশি পুরানো"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-bn-rBD/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-bn-rBD/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-bn-rBD/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 61fbab2..6010de8 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"ডেটা সংযোগ সক্রিয় আছে"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ডেটা সংযোগ নিষ্ক্রিয় আছে"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE প্রস্তুত"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"ভিডিও কলিং এর ব্যবস্থা আছে"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi কলিং এর ব্যবস্থা আছে"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"সেলুলার রেডিও পাওয়ার"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM ঠিকানা বই দেখুন"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"স্থায়ী ডায়াল নম্বরগুলি দেখুন"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"আঙ্গুলের ছাপ দিয়ে আনলক করুন"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"আপনার ফোন আনলক করতে, কেনাকাটা অনুমোদন, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করুন করতে শুধু আঙ্গুলের ছাপ নেওয়ার সেন্সরে স্পর্শ করুন৷ আপনি কাদের আঙ্গুলের ছাপ যোগ করছেন সেই বিষয়ে সতর্ক থাকুন৷ এমনকি যাদের আঙ্গুলের ছাপ যোগ করা হবে তারা এই জিনিসগুলি করতে পারবে।\n\nদ্রষ্টব্য: আপনার আঙ্গুলের ছাপ একটি জটিল প্যাটার্ন বা পিন এর চাইতে কম নিরাপদ হতে পারে। "<annotation id="url">"আরো জানুন"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"আপনার ফোন আনলক করতে, কেনাকাটা অনুমোদন, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করুন করতে শুধু আঙ্গুলের ছাপ নেওয়ার সেন্সরে স্পর্শ করুন৷ আপনি কাদের আঙ্গুলের ছাপ যোগ করছেন সেই বিষয়ে সতর্ক থাকুন৷ এমনকি যাদের আঙ্গুলের ছাপ যোগ করা হবে তারা এই জিনিসগুলি করতে পারবে।\n\nদ্রষ্টব্য: আপনার আঙ্গুলের ছাপ একটি জটিল প্যাটার্ন বা PIN এর চাইতে কম নিরাপদ হতে পারে।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"বাতিল করুন"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"চালিয়ে যান"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"এড়িয়ে যান"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"মুছুন"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"এখন শুরু করা যাক!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"সেন্সরে আপনার আঙ্গুল রাখুন এবং আপনি একটি কম্পন অনুভব করার পর সরিয়ে নিন"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"দারুন! এখন আবার করুন"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"করতে থাকুন"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"আপনার আঙ্গুলের ছাপের সমস্ত অংশগুলি যোগ করতে আপনার আঙ্গুল সামান্য সরান"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"আঙ্গুলের ছাপ যোগ করা হয়েছে!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"যখন আপনি এই আইকন দেখতে পাবেন তখনই আপনি সনাক্ত করার জন্য অথবা একটি ক্রয় করার জন্য আপনার আঙ্গুলের ছাপ ব্যবহার করতে পারেন৷"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"আপনার ডিভাইসকে জাগাতে এবং আনলক করতে শুধুমাত্র আঙ্গুলের ছাপ সেন্সরে স্পর্শ করুন৷"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"আপনি যখন এই আইকন দেখতে পাবেন তখনই আপনার আঙ্গুলের ছাপ ব্যবহার করতে পারেন৷"</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"আপনি যখন এই আইকনটি দেখতে পান, তখন আপনি কেনাকাটাগুলিতে অনুমোদন এবং অ্যাপ্লিকেশানগুলিতে প্রবেশ করুন করতে পারবেন৷"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"আঙ্গুলের ছাপ সেট আপ করা এড়িয়ে যাবেন?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"আপনি আপনার ফোন আনলক করার একটি উপায় হিসেবে আপনার আঙ্গুলের ছাপ ব্যবহারের ব্যবস্থাটিকে বেছে নিয়েছেন। আপনি যদি এখনই এটিকে এড়িয়ে যান, তাহলে আপনাকে পরে আবার এটি সেট আপ করতে হবে। সেট আপ করতে মাত্র এক মিনিট এর মত সময় লাগতে পারে।"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"স্ক্রীন লক সেট আপ করুন"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"১"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"ওয়াই-ফাই কলিং চালু থাকার সময়ে, আপনার পছন্দ এবং কোন সিগন্যাল বেশী শক্তিশালী তার উপর নির্ভর করে আপনার ফোন ওয়াই-ফাই নেটওয়ার্ক বা আপনার পরিষেবা প্রদানকারীর নেটওয়ার্কের মাধ্যমে আপনার কলের রুট তৈরি করে। এই বৈশিষ্ট্যটি চালু করার আগে, আপনার পরিষেবা প্রদানকারীর কাছে ফি-গুলি এবং অন্যান্য বিশদ বিবরণ সম্বন্ধে পরীক্ষা করুন।"</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"জরুরী ঠিকানা আপডেট করুন"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"আপনি যদি WiFi ব্যবহার করে ৯১১ এ কল করেন তাহলে জরুরি পরিষেবাগুলি  আপনার অবস্থান হিসাবে আপনার ঠিকানাকে ব্যবহার করে৷"</string>
     <string name="home_settings" msgid="212375129455718176">"হোম"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"প্রদর্শন"</string>
     <string name="sound_settings" msgid="5534671337768745343">"আওয়াজ"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"ভুলে যান"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"সেট আপ করুন"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"ঘুরে দেখুন"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"সঞ্চয়স্থান খালি করুন"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"সঞ্চয়স্থান পরিচালনা করুন"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB কম্পিউটার সংযোগ"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"হিসাবে সংযুক্ত করুন"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"মিডিয়া ডিভাইস (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"অডিও"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"ক্যাশে করা ডেটা"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"অন্যান্য"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"সিস্টেম"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> এক্সপ্লোর করুন"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"অন্যগুলির মধ্যে অন্তর্ভুক্ত রয়েছে, অ্যাপ্লিকেশানগুলির দ্বারা সংরক্ষিত ভাগ করা ফাইল, ইন্টারনেট বা ব্লুটুথ থেকে ডাউনলোড করা ফাইল, Android ফাইল এবং এই ধরণের আরো অনেক কিছু৷ \n\n<xliff:g id="NAME">^1</xliff:g> এর সমস্ত সামগ্রী দেখতে, \'ঘুরে দেখুন\' এ আলতো চাপুন৷"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Android অপারেটিং সিস্টেম দ্বারা অভ্যন্তরীণভাবে ব্যবহৃত ফাইলগুলি সিস্টেমে অন্তর্ভুক্ত রয়েছে৷ \n\nএই ফাইলগুলিকে পৃথকভাবে দেখা যাবে না৷"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> এর হয়তো সংরক্ষিত ফটো, সঙ্গীত, চলচ্চিত্র, অ্যাপ্লিকেশান বা অন্যান্য ডেটা যা <xliff:g id="SIZE">^2</xliff:g> সঞ্চয়স্থান নিয়েছে। \n\nবিশদ বিবরণ দেখতে, <xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"আইনি তথ্য"</string>
     <string name="contributors_title" msgid="5917703088825286504">"প্রদায়কগণ"</string>
     <string name="manual" msgid="3025943393642974445">"ম্যানুয়াল"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"রেগুলেটরি তথ্য"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"রেগুলেটরি লেবেল"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"নিরাপত্তা ও রেগুলেটরি তথ্য"</string>
     <string name="copyright_title" msgid="865906688917260647">"কপিরাইট"</string>
     <string name="license_title" msgid="1990487604356037871">"লাইসেন্স"</string>
     <string name="terms_title" msgid="7697580845616764642">"চুক্তি এবং শর্তাবলী"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"সর্বদা-চালু VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"কোনো VPN যোগ করা হয়নি৷"</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"সর্বদা সক্রিয়"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"এই অ্যাপ্লিকেশানটি দ্বারা সমর্থিত নয়"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"সর্বদা সংযুক্ত থাকতে একটি VPN প্রোফাইল নির্বাচন করুন। এই VPN এ সংযুক্ত থাকাকালীন শুধুমাত্র নেটওয়ার্ক ট্রাফিকের অনুমতি দেওয়া হবে।"</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"কোনো কিছুই নয়"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"সর্বদা-চালু VPN এর সার্ভার্র এবং DNS উভয়েরই জন্য IP ঠিকানা প্রয়োজন।"</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"আনলক করতে, পাসওয়ার্ড, প্যাটার্ন, পিন স্লাইড করুন"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"কর্মস্থলের প্রতিদ্বন্দ্বিতা, কর্মস্থল, প্রোফাইল"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"কর্মস্থলের প্রোফাইল, পরিচালিত প্রোফাইল, ঐক্যবদ্ধ, একীকরণ, কাজ, প্রোফাইল"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"অঙ্গভঙ্গি"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ওয়াই-ফাই NFC ট্যাগ সেটআপ করুন"</string>
     <string name="write_tag" msgid="8571858602896222537">"লিখুন"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"লিখতে একটি ট্যাগে আলতো চাপুন..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"পশ্চাদপট ডেটা শুধুমাত্র ওয়াই-ফাই এর মাধ্যমে উপলব্ধ হয়৷ ওয়াই-ফাই উপলব্ধ না থাকলে এটি কিছু অ্যাপ্লিকেশান এবং পরিষেবায় প্রভাব ফেলতে পারে৷"</string>
     <string name="condition_work_title" msgid="7293722361184366648">"কর্মস্থলের প্রোফাইল বন্ধ রয়েছে"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"অ্যাপ, পটভূমি সিঙ্ক এবং আপনার কর্মস্থলের প্রোফাইলের সাথে সম্পর্কিত অন্য বৈশিষ্ট্যগুলিকে বন্ধ করা হয়েছে৷"</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"প্রস্তাবনাগুলি (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"প্রস্তাবনাগুলি"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>টি"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"সরান"</string>
     <string name="color_temperature" msgid="2070126836910615605">"কুল রঙের টেম্পারেচার"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"কুলার প্রদর্শনী রঙগুলি ব্যবহার করুন"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager রেট-লিমিটিং কাউন্টারগুলিকে পুনঃসেট করবেন?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"লক স্ক্রীন বিজ্ঞপ্তিগুলি নিয়ন্ত্রণ করুন"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"বিজ্ঞপ্তির সামগ্রী দেখান বা লুকান"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"সমস্ত"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"সহায়তা"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"সবচেয়ে কম প্রস্থ"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ইনস্টল করা কোনো অ্যাপ্লিকেশানই প্রিমিয়াম SMS অ্যাক্সেসের অনুরোধ করেনি"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"প্রিমিয়াম SMS অ্যাক্সেস"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"অক্ষম করা রয়েছে"</string>
     <string name="demo_mode" msgid="2655748420527206870">"ডেমো মোড"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"আপনাকে সাহায্য করতে আমরা প্রস্তুত"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"আমরা আপনাকে সহায়তা করার জন্য সপ্তাহে সাত দিন ২৪ ঘন্টা এখানে রয়েছি"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"যে কোনো সমস্যার সমাধান করার জন্য আমাদের সহায়তা টিম এখানে রয়েছে"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"আমাদের সহায়তা টিম সপ্তাহে সাত দিন ২৪ ঘন্টা এখানে রয়েছে"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"ফোনের মাধ্যমে কাস্টোমার সমর্থন (স্থানীয় সময়) &lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt; পর্যন্ত উপলব্ধ"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"সহায়তা অনুসন্ধান করুন বা টিপ এবং কৌশলগুলি এক্সপ্লোর করুন"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"এর জন্য সমর্থন:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"বিদেশ ভ্রমন করছেন?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"আন্তর্জাতিক চার্জ প্রযোজ্য হতে পারে"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"ফোন"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"চ্যাট করুন"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"টিপ এবং কৌশলগুলি এক্সপ্লোর করুন"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"সহায়তায় অনুসন্ধান করুন এবং মতামত পাঠান"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"সহায়তার জন্য প্রবেশ করুন করুন"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"প্রবেশ করুন করুন"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"আপনার অ্যাকাউন্ট অ্যাক্সেস করতে পারছেন না?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"সিস্টেমের তথ্য পাঠান"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"আপনার সমস্যাকে দ্রুত চিহ্নিত করার কাজে সহায়তা করতে, নির্ণয়ের জন্য আমাদের সিস্টেমের তথ্য চাই৷"</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"আর দেখাবেন না"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"কর্মস্থলের প্রোফাইলের সেটিংস"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"পরিচিতির অনুসন্ধান"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"কলারদের এবং পরিচিতিগুলিকে চিহ্নিত করতে আপনার প্রতিষ্ঠান দ্বারা পরিচিতি অনুসন্ধানের অনুমতি দিন"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ঘণ্টা</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ঘণ্টা</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> মিনিট</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> মিনিট</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> সেকেন্ড</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> সেকেন্ড</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> অপেক্ষা করুন"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"কম্পিউটার"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"হেডসেট"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"ফোন"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"হেডফোন"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"পেরিফেরাল ইনপুট"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"ব্লুটুথ"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"সঞ্চয়স্থান খালি করার কাজে সহায়তা করার জন্য, সঞ্চয়স্থানের পরিচালক আপনার ডিভাইস থেকে ব্যাক আপ নেওয়া ফটো এবং ভিডিওগুলিকে সরিয়ে দেয়৷"</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ফটো এবং ভিডিওগুলিকে সরান"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"সঞ্চয়স্থানের পরিচালক"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"স্বয়ংক্রিয়"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"ম্যানুয়াল"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"অঙ্গভঙ্গিগুলি"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"ক্যামেরাতে সরাসরি যান"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"ক্যামেরা দ্রুত খুলতে, শুধুমাত্র পাওয়ার বোতামে দুবার আলতো চাপ দিন৷ যে কোনো স্ক্রীন থেকে কাজ করে৷"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ক্যামেরা ফ্লিপ করুন"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"সামনের ও পিছনের ক্যামেরার মধ্যে একটি থেকে অন্যটিতে পাল্টাতে দুবার ঝাঁকান৷"</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"দ্রুত স্ক্রীন চেক"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"আপনার ফোনটিকে সম্পূর্ণরূপে না জাগিয়েই, নুজ বা এটিকে হাতে তুলে নিয়ে চেক করুন৷"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"বিজ্ঞপ্তিগুলির জন্য সোয়াইপ করুন"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"যে কোনো স্ক্রীন থেকে আপনার বিজ্ঞপ্তিগুলি পরীক্ষা করতে আঙ্গুলের ছাপ নেওয়ার সেন্সরে নীচের দিকে সোয়াইপ করুন৷"</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"চালু আছে"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"বন্ধ আছে"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"বুটলোডার ইতিমধ্যেই আনলক করা হয়েছে"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"প্রথমে ইন্টারনেটের সাথে সংযোগ করুন"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"পরিষেবা প্রদানকারীর দ্বারা লক করা ডিভাইসগুলিতে অনুপলব্ধ"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
index e0836cc..3ab95eb 100644
--- a/res/values-bs-rBA/strings.xml
+++ b/res/values-bs-rBA/strings.xml
@@ -37,28 +37,34 @@
     <string name="header_category_personal" msgid="3310195187905720823">"Lično"</string>
     <string name="header_category_access" msgid="7580499097416970962">"Pristup"</string>
     <string name="header_category_system" msgid="2816866961183068977">"Sistem"</string>
-    <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Omogućite podatkovnu vezu"</string>
-    <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Onemogućite podatkovnu mrežu"</string>
-    <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE"</string>
-    <string name="radio_info_radio_power" msgid="1208229437948820417">"Snaga mobilnog radija"</string>
-    <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Prikaži SIM adresar"</string>
+    <string name="turn_on_radio" msgid="8706561489788373676">"Uključi radio"</string>
+    <string name="turn_off_radio" msgid="1820294552893884115">"Isključi radio"</string>
+    <string name="sms_over_ims_on" msgid="5085290395865632925">"Uključi SMS preko IMS-a"</string>
+    <string name="sms_over_ims_off" msgid="8354792045992793959">"Isključi SMS preko IMS-a"</string>
+    <string name="ims_reg_required_on" msgid="3885152087309614653">"Obavezno je uključiti IMS registraciju"</string>
+    <string name="ims_reg_required_off" msgid="1720570343422743943">"Neophodno je isključiti IMS registraciju"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Uključi oznaku Dodeljuje se preko VoLTE-a"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Isključite dodijeljeno upozorenje VoLTE"</string>
+    <string name="lte_ram_dump_on" msgid="8568568019520172177">"Uključi izvoz za lte ram"</string>
+    <string name="lte_ram_dump_off" msgid="2514507918652378283">"Isključi izvoz za lte ram"</string>
+    <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Prikaži SIM adresar"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Prikaži brojeve fiksnog biranja"</string>
     <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Prikaži brojeve biranja usluga"</string>
-    <string name="radioInfo_menu_getPDP" msgid="8951059003824985976">"Preuzmi PDP spisak"</string>
-    <string name="radioInfo_service_in" msgid="1697703164394784618">"Aktivan"</string>
-    <string name="radioInfo_service_out" msgid="7999094221728929681">"Ne radi"</string>
-    <string name="radioInfo_service_emergency" msgid="6274434235469661525">"Samo pozivi za hitne slučajeve"</string>
-    <string name="radioInfo_service_off" msgid="7536423790014501173">"Radio je isključen"</string>
+    <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Preuzmi PDP spisak"</string>
+    <string name="radioInfo_service_in" msgid="1915416319177520020">"Aktivan"</string>
+    <string name="radioInfo_service_out" msgid="5238736759641916278">"Ne radi"</string>
+    <string name="radioInfo_service_emergency" msgid="2485604591272668370">"Samo pozivi za hitne situacije"</string>
+    <string name="radioInfo_service_off" msgid="1434084741785525415">"Radio isključen"</string>
     <string name="radioInfo_roaming_in" msgid="9045363884600341051">"Roming"</string>
-    <string name="radioInfo_roaming_not" msgid="4849214885629672819">"Nije u romingu"</string>
+    <string name="radioInfo_roaming_not" msgid="2851853244069662307">"Nije u romingu"</string>
     <string name="radioInfo_phone_idle" msgid="7489244938838742820">"U stanju mirovanja"</string>
     <string name="radioInfo_phone_ringing" msgid="4883724645684297895">"Zvonjava"</string>
-    <string name="radioInfo_phone_offhook" msgid="5873835692449118954">"Poziv je u toku"</string>
+    <string name="radioInfo_phone_offhook" msgid="4174402846862780998">"Poziv u toku"</string>
     <string name="radioInfo_data_disconnected" msgid="1959735267890719418">"Isključen"</string>
     <string name="radioInfo_data_connecting" msgid="8404571440697917823">"Povezivanje"</string>
     <string name="radioInfo_data_connected" msgid="7074301157399238697">"Povezano"</string>
     <string name="radioInfo_data_suspended" msgid="5315325487890334196">"Suspendiran"</string>
-    <string name="radioInfo_unknown" msgid="1476509178755955088">"Nepoznato"</string>
+    <string name="radioInfo_unknown" msgid="737385314432468266">"nepoznato"</string>
     <string name="radioInfo_display_packets" msgid="8654359809877290639">"paketi"</string>
     <string name="radioInfo_display_bytes" msgid="4018206969492931883">"bajtova"</string>
     <string name="radioInfo_display_dbm" msgid="3621221793699882781">"dBm"</string>
@@ -173,39 +179,41 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Uneseni port nije važeći."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Preglednik koristi HTTP proksi, ali je moguće da ga ne koriste druge aplikacije."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL za PAC: "</string>
-    <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Informacije o lokaciji ćelije (zastarjele):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Informacije o susjednim ćelijama (zastarjela):"</string>
-    <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Interval osvježavanja informacija o ćeliji"</string>
-    <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Sve informacije o mjerenju ćelije"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Informacije u stvarnom vremenu o podatkovnoj vezi:"</string>
-    <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Prijenos podataka:"</string>
+    <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokacija:"</string>
+    <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Susjedni CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informacije o stanici:"</string>
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
+    <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Pokušaji prenosa podataka:"</string>
+    <string name="radio_info_gprs_service_label" msgid="6699616076706524202">"Tehnologija podataka:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
-    <string name="radio_info_call_redirect_label" msgid="2743797189722106231">"Preusmjeravanje poziva:"</string>
-    <string name="radio_info_ppp_resets_label" msgid="3587319503902576102">"Broj vraćanja PPP na početne vrijednosti od posljednjeg pokretanja:"</string>
-    <string name="radio_info_current_network_label" msgid="9151285540639134945">"Trenutna mreža:"</string>
-    <string name="radio_info_ppp_received_label" msgid="363579470428151850">"Primljeni podaci:"</string>
-    <string name="radio_info_gsm_service_label" msgid="1370863866816125489">"Govorna usluga:"</string>
-    <string name="radio_info_signal_strength_label" msgid="5155734002519307416">"Jačina signala:"</string>
-    <string name="radio_info_call_status_label" msgid="2611065018172747413">"Status glasovnog poziva:"</string>
-    <string name="radio_info_ppp_sent_label" msgid="7748668735880404586">"Poslani podaci:"</string>
-    <string name="radio_info_message_waiting_label" msgid="1037302619943328273">"Poruka na čekanju:"</string>
-    <string name="radio_info_phone_number_label" msgid="7942153178953255231">"Telefonski broj:"</string>
-    <string name="radio_info_band_mode_label" msgid="8730871744887454509">"Izaberite radijski obim"</string>
-    <string name="radio_info_voice_network_type_label" msgid="1443496502370667071">"Tip glasovne mreže:"</string>
-    <string name="radio_info_data_network_type_label" msgid="7094323145105149312">"Tip podatkovne mreže:"</string>
-    <string name="radio_info_set_perferred_label" msgid="3511830813500105512">"Postavite preferiranu vrstu mreže:"</string>
+    <string name="radio_info_call_redirect_label" msgid="1654674226961476872">"Preusmjeravanje poziva:"</string>
+    <string name="radio_info_ppp_resets_label" msgid="3241667824729310546">"Broj vraćanja PPP na početne vrijednosti od posljednjeg pokretanja:"</string>
+    <string name="radio_info_gsm_disconnects_label" msgid="1683069665736339820">"GSM se isključuje:"</string>
+    <string name="radio_info_current_network_label" msgid="3256402602440102610">"Trenutna mreža:"</string>
+    <string name="radio_info_data_successes_label" msgid="4417894113689054945">"Uspješni prenosi podataka:"</string>
+    <string name="radio_info_ppp_received_label" msgid="3345184342444878849">"Primljeni PPP:"</string>
+    <string name="radio_info_gsm_service_label" msgid="8595694240281347716">"Tehnologija glasa:"</string>
+    <string name="radio_info_signal_strength_label" msgid="1931937920896925766">"Jačina signala:"</string>
+    <string name="radio_info_call_status_label" msgid="4896238900685510883">"Status poziva:"</string>
+    <string name="radio_info_ppp_sent_label" msgid="5009102250704375687">"Poslani PPP:"</string>
+    <string name="radio_info_radio_resets_label" msgid="9211343458143291617">"Broj vraćanja radija na početne vrijednosti:"</string>
+    <string name="radio_info_message_waiting_label" msgid="6981842420058672207">"Poruka na čekanju:"</string>
+    <string name="radio_info_phone_number_label" msgid="7192944627907412169">"Broj telefona:"</string>
+    <string name="radio_info_band_mode_label" msgid="441469694142042022">"Izaberite radijski opseg"</string>
+    <string name="radio_info_network_type_label" msgid="3706382548257257987">"Vrsta mreže:"</string>
+    <string name="radio_info_set_perferred_label" msgid="9039200405863503267">"Postavite preferiranu vrstu mrežu:"</string>
     <string name="radio_info_ping_hostname_v4" msgid="7045103377818314709">"Pinguj ime računara (www.google.com) IPv4:"</string>
     <string name="radio_info_ping_hostname_v6" msgid="1130906124160553954">"Pinguj ime računara (www.google.com) IPv6:"</string>
-    <string name="radio_info_http_client_test" msgid="2382286093023138339">"Test HTTP klijenta:"</string>
-    <string name="ping_test_label" msgid="579228584343892613">"Pokreni ping test"</string>
+    <string name="radio_info_http_client_test" msgid="5733604021077701555">"Test HTTP klijenta:"</string>
+    <string name="ping_test_label" msgid="7255376471490860631">"Pokreni ping test"</string>
     <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
     <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Ažuriraj"</string>
     <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"Osvježi"</string>
-    <string name="radio_info_toggle_dns_check_label" msgid="6625185764803245075">"Prebaci provjeru DNS-a"</string>
+    <string name="radio_info_toggle_dns_check_label" msgid="8292252930563286858">"Prebaci provjeru DNS-a"</string>
     <string name="oem_radio_info_label" msgid="6163141792477958941">"OEM-specifične informacije/postavke"</string>
-    <string name="band_mode_title" msgid="4071411679019296568">"Postaviti način rada radijskog obima"</string>
-    <string name="band_mode_loading" msgid="3555063585133586152">"Učitavanje spiska obima…"</string>
+    <string name="band_mode_title" msgid="954174198903776205">"Postavi GSM/UMTS opseg"</string>
+    <string name="band_mode_loading" msgid="548764766363847336">"Učitavanje spiska opsega…"</string>
     <string name="band_mode_set" msgid="5730560180249458484">"Postavi"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Neuspješno"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Uspješno"</string>
@@ -241,11 +249,6 @@
     <string name="dlg_remove_locales_error_title" msgid="2653242337224911425">"Ne mogu se ukloniti svi jezici"</string>
     <string name="dlg_remove_locales_error_message" msgid="6697381512654262821">"Zadržite najmanje jedan preferirani jezik"</string>
     <string name="locale_not_translated" msgid="516862628177166755">"Možda nije dostupno u nekim aplikacijama"</string>
-    <string name="action_drag_label_move_up" msgid="9052210023727612540">"Pomjeri prema gore"</string>
-    <string name="action_drag_label_move_down" msgid="7448713844582912157">"Pomjeri prema dolje"</string>
-    <string name="action_drag_label_move_top" msgid="557081389352288310">"Pomjeri na vrh"</string>
-    <string name="action_drag_label_move_bottom" msgid="2468642142414126482">"Pomjeri na dno"</string>
-    <string name="action_drag_label_remove" msgid="2861038147166966206">"Ukloni jezik"</string>
     <string name="activity_picker_label" msgid="6295660302548177109">"Odaberite aktivnost"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Informacije o uređaju"</string>
     <string name="display_label" msgid="8074070940506840792">"Ekran"</string>
@@ -255,7 +258,7 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD kartica"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Postavke proksija"</string>
     <string name="cancel" msgid="6859253417269739139">"Otkaži"</string>
-    <string name="okay" msgid="1997666393121016642">"Uredu"</string>
+    <string name="okay" msgid="1997666393121016642">"Potvrdi"</string>
     <string name="forget" msgid="1400428660472591263">"Zaboravi"</string>
     <string name="save" msgid="879993180139353333">"Sačuvaj"</string>
     <string name="done" msgid="6942539184162713160">"Gotovo"</string>
@@ -340,8 +343,6 @@
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Samo dodirnite senzor za otisak prsta da biste otključali telefon, odobrili kupovinu ili se prijavili u aplikaciju. Pazite čije otiske dodajete. Svi dodani otisci mogu izvršiti navedene radnje. \n\n Napomena: Vaš otisak prsta može biti manje siguran od snažnog uzorka ili PIN kôda. "<annotation id="url">"Nauči više"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Otkaži"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Nastavi"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Preskoči"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Dodaj otisak prsta"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Funkcije za zaštitu uređaja neće biti aktivirane. Nećete biti u mogućnosti da spriječite druge osobe da koriste ovaj tablet ukoliko bude izgubljen, ukraden ili njegov sadržaj potpuno izbrisan."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Funkcije za zaštitu uređaja neće biti aktivirane. Nećete biti u mogućnosti da spriječite druge osobe da koriste ovaj uređaj ukoliko bude izgubljen, ukraden ili njegov sadržaj potpuno izbrisan."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Funkcije za zaštitu uređaja neće biti aktivirane. Nećete biti u mogućnosti da spriječite druge osobe da koriste ovaj telefon ukoliko bude izgubljen, ukraden ili njegov sadržaj potpuno izbrisan."</string>
@@ -422,9 +423,7 @@
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Otključajte otiskom prsta"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Odaberi zaklj. ekrana"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Odaberi zaklj. profila"</string>
-    <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Zaštitite svoj tablet"</string>
-    <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Zaštitite svoj uređaj"</string>
-    <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Zaštitite svoj telefon"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Zaštitite svoj telefon"</string>
     <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Otisak vašeg prsta može biti manje siguran nego jak uzorak, PIN kôd ili lozinka. Za dodatnu sigurnost, postavite pomoćno zaključavanje ekrana."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Spriječite da druge osobe koriste ovaj tablet bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Izaberite koji način zaključavanja ekrana želite koristiti."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Spriječite da druge osobe koriste ovaj uređaj bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Izaberite koji način zaključavanja ekrana želite koristiti."</string>
@@ -507,7 +506,7 @@
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN mora imati najmanje sljedeći broj cifara: %d"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Nastavi"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Lozinka mora imati manje od <xliff:g id="NUMBER">%d</xliff:g> znakova."</string>
-    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN mora imati manje od <xliff:g id="NUMBER">%d</xliff:g> cifara."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN mora imati manje od <xliff:g id="NUMBER">%d</xliff:g> brojki."</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN mora sadržavati samo brojeve 0-9."</string>
     <string name="lockpassword_pin_recently_used" msgid="214840704635573454">"Administrator uređaja ne dozvoljava korištenje nedavnog PIN-a."</string>
     <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Lozinka sadrži nevažeći znak."</string>
@@ -825,16 +824,8 @@
     <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Koristite Wi-Fi umjesto mobilne mreže"</string>
     <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Postavke za pozive"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Način pozivanja preko Wi-Fi"</string>
-  <string-array name="wifi_calling_mode_choices">
-    <item msgid="2124257075906188844">"Wi-Fi se preferira"</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_mode_choices:2 (3132912693346866895) -->
+    <!-- no translation found for wifi_calling_mode_values:2 (3194458950573886239) -->
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="5782108782860004851">"Prednost ima Wi-Fi"</item>
     <item msgid="9006785365352731433">"Prednost ima mobilna mreža"</item>
@@ -916,14 +907,14 @@
     <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Promijenite pozadinsku sliku"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Prilagodite svoj ekran"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Odaberi tapetu među"</string>
-    <string name="screensaver_settings_title" msgid="1770575686476851778">"Čuvar ekrana"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Sanjarenje"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Kad je u priključnoj stanici ili u stanju mirovanja i puni se"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Bilo koje"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Bilo koji"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Tokom punjenja"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Dok je u priključnoj stanici"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Isključeno"</string>
-    <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Za kontrolisanje dešavanja kada je telefon priključen i/ili dok miruje, uključi čuvara ekrana."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="8644479926302707286">"Kada pokrenuti čuvara ekrana"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Da biste kontrolisali šta se dešava kada je telefon na baznoj stanici i/ili u mirovanju, uključite Sanjarenje."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kada sanjariti"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Pokreni odmah"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Postavke"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatsko osvjetljenje"</string>
@@ -1068,7 +1059,7 @@
     <string name="storage_title_usb" msgid="679612779321689418">"Veza s računarom preko USB-a"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Poveži kao"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Medijski uređaj (MTP)"</string>
-    <string name="usb_mtp_summary" msgid="4617321473211391236">"Omogućava prenošenje medijskih fajlova u Windows ili korištenje Android File Transfer aplikacije za Mac (pogledajte www.android.com/filetransfer)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Omogućava prenošenje medijskih datoteka u Windows ili korištenje Android File Transfer aplikacije za Mac (pogledajte www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7406889433172511530">"Omogućava vam da prenesete fotografije pomoću softvera fotoaparata i da prenesete sve datoteke na kompjutere koji ne podržavaju MTP"</string>
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
@@ -1214,7 +1205,6 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Dijeljenje Bluetooth veze"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Dijeljenje veze"</string>
     <string name="tether_settings_title_all" msgid="8356136101061143841">"Dijeljenje internetske veze i prijenosna pristupna tačka"</string>
-    <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Dok je upaljena Ušteda podataka nije moguće povezati uređaj niti koristiti prijenosne pristupne tačke"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Dijeljenje USB veze"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB povezan, označite za dijeljenje veze"</string>
@@ -1327,12 +1317,6 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Za nastavak, unesite radni uzorak"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Za nastavak, unesite radni PIN."</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Za nastavak, unesite radnu lozinku."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Da biste nastavili, unesite uzorak za otključavanje uređaja. Neophodno je nakon ponovnog pokretanja."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Da biste nastavili, unesite PIN uređaja. Neophodno je nakon ponovnog pokretanja."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Da biste nastavili, unesite lozinku uređaja. Neophodno je nakon ponovnog pokretanja."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Da biste nastavili, unesite uzorak za posao. Neophodno je nakon ponovnog pokretanja."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Da biste nastavili, unesite PIN za posao. Neophodno je nakon ponovnog pokretanja."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Da biste nastavili, unesite lozinku za posao. Neophodno je nakon ponovnog pokretanja."</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Pogrešan PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Pogrešna lozinka"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Pogrešan uzorak"</string>
@@ -1341,7 +1325,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Promijeni PIN za otključavanje"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Nacrtajte uzorak za otključavanje"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pritisnite Meni za pomoć."</string>
-    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Podignite prst kada završite"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Pustite prst kada završite"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Povežite tačke (najmanje <xliff:g id="NUMBER">%d</xliff:g>). Pokušajte ponovo."</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Uzorak snimljen"</string>
     <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Ponovo nacrtajte uzorak da biste potvrdili"</string>
@@ -1480,7 +1464,6 @@
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Premjesti na USB pohranu"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Premjesti na SD karticu"</string>
     <string name="moving" msgid="6431016143218876491">"Premještanje"</string>
-    <string name="another_migration_already_in_progress" msgid="7817354268848365487">"Druga migracija je već u toku."</string>
     <string name="insufficient_storage" msgid="481763122991093080">"Nema dovoljno prostora za pohranu."</string>
     <string name="does_not_exist" msgid="1501243985586067053">"Aplikacija ne postoji."</string>
     <string name="app_forward_locked" msgid="6331564656683790866">"Aplikacija je zaštićena od kopiranja."</string>
@@ -1500,9 +1483,6 @@
     <string name="app_special_disable_dlg_text" msgid="1007112763234313018">"Ako onemogućite ovu aplikaciju, druge aplikacije možda više neće funkcionisati kako je predviđeno. Vaši podaci će takođe biti izbrisani."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Isključiti obavještenja?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ako isključite obavještenja za ovu aplikaciju, možete propustiti važna upozorenja i ažuriranja."</string>
-    <string name="app_install_details_group_title" msgid="7084623031296083574">"Trgovina"</string>
-    <string name="app_install_details_title" msgid="6905279702654975207">"Detalji o aplikaciji"</string>
-    <string name="app_install_details_summary" msgid="6464796332049327547">"Aplikacija je instalirana preko trgovine <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Djelovanje aplikacije"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Pokrenuto"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nikad korišteno)"</string>
@@ -1550,8 +1530,8 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Zaustaviti sistemsku uslugu?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Ako zaustavite ovu uslugu, neke funkcije tableta će možda prestati pravilno funkcionirati sve dok ne isključite i zatim ponovo uključite tablet."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ako zaustavite ovu uslugu, neke funkcije telefona će možda prestati pravilno funkcionirati sve dok ne isključite i zatim ponovo uključite tablet."</string>
-    <string name="language_settings" msgid="8758655933029560944">"Jezici i unos"</string>
-    <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Jezici i unos"</string>
+    <string name="language_settings" msgid="8758655933029560944">"Jezici &amp; unos"</string>
+    <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Jezici &amp; unos"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Tastatura i načini unosa"</string>
     <string name="phone_language" msgid="7116581601133118044">"Jezici"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1571,14 +1551,12 @@
     <string name="keyboard_and_input_methods_category" msgid="212319666432360385">"Tastatura i načini unosa"</string>
     <string name="virtual_keyboard_category" msgid="1012830752318677119">"Virtuelna tastatura"</string>
     <string name="available_virtual_keyboard_category" msgid="7645766574969139819">"Dostupna virtualna tastatura"</string>
-    <string name="add_virtual_keyboard" msgid="3302152381456516928">"Upravljanje tastaturom"</string>
+    <string name="add_virtual_keyboard" msgid="5783399159348480135">"Dodaj ili uredi virtuelne tastature"</string>
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"Pomoć za tastaturu"</string>
     <string name="physical_keyboard_title" msgid="8285149877925752042">"Fizička tastatura"</string>
     <string name="show_ime" msgid="2658582193437188227">"Pokaži virtealnu tastaturu"</string>
     <string name="show_ime_summary" msgid="8164993045923240698">"Zadržava se na ekranu dok je fizička tastatura aktivna"</string>
-    <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Pomoć za skraćenice na tastaturi"</string>
-    <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Prikaži dostupne prečice"</string>
-    <string name="default_keyboard_layout" msgid="4172606673510531271">"Zadano"</string>
+    <string name="physical_device_title" msgid="79889057252418427">"<xliff:g id="INPUT_METHOD_SUBTYPE">%1$s</xliff:g> – <xliff:g id="INPUT_METHOD_EDITOR">%2$s</xliff:g>"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Miš/dodirna podloga"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Brzina pokazivača"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Kontroler za igre"</string>
@@ -1658,7 +1636,7 @@
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Titlovi"</string>
     <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Potez za uvećavanje"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Dodirnite tri puta da biste uvećali"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="7798920976388197258"><b>" Za uvećavanje "</b>" Brzo dodirnite ekran 3 puta jednim prstom. \n"<ul><li>" Prevucite 2 ili više prstiju za listanje "</li>\n<li>" Sastavite 2 ili više prstiju ili ih rastavite za podešavanje uvećavanja "</li></ul>\n\n<b>" Da privremeno uvećate objekat,"</b>" brzo dodirnite ekran 3 puta i zadržite prst na trećem dodiru. \n"<ul><li>" Pomjerajte prst kako biste pregledali ekran "</li>\n<li>" Podignite prst da kako biste prekinuli uvećavanje objekta "</li></ul>\n\n" Ne možete uvećavati na tastaturi i navigacionoj traci."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="7798920976388197258"><b>" za uvećavanje "</b>" Brzo dodirnite ekran 3 puta jednim prstom. \n"<ul><li>" Prevucite 2 ili više prstiju za listanje "</li>\n<li>" Sastavite 2 ili više prstiju ili ih rastavite za podešavanje uvećavanja "</li></ul>\n\n<b>" Da privremeno uvećate objekat,"</b>" brzo dodirnite ekran 3 puta i zadržite prst na trećem dodiru. \n"<ul><li>" Pomjerajte prst kako biste pregledali ekran "</li>\n<li>" Podignite prst da kako biste prekinuli uvećavanje objekta "</li></ul>\n\n" Ne možete uvećavati natastaturi i navigacionoj traci."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Prečica za pristupačnost"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Uključeno"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Isključi"</string>
@@ -1962,7 +1940,7 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Ukloni sve certifikate"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Pouzdani akreditivi"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Prikaži pouzdane CA certifikate"</string>
-    <string name="user_credentials" msgid="3719013347787187083">"Korisnički akreditiv"</string>
+    <string name="user_credentials" msgid="3719013347787187083">"Korisnik akreditivā"</string>
     <string name="user_credentials_summary" msgid="7271228342106080167">"Pogledaj i promijeni sačuvane akreditive"</string>
     <string name="advanced_security_title" msgid="2434776238010578865">"Napredno"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Vrsta pohrane"</string>
@@ -2138,7 +2116,7 @@
     <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"SIM kartice"</string>
     <string name="data_usage_menu_cellular_networks" msgid="5243515735055652279">"Mobilne mreže"</string>
     <string name="data_usage_cellular_data_summary" msgid="8413357481361268285">"Pauzirano na ograničenju"</string>
-    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"Automatski sinhroniziraj podatke"</string>
+    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"Automatski sinhronizuj podatke"</string>
     <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"Automatska sinhronizacija ličnih podataka"</string>
     <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"Automatska sinhronizacija podataka za posao"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"Promijeni ciklus…"</string>
@@ -2228,7 +2206,7 @@
     <string name="vpn_done" msgid="8678655203910995914">"Odbaci"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Sačuvaj"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Poveži se"</string>
-    <string name="vpn_replace" msgid="5442836256121957861">"Zamijeni"</string>
+    <string name="vpn_continue" msgid="846894478725673098">"Nastavi"</string>
     <string name="vpn_edit" msgid="8647191407179996943">"Uredi VPN profil"</string>
     <string name="vpn_forget" msgid="3684651372749415446">"Zaboravi"</string>
     <string name="vpn_connect_to" msgid="5965299358485793260">"Poveži se na <xliff:g id="PROFILE">%s</xliff:g>"</string>
@@ -2237,9 +2215,9 @@
     <string name="vpn_version" msgid="1939804054179766249">"Verzija <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Zaboravi VPN"</string>
     <string name="vpn_replace_always_on_vpn_title" msgid="3010435028275752220">"Želite li zamijeniti postojeći VPN?"</string>
-    <string name="vpn_replace_always_on_vpn_message" msgid="4764679857158814028">"Već ste povezani na VPN. Ako se povežete na drugi VPN, postojeći VPN će biti zamijenjen."</string>
-    <string name="vpn_cant_connect_title" msgid="4517706987875907511">"<xliff:g id="VPN_NAME">%1$s</xliff:g> se ne može povezati"</string>
-    <string name="vpn_cant_connect_message" msgid="2593197919352621279">"Ova aplikacija ne podržava uvijek aktivni VPN."</string>
+    <string name="vpn_replace_always_on_vpn_message" msgid="4766130211217825628">"Već imate VPN povezan s ovim profilom. Ako ste povezani s jednim, vaš postojeći VPN bit će zamijenjen."</string>
+    <string name="vpn_cant_connect_notification_title" msgid="820999437026146960">"<xliff:g id="VPN_NAME">%1$s</xliff:g> se ne može povezati"</string>
+    <string name="vpn_tap_for_vpn_settings" msgid="582017057346927799">"Dodirnite za VPN postavke"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
     <string name="vpn_create" msgid="5628219087569761496">"Dodaj VPN profil"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Uredi profil"</string>
@@ -2278,27 +2256,10 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Izvršavanje"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Mreža može biti nadzirana"</string>
     <string name="done_button" msgid="1991471253042622230">"Gotovo"</string>
-    <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
-      <item quantity="one"> Vjerujte certifikatu ili ga uklonite</item>
-      <item quantity="few"> Vjerujte certifikatima ili ih uklonite</item>
-      <item quantity="other"> Vjerujte certifikatima ili ih uklonite</item>
-    </plurals>
-    <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="1489335297837656666">
-      <item quantity="one"> Domena <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> je instalirala certifikate ovlaštenja na vaš uređaj, koji im mogu omogućiti da prati radne aktivnosti mreže, uključujući e-poštu, aplikacije i sigurne web lokacije.\n\nZa više informacija o ovim certifikatima, obratite se administratoru.</item>
-      <item quantity="few"> Domene <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> su instalirale certifikate ovlaštenja na vaš uređaj, koji im mogu omogućiti da prate mrežne aktivnosti vašeg uređaja, uključujući e-poštu, aplikacije i sigurne web lokacije.\n\nZa više informacija o ovim certifikatima, obratite se administratoru.</item>
-      <item quantity="other"> Domena <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> je instaliralo certifikate ovlaštenja na vaš uređaj, koji im mogu omogućiti da prate mrežne aktivnosti vašeg uređaja, uključujući e-poštu, aplikacije i sigurne web lokacije.\n\nZa više informacija o ovim certifikatima, obratite se administratoru.</item>
-    </plurals>
-    <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="30645643499556573">
-      <item quantity="one"> Domena <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> je instalirala certifikate ovlaštenja za vaš radni profil, koji im mogu omogućiti da prati radne aktivnosti mreže, uključujući e-poštu, aplikacije i sigurne web lokacije.\n\nZa više informacija o ovim certifikatima, obratite se administratoru.</item>
-      <item quantity="few"> Domene <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> su instalirale certifikate ovlaštenja za vaš radni profil, koji im mogu omogućiti da prati radne aktivnosti mreže, uključujući e-poštu, aplikacije i sigurne web lokacije.\n\nZa više informacija o ovim certifikatima, obratite se administratoru.</item>
-      <item quantity="other"> Domena <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> je instaliralo certifikate ovlaštenja za vaš radni profil, koji im mogu omogućiti da prati radne aktivnosti mreže, uključujući e-poštu, aplikacije i sigurne web lokacije.\n\nZa više informacija o ovim certifikatima, obratite se administratoru.</item>
-    </plurals>
+    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Nadgledanje mreže"</string>
+    <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Ovim uređajem upravlja:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nVaš administrator može nadgledati vaše mrežne aktivnosti, uključujući e-mailove, aplikacije i sigurne web-lokacije.\n\nDa biste saznali još informacija, kontaktirajte svog administratora."</string>
     <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Treća strana je u stanju da prati vaše mrežne aktivnosti, uključujući poruke e-pošte, aplikacije i sigurne web lokacije. \n\nPouzdani akreditiv instaliran na vašem uređaju to omogućava."</string>
-    <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
-      <item quantity="one">Provjerite certifikate</item>
-      <item quantity="few">Provjerite certifikate</item>
-      <item quantity="other">Provjerite certifikate</item>
-    </plurals>
+    <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Provjeri pouzdane akreditive"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Korisnici"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Korisnici i profili"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Dodaj korisnika ili profil"</string>
@@ -2319,10 +2280,10 @@
     <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="8562152293752222985">"Za dijeljenje ovog uređaja s drugima možete napraviti dodatne korisnike. Svaki korisnik ima svoj prostor, koji može prilagoditi aplikacijama, pozadinom, i tako dalje. Korisnici također mogu prilagoditi postavke uređaja kao što su Wi-Fi koje utiču na sve ostale korisnike. \n\n Kada dodate novog korisnika, ta osoba treba uspostaviti svoj prostor. \n\n Svaki korisnik može ažurirati aplikacije za sve ostale korisnike."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Ovaj uređaj s drugim ljudima možete dijeliti stvaranjem dodatnih korisnika. Svaki korisnik ima svoj prostor, koji može prilagoditi aplikacijama, pozadinom, i tako dalje. Korisnici također mogu prilagoditi postavke uređaja kao što su Wi-Fi koje utječu na sve. \n\n Kada dodate novog korisnika, ta osoba treba uspostaviti svoj prostor. \n\n Svaki 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 treba uspostaviti svoj prostor. \n\n Svaki korisnik može ažurirati aplikacije za sve ostale korisnike."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Postaviti korisnika odmah?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Provjerite može li osoba uzeti uređaj i podesiti svoj prostor"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Pobrinite se da je osoba dostupna uzeti uređaj i postaviti svoj prostor"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Podesiti profil odmah?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Podesiti sada"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ne sada"</string>
@@ -2536,7 +2497,7 @@
     <string name="ringtone_title" msgid="5379026328015343686">"Melodija zvona telefona"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Zadana melodija obavještenja"</string>
     <string name="alarm_ringtone_title" msgid="2015124067611102995">"Zadani zvuk alarma"</string>
-    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibracija i za pozive"</string>
+    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Također vibriraj za pozive"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Drugi zvukovi"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonovi tastature telefona"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Zvuk zaključavanja ekrana"</string>
@@ -2550,7 +2511,6 @@
     <string name="emergency_tone_silent" msgid="1067515631635824291">"Nečujno"</string>
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Upozorenje"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibracija"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Ne ometaj"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Dopustiti samo prioritete"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatska pravila"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Podesi funkciju Ne uznemiravajj"</string>
@@ -2563,7 +2523,7 @@
     <string name="configure_notification_settings" msgid="3558846607192693233">"Konfiguriraj obavještenja"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Napredno"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Obavještenja za posao"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsirajuće svjetlo obavještenja"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsirajuće svjetlo oobavještenja"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na zaključanom ekranu"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Prikaži sav sadržaj obavještenja"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Sakrij osjetljiv sadržaj obavještenja"</string>
@@ -2578,13 +2538,12 @@
     <string name="app_notifications_title" msgid="139788604658984593">"Obavještenja"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Značaj"</string>
     <string name="notification_importance_none" msgid="3173515479356106227">"Nije postavljeno"</string>
-    <string name="notification_importance_blocked" msgid="4348392266695847526">"Nikad ne prikazuj obavještenja iz ove aplikacije"</string>
-    <string name="notification_importance_min" msgid="1859001310034196751">"Bez prekidanja prikaza cijelog ekrana, izvirivanja, zvuka ili vibracije. Prikaži na dnu liste obavještenja. Sakriti sa ekrana za zaključavanje i statusne trake."</string>
-    <string name="notification_importance_low" msgid="1466326143251705794">"Bez prekidanja prikaza cijelog ekrana, izvirivanja, zvuka ili vibracije."</string>
-    <string name="notification_importance_default" msgid="2857618184137114962">"Bez izvirivanja ili prekidanja prikaza cijelog ekrana."</string>
-    <string name="notification_importance_high" msgid="495354850199578732">"Uvijek izviruj. Bez prekidanja prikaza cijelog ekrana."</string>
-    <string name="notification_importance_max" msgid="7538045535631915413">"Uvijek izviruj, i omogućiti prekida prikaza cijelog ekrana. Prikaži na vrhu liste obavještenja."</string>
-    <string name="notification_importance_unspecified" msgid="6172151762388245221">"Aplikacija određuje važnost svakog obavještenja."</string>
+    <string name="notification_importance_blocked" msgid="4764559498517003405">"Blokirano: Nikada ne pokazuju ova obavještenja"</string>
+    <string name="notification_importance_min" msgid="2370444628448134377">"Minimalna: Nečujno prikaži na dnu spiska obavještenja"</string>
+    <string name="notification_importance_low" msgid="979932751695283877">"Nizak: Nečujno prikaži ova obavještenja"</string>
+    <string name="notification_importance_default" msgid="8789180840561778039">"Normalno: Dozvoli zvuk na ovim obavještenjima"</string>
+    <string name="notification_importance_high" msgid="5044607814670313040">"Visoka: kratki prikaz na ekranu uz zvuk"</string>
+    <string name="notification_importance_max" msgid="6036245535555486319">"Hitno: Prikaži na vrhu liste obavještenja, kratko prikaži na ekranu i dozvoli zvuk"</string>
     <string name="importance_reset" msgid="7458420788555607007">"Ponovno pokretanje"</string>
     <string name="show_silently" msgid="2222875799232222056">"Pokaži bez zvuka"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Ne oglašavaj ova obavještenja zvukom, vibriranjem niti kratkim prikazom na aktuelnom ekranu."</string>
@@ -2597,17 +2556,11 @@
     </plurals>
     <string name="no_notification_listeners" msgid="3487091564454192821">"Nijedna instalirana aplikacija nije zatražila pristup obavještenjima."</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"Želite li dozvoliti pristup obavještenjima za uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"Korisnik <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> će moći čitati sva obavještenja, uključujući lične informacije kao što su imena kontakata i tekst primljenih poruka. Također će moći odbaciti obavještenja ili aktivirati dugmad sadržanu u njima. \n\nTime će se aplikaciji dati i mogućnost da uključi i isključi opciju Ne ometaj te da promijeni postavke povezane s tom opcijom."</string>
-    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"Ako korisniku <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> isključite pristup obavještenjima, može se isključiti i pristup opciji Ne ometaj."</string>
-    <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"Isključi"</string>
-    <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"Otkaži"</string>
+    <string name="notification_listener_security_warning_summary" msgid="548925084229440829">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> će moći da čita sva obavještenja, uključujući lične informacije kao što su imena kontakata i tekst primljenih poruka. Takođe će moći da odbaci obavještenja ili aktivira dugmad sadržanu u njima."</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"Usluge pomagača VR"</string>
     <string name="no_vr_listeners" msgid="2689382881717507390">"Nijedna instalirana aplikacija nije zatražila da bude pokrenuta kao VR usluge pomogača."</string>
     <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"Želite li dozvoliti pristup usluge VR za uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"<xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> će moći raditi kada aplikacije budete koristili u načinu rada virtualne stvarnosti."</string>
-    <string name="display_vr_pref_title" msgid="7049857952347953979">"Kada je uređaj u VR stanju"</string>
-    <string name="display_vr_pref_low_persistence" msgid="6221441245293606681">"Koristite postavke slabe zamućenosti"</string>
-    <string name="display_vr_pref_off" msgid="1244880066079174840">"Ne radi ništa"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Pristup Ne smetaj"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nijedna instalirana aplikacija nije zatražila pristup za Ne ometaj"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Učitavaju se aplikacije..."</string>
@@ -2723,7 +2676,7 @@
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Sigurno pokretanje"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Nastavi"</string>
     <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Uređaj možete dodatno zaštiti tako da zahtijevate unošenje PIN-a prije njegovog pokretanja. Prije pokretanja, uređaj ne može primati pozive, poruke ili obavještenja, uključujući i aktiviranje alarma. \n\nNa ovaj način štite se podaci na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Uređaj možete dodatno zaštititi ako zahtijevate unošenje obrasca prije njegovog pokretanja. Prije pokretanja, uređaj ne može primati pozive, poruke i obavještenja, uključujući i aktiviranje alarma. \n\nNa ovaj način štite se podaci na izgubljenim ili ukradenim uređajima."</string>
+    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"uređaj možete dodatno zaštititi ako zahtijevate unošenje obrasca prije njegovog pokretanja. Prije pokretanja, uređaj ne može primati pozive, poruke i obavještenja, uključujući i aktiviranje alarma. \n\nNa ovaj način štite se podaci na izgubljenim ili ukradenim uređajima."</string>
     <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Uređaj možete dodatno zaštiti tako da zahtijevate unošenje lozinke prije njegovog pokretanja. Prije pokretanja, uređaj ne može primati pozive, poruke ili obavještenja, uključujući i aktiviranje alarma. \n\nNa ovaj način štite se podaci na izgubljenim ili ukradenim uređajima."</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Osim korištenja otiska prsta za otključavanje, uređaj možete dodatno zaštititi ako zahtijevate unošenje PIN-a prije njegovog pokretanja. Prije pokretanja, uređaj ne može primati pozive, poruke i obavještenja, uključujući i aktiviranje alarma.\n\nNa ovaj način štite se podaci na izgubljenim ili ukradenim uređajima."</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Osim korištenja otiska prsta za otključavanje, uređaj možete dodatno zaštititi ako zahtijevate unošenje obrasca prije njegovog pokretanja. Prije pokretanja, uređaj ne može primati pozive, poruke i obavještenja, uključujući i aktiviranje alarma.\n\nNa ovaj način štite se podaci na izgubljenim ili ukradenim uređajima."</string>
@@ -2768,7 +2721,6 @@
     <string name="notifications_hidden" msgid="3619610536038757468">"Ne na zaključanom ekranu"</string>
     <string name="notifications_priority" msgid="1066342037602085552">"Način rada Ne ometaj je poništen."</string>
     <string name="notifications_summary_divider" msgid="9013807608804041387">" / "</string>
-    <string name="notification_summary_level" msgid="2726571692704140826">"Nivo %d"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> dodijeljena dozvola</item>
       <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> dodijeljene dozvole</item>
@@ -2793,7 +2745,7 @@
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokirano"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Sa URL-ovima domena"</string>
     <string name="filter_notif_priority_apps" msgid="5056470299318500609">"Zanemaruje postavku Ne ometaj"</string>
-    <string name="filter_notif_sensitive_apps" msgid="3847012996691991486">"Bez osjetljivog sadržaja na zaključanom ekranu"</string>
+    <string name="filter_notif_sensitive_apps" msgid="3847012996691991486">"Ništa osjetljivo na zak. ekr."</string>
     <string name="filter_notif_hide_notifications_apps" msgid="3977513041080404368">"Bez prikaza na zaključ. ekranu"</string>
     <string name="filter_notif_silent" msgid="8533960664617048281">"Prikazano bez zvuka"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Napredno"</string>
@@ -2877,15 +2829,16 @@
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"Odbij"</string>
     <string name="usb_use_charging_only" msgid="2180443097365214467">"Puni bateriju ovog uređaja"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Samo puni ovaj uređaj"</string>
-    <string name="usb_use_power_only" msgid="6426550616883919530">"Napajanje"</string>
-    <string name="usb_use_power_only_desc" msgid="4912352581010190141">"Napajanje drugog povezanog uređaja"</string>
+    <string name="usb_use_power_only" msgid="6426550616883919530">"Napaja uređaj"</string>
+    <string name="usb_use_power_only_desc" msgid="4912352581010190141">"Napaja drugi povezani uređaj"</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Prenosi fajlove"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Prebacite fajlove na drugi uređaj"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Prenesi fotografije (PTP)"</string>
+    <!-- no translation found for usb_use_photo_transfers (7794775645350330454) -->
+    <skip />
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Prebacuje slike ili datoteke ukoliko MTP nije podržan (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"Koristi uređaj za MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Uređaj se koristi za rad u MIDI modu"</string>
-    <string name="usb_use" msgid="3256040963685055320">"Koristi USB za"</string>
+    <string name="usb_use" msgid="3256040963685055320">"Koristi USB da"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Provjera u pozadini"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Pun pristup pozadini"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Koristi tekst sa ekrana"</string>
@@ -2917,7 +2870,6 @@
     <string name="no_data_usage" msgid="9131454024293628063">"Ne koriste se podaci"</string>
     <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Želite li omogućiti da <xliff:g id="APP">%1$s</xliff:g> pristupa režimu Ne uznemiravaj?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Aplikacija će biti u mogućnosti da uključi/isključi režim Ne ometaj i da izmijeni povezane postavke."</string>
-    <string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Mora ostati uključeno jer je uključen pristup obavještenjima"</string>
     <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Opozvati pristup ka usluzi Ne uznemiravaj za aplikaciju <xliff:g id="APP">%1$s</xliff:g>?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Sva pravila za uslugu Ne uznemiravaj koje je kreirala ova aplikacija, biti će uklonjena."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Ne optimiziraj"</string>
@@ -3005,8 +2957,6 @@
     <string name="admin_device_owner_message" msgid="8734500370023898028">"Vaš administrator može pratiti i upravljati aplikacijama i podacima povezanim s ovim uređajem, uključujući postavke, odobrenja, korporativni pristup, aktivnost na mreži te informacije o lokaciji uređaja."</string>
     <string name="condition_turn_off" msgid="1960945836880080298">"Isključi"</string>
     <string name="condition_turn_on" msgid="9089876276117874591">"Uključi"</string>
-    <string name="condition_expand_show" msgid="608202020023489939">"Prikaži"</string>
-    <string name="condition_expand_hide" msgid="948507739223760667">"Sakrij"</string>
     <string name="condition_hotspot_title" msgid="7778958849468560027">"Hotspot je na"</string>
     <string name="condition_hotspot_summary" msgid="3433182779269409683">"Prijenosni Wi-Fi hotspot <xliff:g id="ID_1">%1$s</xliff:g> je aktivan, Wi-Fi za ovaj uređaj je isključen."</string>
     <string name="condition_airplane_title" msgid="287356299107070503">"Airplane način rada je uključen"</string>
@@ -3041,22 +2991,20 @@
     <string name="billing_cycle_summary" msgid="9009106526129293752">"Mjesečni ciklus počinje na <xliff:g id="ID_1">%1$s</xliff:g> svakog mjeseca"</string>
     <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Mjesečno od <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Ograničenje mreže"</string>
-    <string name="operator_warning" msgid="1862988028996859195">"Obračun podataka koji vrši operater se može razlikovati od obračuna koji vrši uređaj."</string>
+    <string name="operator_warning" msgid="7206980278353372811">"Obračun podataka operatera može se razlikovati od obračuna vašeg uređaja."</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> iskorišteno"</string>
     <string name="data_warning" msgid="209133958008062117">"Upozorenje o podacima"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Postavi ograničenje za podatke"</string>
     <string name="data_limit" msgid="1885406964934590552">"Ograničenje za podatke"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> iskorišteno u razdoblju <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfiguracija"</string>
-    <string name="data_usage_other_apps" msgid="3272872663517382050">"Ostale aplikacije uključene u upotrebu"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> aplikacija smije upotrebljavati neograničene podatke kada je Ušteda podataka uključena</item>
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> aplikacije smiju upotrebljavati neograničene podatke kada je Ušteda podataka uključena</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplikacija smije upotrebljavati neograničene podatke kada je Ušteda podataka uključena</item>
     </plurals>
-    <string name="data_saver_title" msgid="398458827917495765">"Ušteda podataka"</string>
+    <string name="data_saver_title" msgid="8034286939200289826">"Ušteda podataka"</string>
     <string name="unrestricted_data_saver" msgid="7019858887510062789">"Neograničen pristup podacima"</string>
-    <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Pozadinski podaci su isključeni"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Uključeno"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Isključeno"</string>
     <string name="unrestricted_app_title" msgid="4465437191723332066">"Neograničena upotreba podataka"</string>
@@ -3104,8 +3052,6 @@
     <string name="notification_log_details_vibrate" msgid="6890065466625335940">"vibriraj"</string>
     <string name="notification_log_details_default" msgid="2345249399796730861">"standardno/default"</string>
     <string name="notification_log_details_none" msgid="184131801230614059">"nijedan"</string>
-    <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Rangirani objekt nedostaje."</string>
-    <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Rangirani objekt ne sadrži ovu tipku."</string>
     <string name="special_access" msgid="8275242424094109976">"Poseban pristup"</string>
     <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"Zaista želite izbrisati korisničke podatke i pretvoriti u šifrirani fajl?"</string>
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Obriši i pretvori"</string>
@@ -3116,19 +3062,10 @@
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Pokaži ili sakrij sadržaj obavještenja"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Najmanja širina"</string>
-    <string name="premium_sms_none" msgid="8268105565738040566">"Nijedna instalirana aplikacija nije zatražila Premium SMS pristup"</string>
-    <string name="premium_sms_warning" msgid="9086859595338944882">"Usluga Premium SMS se možda dodatno plaća te će trošak biti na računu koji dobijate od operatera. Ukoliko aplikaciji date dozvolu, moći ćete slati premium SMS poruke putem te aplikacije."</string>
-    <string name="premium_sms_access" msgid="4660047004791638305">"Premium SMS pristup"</string>
-    <string name="bluetooth_disabled" msgid="1558295505487648234">"Onemogućeno"</string>
-    <string name="demo_mode" msgid="2655748420527206870">"Način demonstracije"</string>
-    <string name="managed_profile_settings_title" msgid="2729481936758125054">"Postavke radnog profila"</string>
-    <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Pretraživanje kontakata"</string>
-    <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Dozvolite svojoj organizaciji da pretražuje kontakte kako bi identificirala pozivaoce i kontakte"</string>
-    <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Računar"</string>
-    <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Slušalice s mikrofonom"</string>
-    <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telefoniraj"</string>
-    <string name="bluetooth_talkback_imaging" msgid="551146170554589119">"Snimanje"</string>
-    <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Slušalice"</string>
-    <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Ulazni periferni uređaj"</string>
-    <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for premium_sms_none (8268105565738040566) -->
+    <skip />
+    <!-- no translation found for premium_sms_warning (9086859595338944882) -->
+    <skip />
+    <!-- no translation found for premium_sms_access (4660047004791638305) -->
+    <skip />
 </resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index c3c827d..c8983a6 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Rosa"</item>
     <item msgid="6131821495505931173">"Vermell"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Més de 30 dies d\'antiguitat"</item>
+    <item msgid="2900554746706302178">"Més de 60 dies d\'antiguitat"</item>
+    <item msgid="5692284879054004388">"Més de 90 dies d\'antiguitat"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-ca/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-ca/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-ca/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 5eb6d92..0493aaa 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Activa la connexió de dades"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Desactiva la connexió de dades"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE administrada"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Es proporcionen videotrucades"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Es proporcionen trucades per Wi-Fi"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Alimentació del senyal mòbil"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Mostra la llibreta d\'adreces de la SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Mostra els números de marcatge fix"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloqueig amb empremta"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Només has de tocar el sensor d\'empremtes digitals per desbloquejar el telèfon, autoritzar compres o iniciar la sessió en aplicacions. Vés amb compte amb les empremtes digitals d\'altres persones que afegeixis, perquè totes podran dur a terme aquestes accions.\n\nNota: fer servir l\'empremta digital pot ser menys segur que utilitzar un patró o un PIN complets. "<annotation id="url">"Més informació"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Només cal que toquis el sensor d\'empremtes digitals per desbloquejar el telèfon, autoritzar compres o iniciar la sessió en aplicacions. Vés amb compte amb les empremtes digitals d\'altres persones que hi afegeixis, perquè totes podran dur a terme aquestes accions.\n\nNota: fer servir l\'empremta digital pot ser menys segur que utilitzar un patró o un PIN complets."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancel·la"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continua"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Omet"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Suprimeix"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Comencem"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Col·loca el dit al sensor i aixeca\'l quan notis una vibració"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Molt bé. Repeteix-ho"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Fes-ho un altre cop"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Mou el dit lleugerament perquè es pugui captar l’empremta digital sencera"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Empremta dig. afegida"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Quan vegis aquesta icona, pots fer servir la teva empremta digital per identificar-te o per autoritzar una compra."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Toca el sensor d\'empremtes digitals per activar i desbloquejar el dispositiu."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Quan vegis aquesta icona, pots fer servir la teva empremta digital."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Quan vegis aquesta icona, també podràs autoritzar compres o iniciar la sessió a les aplicacions."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Sortir de configuració d\'empremta digital?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Has triat utilitzar la teva empremta digital per desbloquejar el telèfon. Si omets aquest pas ara, hauràs de fer aquesta configuració més endavant. Aquest procés només triga un parell de minuts."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configura el bloqueig de pantalla"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Actualitza l\'adreça per a les emergències"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Adreça utilitzada pels serveis d\'emergència com la teva ubicació si truques al 911 mitjançant la Wi-Fi"</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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Esborra"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Configura"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Explora"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Allibera espai"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Gestiona l\'emmagatzematge"</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>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Dispositiu multimèdia (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Àudio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Dades desades a la memòria cau"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Altres"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explora <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"A l\'apartat Altres s\'inclouen fitxers compartits desats per les aplicacions, fitxers baixats d\'Internet o per Bluetooth i fitxers d\'Android, entre d\'altres \n\nPer veure tot el contingut de <xliff:g id="NAME">^1</xliff:g>, toca Explora."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"El sistema inclou fitxers que el sistema operatiu Android utilitza internament. \n\nAquests fitxers no es poden veure per separat."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"És possible que <xliff:g id="USER_0">^1</xliff:g> hagi desat fotos, música, pel·lícules, aplicacions o altres dades que ocupen <xliff:g id="SIZE">^2</xliff:g> d\'emmagatzematge. \n\nPer veure\'n detalls, canvia a <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Informació legal"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Col·laboradors"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Informació de regulació"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Etiquetes normatives"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Informació normativa i de seguretat"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Llicència"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termes i condicions"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN sempre activada"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"No s\'ha afegit cap VPN."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Sempre activa"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"No compatible amb aquesta aplicació"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecciona un perfil de VPN per estar-hi sempre connectat. El trànsit de la xarxa només es permetrà quan estiguis connectat a aquesta VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Cap"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Per tenir la VPN sempre activada cal una adreça IP per al servidor i per al DNS."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"fer lliscar el dit per desbloquejar, contrasenya, patró, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"desafiament per accedir a contingut de feina, feina, perfil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"perfil professional, perfil gestionat, unificar, unificació, feina, perfil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"gest"</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>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Toca una etiqueta per escriure..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Les dades en segon pla només estan disponibles mitjançant una Wi-Fi. Això pot afectar aplicacions o serveis determinats quan no n\'hi hagi cap de disponible."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Perfil professional desactivat"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Les aplicacions, la sincronització en segon pla i altres funcions relacionades amb el teu perfil professional estan desactivades."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Suggeriments (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Suggeriments"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Suprimeix"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de color freda"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilitza colors de pantalla més freds"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Vols restablir els comptadors de limitació de velocitat de ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controla notificacions de pantalla bloq."</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostra o oculta el contingut de la notificació"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Tots"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Assistència"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Amplada més petita"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Cap aplicació instal·lada no ha sol·licitat accés a l\'enviament de SMS prèmium"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Accés a l\'enviament de SMS prèmium"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Desactivat"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Mode de demostració"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Som aquí per ajudar-te"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Estem a la teva disposició les 24 hores del dia"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"L\'equip d\'assistència està al teu servei per ajudar-te a resoldre qualsevol problema que et sorgeixi"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"El nostre equip d\'assistència està disponible tot el dia"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Horari del servei d\'assistència telefònica (hora local)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Cerca ajuda o consulta els consells i trucs"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Compatible amb:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Viatges a l\'estranger?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Es poden aplicar càrrecs internacionals"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telèfon"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Xat"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Consulta consells i trucs"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Cerca ajuda i envia suggeriments"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Inicia la sessió per obtenir assistència"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Inicia la sessió"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"No pots accedir al compte?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Envia informació del sistema"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Per solucionar el problema ràpidament, necessitem informació del sistema per fer-ne un diagnòstic."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"No ho tornis a mostrar"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Configuració del perfil professional"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Cerca de contactes"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Permet que la teva organització cerqui contactes per identificar els remitents i els contactes"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> hores</item>
+      <item quantity="one">1 hora</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuts</item>
+      <item quantity="one">1 minut</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segons</item>
+      <item quantity="one">1 segon</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"<xliff:g id="ESTIMATE">%1$s</xliff:g> d\'espera aproximadament"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Ordinador"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Auriculars"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telèfon"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Auricular"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Perifèric d\'entrada"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Per alliberar espai, el gestor d\'emmagatzematge suprimeix del dispositiu les còpies de seguretat de fotos i vídeos."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Suprimeix fotos i vídeos amb"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Gestor d\'emmagatzematge"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automàtica"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestos"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Accés ràpid a la càmera"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Per obrir la càmera ràpidament, fes doble toc sobre el botó d\'engegada. Funciona des de qualsevol pantalla."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Gira la càmera"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Per canviar entre la càmera frontal i la posterior, fes dos girs ràpids."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Comprovació ràpida de la pantalla"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Per donar una ullada al telèfon sense activar-lo del tot, toca\'l lleugerament o agafa\'l."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Llisca el dit per veure les notificacions"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Per consultar les notificacions des de qualsevol pantalla, fes lliscar el dit cap avall al sensor d\'empremtes digitals."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Activat"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Desactivat"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"El bootloader ja està desbloquejat"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Primer cal connectar-se a Internet"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"No disponible en dispositius bloquejats per l\'operador"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 180d67d..1afc115 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Růžová"</item>
     <item msgid="6131821495505931173">"Červená"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Starší než 30 dní"</item>
+    <item msgid="2900554746706302178">"Starší než 60 dní"</item>
+    <item msgid="5692284879054004388">"Starší než 90 dní"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-cs/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-cs/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-cs/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 3cb71ef..9ca633a 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -41,6 +41,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Povolit datové připojení"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Zakázat datové připojení"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Poskytnutí VoLTE"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Zajištění videohovoru"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Zajištění volání přes Wi-Fi"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Napájení bezdrátového modulu mobilní sítě"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Zobrazit adresář SIM karty"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Zobrazit povolená telefonní čísla"</string>
@@ -340,7 +342,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Odemknutí otiskem prstu"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Odemykejte telefon, autorizujte nákupy a přihlašujte se do aplikací pouhým klepnutím na snímač otisků prstů. Dobře zvažte, čí otisky do zařízení přidáte. Uvedené akce bude možné provádět pomocí každého z přidaných otisků.\n\nPoznámka: Otisk prstu není tak bezpečný jako silné gesto nebo kód PIN. "<annotation id="url">"Další informace"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Odemykejte telefon, autorizujte nákupy a přihlašujte se do aplikací pouhým klepnutím na senzor otisků prstů. Dobře zvažte, čí otisky do zařízení přidáte. Uvedené akce bude možné provádět pomocí každého z přidaných otisků.\n\nPoznámka: Otisk prstu může být méně bezpečný než silné gesto nebo PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Zrušit"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Pokračovat"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Přeskočit"</string>
@@ -361,12 +363,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Smazat"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Začínáme!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Umístěte prst na senzor. Až ucítíte vibraci, zvedněte jej."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"OK, nyní to zopakujte"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Pokračujte"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Lehce pohněte prstem, aby se zaznamenaly všechny části otisku"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Otisk byl přidán!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kdykoli se zobrazí tato ikona, můžete se identifikovat nebo autorizovat nákup pomocí svého otisku prstu."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Probuďte a odemkněte zařízení klepnutím na senzor otisků prstů."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Když se zobrazí tato ikona, můžete použít otisk prstu."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Když se zobrazí tato ikona, můžete také autorizovat nákupy nebo se přihlásit do aplikací."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Přeskočit nastavení otisku prstu?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Jako jeden ze způsobů odemknutí telefonu jste se rozhodli používat otisk prstu. Pokud nastavení přeskočíte, bude třeba jej dokončit později. Nastavení trvá jen chviličku."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Nastavit zámek obrazovky"</string>
@@ -853,6 +855,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Aktualizace tísňové adresy"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Adresa, kterou tísňové služby použijí jako vaši polohu, pokud zavoláte 112 přes Wi-Fi"</string>
     <string name="home_settings" msgid="212375129455718176">"Plocha"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Obrazovka"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
@@ -1075,6 +1079,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Zapomenout"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Nastavit"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Prozkoumat"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Uvolnit místo"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Spravovat úložiště"</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>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Zařízení pro média (MTP)"</string>
@@ -1111,8 +1117,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Zvuk"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Data uložená v mezipaměti"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Jiné"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Systém"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Prozkoumat úložiště <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Mezi ostatní soubory patří sdílené soubory uložené aplikacemi, soubory stažené z internetu nebo přes Bluetooth, soubory systému Android apod. \n\nChcete-li zobrazit veškerý obsah s názvem <xliff:g id="NAME">^1</xliff:g>, klepněte na Prozkoumat."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Systém zahrnuje soubory, které interně používá operační systém Android. \n\nTyto soubory nelze jednotlivě zobrazit."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> může mít uložené fotky, hudbu, filmy, aplikace a další data, která v úložišti zabírají <xliff:g id="SIZE">^2</xliff:g>. \n\nChcete-li zobrazit podrobnosti, přepněte na účet uživatele <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1303,7 +1311,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Právní informace"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Přispěvatelé"</string>
     <string name="manual" msgid="3025943393642974445">"Příručka"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Regulační informace"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Regulační štítky"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Bezpečnostní a regulační informace"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autorská práva"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Smluvní podmínky"</string>
@@ -2264,6 +2273,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Trvalá síť VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Nebyly přidány žádné sítě VPN."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Trvalá síť VPN je aktivní"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Aplikace tuto funkci nepodporuje"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Vyberte profil VPN, ke kterému chcete zůstat trvale připojeni. Síťový provoz bude povolen pouze v případě, že budete připojeni k této síti VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Žádná"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Trvalá síť VPN vyžaduje IP adresu pro server i DNS."</string>
@@ -2540,6 +2550,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"odemknutí přejetím prstem, heslo, gesto, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"pracovní výzva, práce, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"pracovní profil, spravovaný profil, sjednotit, sjednocení, práce, profil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</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>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Klepnutím na štítek zahájíte zápis..."</string>
@@ -3051,7 +3062,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Data na pozadí jsou dostupná pouze prostřednictvím Wi-Fi. Tato skutečnost může mít vliv na některé aplikace a služby, pokud síť Wi-Fi není k dispozici."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Pracovní profil je vypnutý"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Aplikace, synchronizace na pozadí a další funkce související s pracovním profilem jsou vypnuty."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Návrhy (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Návrhy"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Odstranit"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Studené barvy"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Použijí se studenější barvy zobrazení"</string>
@@ -3146,6 +3158,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Resetovat počítadla limitů četnosti služby ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Správa oznámení na obrazovce uzamčení"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Zobrazit nebo skrýt obsah oznámení"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Vše"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Podpora"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Minimální šířka"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Žádné nainstalované aplikace o přístup k prémiovým SMS nepožádaly"</string>
@@ -3153,9 +3167,49 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Přístup k prémiovým SMS"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Vypnuto"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Ukázkový režim"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Rádi vám pomůžeme"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Jsme tu pro vás non-stop"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Náš tým podpory vám pomůže vyřešit všechny problémy"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Náš tým podpory je vám neustále k dispozici"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Pracovní doba telefonické podpory (v místním čase)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Prozkoumejte nápovědu nebo si projděte tipy a triky"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Podpora pro zemi:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> – <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Cestujete do zahraničí?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Mohou být účtovány poplatky za mezinárodní volání"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Prozkoumat tipy a triky"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Vyhledat nápovědu a odeslat zpětnou vazbu"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Chcete-li kontaktovat podporu, přihlaste se"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Přihlásit se"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Nedaří se vám přihlásit k účtu?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Odeslání systémových informací"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Abychom vám pomohli problém rychle vyřešit, pro účely diagnostiky potřebujeme systémové informace."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Příště již nezobrazovat"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Nastavení pracovního profilu"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Vyhledávání kontaktů"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Povolit vyhledávání kontaktů organizací za účelem identifikace volajících a kontaktů"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> hodiny</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> hodiny</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> hodin</item>
+      <item quantity="one">1 hodina</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> minuty</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> minuty</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minut</item>
+      <item quantity="one">1 minuta</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> sekundy</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> sekundy</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekund</item>
+      <item quantity="one">1 sekunda</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Odhadované čekání: ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Počítač"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Náhlavní souprava"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telefon"</string>
@@ -3163,4 +3217,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Sluchátka"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Periferní vstupní zařízení"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Správce úložiště vám pomůže uvolnit místo v úložišti tím, že ze zařízení odstraní zálohované fotky a videa."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Odstranit fotky a videa"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Správce úložiště"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automaticky"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Ruční"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Gesta"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Spuštění fotoaparátu"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Chcete-li rychle spustit fotoaparát, stačí dvakrát klepnout na vypínač. Funguje to na všech obrazovkách."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Přepnutí fotoaparátu"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Chcete-li přepnout mezi předním a zadním fotoaparátem, dvakrát otočte zařízením."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Rychlá kontrola obrazovky"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Telefon můžete zkontrolovat, aniž byste jej museli úplně probudit. Stačí jím pohnout nebo jej zvednout."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Zobrazení oznámení přejetím prstem"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Oznámení můžete zkontrolovat na libovolné obrazovce. Stačí přejet prstem dolů po snímači otisků prstů."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Zapnuto"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Vypnuto"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Zavaděč je již odemknut"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Nejprve se připojte k internetu"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Není k dispozici v zařízeních uzamčených operátorem"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 73a302c..d59164a 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Pink"</item>
     <item msgid="6131821495505931173">"Rød"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Mere end 30 dage gammel"</item>
+    <item msgid="2900554746706302178">"Mere end 60 dage gammel"</item>
+    <item msgid="5692284879054004388">"Mere end 90 dage gammel"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-da/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-da/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-da/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 39b0edb..c0d73e5 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Aktivér dataforbindelse"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Deaktiver dataforbindelse"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE er aktiveret"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videoopkald aktiveret"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi-opkald aktiveret"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Mobilsendestyrke"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Vis adressebog på SIM-kortet"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Vis numre til begrænset opkald"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Lås op med fingeraftryk"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Du sætter blot fingeren på fingeraftrykslæseren for at låse telefonen op, godkende køb eller logge ind i apps. Vær forsigtig med, hvem du tilføjer. Selv ét fingeraftryk, der føjes til din telefon, kan gøre disse ting.\n\nBemærk! Adgang via fingeraftryk kan være mindre sikkert end adgang via et stærkt mønster eller en stærk pinkode. "<annotation id="url">"Få flere oplysninger"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Du sætter blot fingeren på fingeraftrykslæseren for at låse telefonen op, godkende køb eller logge ind i apps. Vær forsigtig med, hvem du tilføjer. Selv ét fingeraftryk, der føjes til din telefon, kan gøre disse ting.\n\nBemærk! Dit fingeraftryk kan være mindre sikkert end et stærkt mønster eller en stærk pinkode."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Annuller"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Fortsæt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Spring over"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Slet"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Lad os komme i gang!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Placer fingeren på sensoren, og løft, når du mærker en vibration"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Godt gået! Gentag processen"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Bliv ved"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Bevæg fingeren en smule for at få hele fingeraftrykket med"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Fingeraftryk tilføjet!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Når du ser dette ikon, kan du bruge dit fingeraftryk til brugeridentifikation eller til at godkende et køb."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Tryk på fingeraftrykssensoren for at vække din enhed og låse den op."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Når du ser dette ikon, kan du bruge dit fingeraftryk."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Når du ser dette ikon, kan du også godkende køb eller logge ind i apps."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Vil du springe registrering af fingeraftryk over?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Du har valgt at bruge fingeraftryk som en metode til at låse din telefon op. Hvis du springer det over nu, skal du konfigurere dette senere. Konfigurationen tager kun omkring et minut."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Konfigurer skærmlås"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Opdater alternativ adresse"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Den adresse, der anvendes af nødtjenester som din placering, hvis du ringer op til 112 via Wi-Fi."</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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Glem"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Konfigurer"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Åbn"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Frigør plads"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Administrer lagerplads"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-tilslutning til computer"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Tilslut som"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Medieenhed (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Lyd"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Cachelagrede data"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Andet"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Åbn <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Andre filer omfatter delte filer, som er gemt af apps, filer, som er downloadet fra internettet eller via Bluetooth, Android-filer osv. \n\nTryk på Åbn for at se alt indhold på dette <xliff:g id="NAME">^1</xliff:g>."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"System indeholder filer, der anvendes internt af Androids operativsystem. \n\nDu kan ikke se disse filer hver for sig."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> kan have gemt billeder, musik, film, apps og andre data, som bruger <xliff:g id="SIZE">^2</xliff:g> af lagerpladsen. \n\nFå flere oplysninger ved at skifte til <xliff:g id="USER_1">^1</xliff:g>."</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 ekstern lagerplads"</string>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Juridiske oplysninger"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Bidragydere"</string>
     <string name="manual" msgid="3025943393642974445">"Brugervejledning"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Certificeringer"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Etiketter for regler"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Oplysninger om sikkerhed og regler"</string>
     <string name="copyright_title" msgid="865906688917260647">"Ophavsret"</string>
     <string name="license_title" msgid="1990487604356037871">"Licens"</string>
     <string name="terms_title" msgid="7697580845616764642">"Vilkår og betingelser"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN altid aktiveret"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Der er ikke tilføjet nogen VPN-netværk."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Altid slået til er aktiveret"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Dette understøttes ikke af denne app"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Vælg en VPN-profil, der altid skal være forbindelse til. Netværkstrafik tillades kun, når der er forbindelse til dette VPN-netværk."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Ingen"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Et altid aktiveret VPN kræver en IP-adresse til både server og DNS."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"stryg for at låse op, adgangskode, mønster, pinkode"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"arbejdsudfordring, arbejde, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"arbejdsprofil, administreret profil, samle, samling, arbejde, profil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"bevægelse"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Konfigurer NFC-tag for Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tryk på et tag for at skrive..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Baggrundsdata er kun tilgængelig via Wi-Fi. Dette kan påvirke nogle apps eller tjenester, når Wi-Fi er ikke tilgængelig."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Arbejdsprofilen er slået fra"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Apps, baggrundssynkronisering og andre funktioner, der er relateret til din arbejdsprofil, er slået fra."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Forslag (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Forslag"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"Mere end <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Fjern"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Kølig farvetemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Brug køligere skærmfarver"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Vil du nulstille tællere til antalsbegrænsning i ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrollér underretninger for låseskærm"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Vis eller skjul indhold i underretninger"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Alle"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Support"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Mindste bredde"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ingen installerede apps har anmodet adgang til premium-sms"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Adgang til premium-sms"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Deaktiveret"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Demotilstand"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Vi er her for at hjælpe dig"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Vi er her døgnet rundt alle ugens dage"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Vores supportteam er her for at hjælpe med alle problemer"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Vores supportteam er tilgængeligt døgnet rundt hver dag."</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Åbningstider for telefonsupport (lokal tid)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Søg i Hjælp, eller find tips og tricks"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Support for:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> – <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Er du ude at rejse i udlandet?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Der opkræves muligvis et gebyr ved opkald til udlandet"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat…"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Find tips og tricks"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Søg i Hjælp, og send feedback"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Log ind for at få support"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Log ind"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Kan du ikke få adgang til din konto?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Send systemoplysninger"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"For at hjælpe dig med hurtigt at løse problemet skal vi bruge systemoplysninger for at diagnosticere problemet."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Vis ikke igen"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Indstillinger for arbejdsprofil"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Søgning efter kontaktpersoner"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Tillad søgninger efter kontaktpersoner efter din organisation for at identificere kontaktpersoner og personer, der ringer"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> time</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> timer</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minut</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutter</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> sekund</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekunder</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Ventetiden er ca. <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Computer"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Headset"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telefon"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Hovedtelefoner"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Eksterne inputenheder"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"For at hjælpe med at frigøre lagerplads fjerner lagerstyringen sikkerhedskopierede billeder og videoer fra din enhed."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Fjern billeder og videoer"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Lagerstyring"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatisk"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuel"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Bevægelser"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Spring til kamera"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Du kan åbne dit kamera hurtigt ved at trykke to gange på afbryderknappen. Det fungerer fra enhver skærm."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Vip kameraet"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Du kan skifte mellem kameraet på forsiden og bagsiden ved at dreje enheden to gange."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Hurtigt skærmtjek"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Du kan kontrollere din telefon uden at vække den helt op ved at skubbe forsigtigt til den eller samle den op."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Stryg for at se underretninger"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Du kan se dine underretninger fra enhver skærm ved at stryge nedad på fingeraftrykslæseren."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Til"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Fra"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloaderen er allerede låst op"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Du skal først oprette forbindelse til internettet"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Indstillingen er ikke tilgængelig på SIM-låste enheder"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 9417010..ae1e71b 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Pink"</item>
     <item msgid="6131821495505931173">"Rot"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Älter als 30 Tage"</item>
+    <item msgid="2900554746706302178">"Älter als 60 Tage"</item>
+    <item msgid="5692284879054004388">"Älter als 90 Tage"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-de/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-de/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-de/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index eafeeaf..339b0b6 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Datenverbindung aktivieren"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Datenverbindung deaktivieren"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE-Kennzeichnung"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videoanrufe eingerichtet"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"WLAN-Anrufe eingerichtet"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Mobilfunkstärke"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM-Adressbuch anzeigen"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Zugelassene Rufnummern anzeigen"</string>
@@ -333,7 +335,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Mit Fingerabdruck entsperren"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Tippe einfach auf den Fingerabdrucksensor, um dein Smartphone zu entsperren, Käufe zu autorisieren oder dich in Apps anzumelden. Überlege genau, wessen Fingerabdrücke du hinzufügst, da ein Fingerabdruck ausreicht, um alle diese Aktionen auszuführen.\n\nHinweis: Dein Fingerabdruck ist möglicherweise nicht so sicher wie ein komplexes Muster oder eine PIN. "<annotation id="url">"Weitere Informationen"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Tippe einfach auf den Fingerabdrucksensor, um dein Smartphone zu entsperren, Käufe zu autorisieren oder dich in Apps anzumelden. Überlege genau, welche Fingerabdrücke du hinzufügen möchtest, da diese Aktionen mit allen Fingerabdrücken ausgeführt werden können, die du zu deinem Smartphone hinzufügst.\n\nHinweis: Dein Fingerabdruck ist möglicherweise nicht so sicher wie ein komplexes Muster oder eine PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Abbrechen"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Weiter"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Überspringen"</string>
@@ -354,12 +356,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Löschen"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Los geht\'s!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Lege deinen Finger auf den Sensor und hebe ihn an, wenn du eine Vibration spürst."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Super! Noch einmal."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Berühre den Sensor noch einmal"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Bewege deinen Finger etwas, um alle unterschiedlichen Teile deines Fingerabdrucks hinzuzufügen."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Abdruck hinzugefügt"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Wenn du dieses Symbol siehst, kannst du deinen Fingerabdruck zur Identifizierung oder zur Autorisierung eines Kaufs verwenden."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Tippe einfach auf den Fingerabdrucksensor, um dein Gerät zu aktivieren und zu entsperren."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Wenn du dieses Symbol siehst, kannst du deinen Fingerabdruck verwenden."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Wenn dieses Symbol angezeigt wird, kannst du auch Käufe autorisieren oder dich in Apps anmelden."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Fingerabdruck-Einrichtung überspringen?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Du hast festgelegt, dass du unter anderem deinen Fingerabdruck zum Entsperren deines Smartphones verwenden möchtest. Wenn du diesen Schritt jetzt überspringst, musst du die Einrichtung zu einem späteren Zeitpunkt vornehmen. Die Einrichtung dauert nur ca. eine Minute."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Displaysperre einrichten"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wenn die Option \"Anrufe über WLAN\" aktiviert ist, kann dein Smartphone abhängig von deiner Einstellung und von der Signalstärke Anrufe über WLAN-Netzwerke oder über das Netz deines Mobilfunkanbieters übertragen. Erkundige dich bei deinem Mobilfunkanbieter über die hierfür erhobenen Gebühren und andere Informationen, bevor du diese Funktion aktivierst."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"Notfalladresse aktualisieren"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Adresse, die bei einem Notruf über WLAN von Notdiensten als dein Standort verwendet wird"</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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Entfernen"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Einrichten"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Erkunden"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Speicherplatz freigeben"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Speicher verwalten"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-Verbindung (PC)"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Verbinden als"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Mediengerät (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audiodateien"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Daten im Cache"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Andere"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> erkunden"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"\"Andere\" beinhaltet beispielsweise von Apps gespeicherte gemeinsam genutzte Dateien, aus dem Internet oder per Bluetooth heruntergeladene Dateien oder Android-Dateien. \n\nTippe zum Ansehen des gesamten Inhalts von \"<xliff:g id="NAME">^1</xliff:g>\" auf \"Erkunden\"."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"System enthält Dateien, die intern vom Android-Betriebssystem verwendet werden. \n\nDiese Dateien können nicht einzeln aufgerufen werden."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> kann Fotos, Musik, Filme, Apps oder sonstige Daten gespeichert haben, die <xliff:g id="SIZE">^2</xliff:g> Speicher belegen. \n\nWechsle zum Ansehen von Details zu <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Rechtliche Hinweise"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Mitwirkende"</string>
     <string name="manual" msgid="3025943393642974445">"Handbuch"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Regulatorische Informationen"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Regulierungslabels"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Sicherheits- &amp; Regulierungsinformationen"</string>
     <string name="copyright_title" msgid="865906688917260647">"Urheberrecht"</string>
     <string name="license_title" msgid="1990487604356037871">"Lizenz"</string>
     <string name="terms_title" msgid="7697580845616764642">"Nutzungsbedingungen"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Durchgehend aktives VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Keine VPNs hinzugefügt."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Always-On-Modus aktiviert"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Von dieser App nicht unterstützt"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Wähle ein VPN-Profil für eine durchgehende Verbindung aus. Netzwerkverkehr ist nur möglich, wenn eine Verbindung zu diesem VPN besteht."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Keines"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Für ein durchgehend aktives VPN ist eine IP-Adresse für den Server und für das DNS erforderlich."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"zum entsperren über das display streichen, zum entsperren wischen, passwort, muster, pin"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"herausforderung bei der arbeit, arbeit, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"arbeitsprofil, verwaltetes profil, gruppieren, gruppierung, arbeit, profil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"Bewegung"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"WLAN-NFC-Tag einrichten"</string>
     <string name="write_tag" msgid="8571858602896222537">"Schreiben"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Zum Schreiben auf ein Tag tippen…"</string>
@@ -2991,7 +3002,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Hintergrunddaten sind nur über WLAN verfügbar. Diese Einstellung kann sich auf einige Apps oder Dienste auswirken, wenn kein WLAN verfügbar ist."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Arbeitsprofil deaktiviert"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Apps, Synchronisierung im Hintergrund und andere mit deinem Arbeitsprofil verknüpfte Funktionen sind deaktiviert."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Vorschläge (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Vorschläge"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Entfernen"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Kalte Farbtemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Kältere Displayfarben verwenden"</string>
@@ -3084,6 +3096,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Zähler für Zugriffsbegrenzungen im ShortcutManager zurücksetzen?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Sperrbildschirm-Benachr. verwalten"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Benachrichtigungsinhalt ein- oder ausblenden"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Alle"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Hilfe"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Geringste Breite"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Keine installierte App hat Zugriff auf Premium-SMS angefordert"</string>
@@ -3091,9 +3105,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Zugriff auf Premium-SMS"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Deaktiviert"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Demomodus"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Wir sind für dich da"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Wir sind täglich rund um die Uhr für dich da"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Unser Kundenservice steht dir zur Verfügung"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Unser Kundenservice steht täglich rund um die Uhr zur Verfügung"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Geschäftszeiten des telefonischen Supports (Ortszeit)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Hilfe durchsuchen oder Tipps &amp; Tricks erkunden"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Kundenservice für:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> – <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Auslandsreise geplant?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Es können Gebühren für Auslandsgespräche anfallen"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Anrufen"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chatten"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Tipps &amp; Tricks erkunden"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Hilfe durchsuchen &amp; Feedback senden"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Für Support anmelden"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Anmelden"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Du kannst nicht auf dein Konto zugreifen?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Systeminformationen senden"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Um dein Problem schnell beheben zu können, benötigen wir für die Diagnose Systeminformationen."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Nicht noch einmal anzeigen"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Einstellungen für Arbeitsprofil"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Suche nach Kontakten"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Suche nach Kontakten durch deine Organisation erlauben, um Anrufer und Kontakte zu identifizieren"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> Stunden</item>
+      <item quantity="one">1 Stunde</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> Minuten</item>
+      <item quantity="one">1 Minute</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> Sekunden</item>
+      <item quantity="one">1 Sekunde</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> Wartezeit"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Computer"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Headset"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Smartphone"</string>
@@ -3101,4 +3149,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Kopfhörer"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Eingabeperipherie"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Zur Freigabe von Speicherplatz entfernt der Speichermanager Back-ups von Fotos und Videos von deinem Gerät."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Fotos &amp; Videos entfernen"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Speichermanager"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatisch"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuell"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Bewegungen"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Zur Kamera wechseln"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Starte die Kamera direkt, indem du die Ein-/Aus-Taste zweimal schnell drückst. Dies funktioniert auf jedem Bildschirm."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Kamera wechseln"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Wechsle zwischen der Kamera vorne und der Kamera hinten, indem du das Smartphone schnell zweimal drehst."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Kurzer Blick auf das Display"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Sieh dir das Display deines Smartphones an, ohne es ganz einzuschalten, indem du es leicht anstößt oder aufhebst."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Für Benachrichtigungen wischen"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Rufe deine Benachrichtigungen auf beliebigen Bildschirmen auf, indem du über den Fingerabdrucksensor nach unten wischst."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"An"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Aus"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader ist bereits entsperrt"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Zuerst mit dem Internet verbinden"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Auf vom Mobilfunkanbieter gesperrten Geräten nicht verfügbar"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 16e7031..28c8d74 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Ροζ"</item>
     <item msgid="6131821495505931173">"Κόκκινο"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Πάνω από 30 ημερών"</item>
+    <item msgid="2900554746706302178">"Πάνω από 60 ημερών"</item>
+    <item msgid="5692284879054004388">"Πάνω από 90 ημερών"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-el/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-el/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-el/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 4fe9500..7445585 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Ενεργοποίηση σύνδεσης δεδομένων"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Απενεργοποίηση σύνδεσης δεδομένων"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Παρέχεται από την VoLTE"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Παρέχεται δυνατότητα βιντεοκλήσης"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Παρέχεται δυνατότητα κλήσης μέσω Wi-Fi"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Ισχύς πομπού κινητής τηλεφωνίας"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Προβολή βιβλίου διευθύνσεων κάρτας SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Προβολή προκαθορισμένων αριθμών κλήσης"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Ξεκλείδ. με δακτ. αποτύπωμα"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Απλώς αγγίξτε τον αισθητήρα δακτυλικών αποτυπωμάτων για να ξεκλειδώσετε το τηλέφωνό σας, να εγκρίνετε αγορές ή να συνδεθείτε σε εφαρμογές. Να είστε προσεκτικοί με τα δακτυλικά αποτυπώματα που προσθέτετε. Αυτές οι ενέργειες θα μπορούν να γίνουν ακόμη και με ένα μόνο δακτυλικό αποτύπωμα που προσθέτετε.\n\nΣημείωση: Το δακτυλικό σας αποτύπωμα ενδέχεται να είναι λιγότερο ασφαλές από ό,τι ένα ισχυρό μοτίβο ή ένας κωδικός PIN. "<annotation id="url">"Μάθετε περισσότερα"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Αγγίξτε απλώς τον αισθητήρα δακτυλικών αποτυπωμάτων για να ξεκλειδώσετε το τηλέφωνό σας, να επιτρέψετε αγορές ή να συνδεθείτε σε εφαρμογές. Να είστε προσεκτικοί με τα δακτυλικά αποτυπώματα που προσθέτετε. Αυτές οι ενέργειες θα μπορούν να γίνουν ακόμη και με ένα μόνο δακτυλικό αποτύπωμα που προσθέτετε.\n\nΣημείωση: Το ξεκλείδωμα με δακτυλικά αποτυπώματα ενδέχεται να είναι λιγότερο ασφαλές από ό, τι ένα ισχυρό μοτίβο ή κωδικός PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Ακύρωση"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Συνέχεια"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Παράλειψη"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Διαγραφή"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Ας ξεκινήσουμε!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Τοποθετήστε το δάχτυλό σας στον αισθητήρα και ανασηκώστε το μόλις αισθανθείτε μια δόνηση"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Τέλεια! Επαναλάβετε."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Συνέχεια"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Κουνήστε ελαφρώς το δάχτυλό σας για να προσθέσετε όλα τα διαφορετικά τμήματα του δαχτυλικού σας αποτυπώματος"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Προστέθηκε μον.χαρακ.!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Όποτε βλέπετε αυτό το εικονίδιο, μπορείτε να χρησιμοποιείτε το μοναδικό χαρακτηριστικό σας για την ταυτοποίηση ή την εξουσιοδότηση μιας αγοράς."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Απλά αγγίξτε τον αισθητήρα δακτυλικών αποτυπωμάτων για να αφυπνίσετε και να ξεκλειδώσετε τη συσκευή σας."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Μόλις εμφανιστεί αυτό το εικονίδιο, μπορείτε να χρησιμοποιήσετε τα δακτυλικά σας αποτυπώματα."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Όταν βλέπετε αυτό το εικονίδιο, μπορείτε επίσης να εξουσιοδοτείτε αγορές ή αν συνδέεστε σε εφαρμογές."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Παράβλεψη ρύθμ. μοναδ. χαρακτηριστικού;"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Επιλέξατε να χρησιμοποιήσετε το μοναδικό χαρακτηριστικό σας ως έναν τρόπο για να ξεκλειδώσετε το τηλέφωνό σας. Εάν κάνετε παράβλεψη τώρα, θα πρέπει να το ρυθμίσετε αυτό αργότερα. Η εγκατάσταση διαρκεί μόνο ένα λεπτό περίπου."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Ρύθμιση κλειδώματος οθόνης"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Όταν είναι ενεργοποιημένη η λειτουργία κλήσης μέσω Wi-Fi, το τηλέφωνό σας μπορεί να δρομολογεί κλήσεις μέσω δικτύων Wi-Fi ή του δικτύου της εταιρείας κινητής τηλεφωνίας, ανάλογα με την προτίμησή σας και την ισχύ του κάθε σήματος. Πριν ενεργοποιήσετε τη λειτουργία, ρωτήστε την εταιρεία κινητής τηλεφωνίας για να μάθετε σχετικά με τις χρεώσεις και άλλες λεπτομέρειες."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"Ενημέρωση διεύθυνσης έκτακτης ανάγκης"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Η διεύθυνση που χρησιμοποιείται από τις υπηρεσίες έκτακτης ανάγκης, ως η τοποθεσία σας εάν πραγματοποιήσετε μια κλήση στο 911 χρησιμοποιώντας 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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Διαγραφή"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Ρύθμιση"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Εξερεύνηση"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Ελευθερώστε χώρο"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Διαχείριση αποθηκευτικού χώρου"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Σύνδεση υπολογιστή μέσω USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Σύνδεση ως"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Συσκευή πολυμέσων (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Ήχος"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Δεδομένα κρυφής μνήμης"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Άλλα"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Σύστημα"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Εξερεύνηση <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Η ενότητα \"Άλλα\" περιέχει κοινόχρηστα αρχεία που έχουν αποθηκεύσει οι εφαρμογές, αρχεία που έχετε κατεβάσει από το διαδίκτυο ή αρχεία Bluetooth, Android κ.ο.κ. \n\nΓια να δείτε όλα τα περιεχόμενα αυτής της συσκευής <xliff:g id="NAME">^1</xliff:g>, πατήστε \"Εξερεύνηση\"."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Το σύστημα περιλαμβάνει αρχεία τα οποία χρησιμοποιούνται εσωτερικά από το λειτουργικό σύστημα Android. \n\nΔεν είναι δυνατή η μεμονωμένη προβολή αυτών των αρχείων."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Ο χρήστης <xliff:g id="USER_0">^1</xliff:g> μπορεί να έχει αποθηκευμένες φωτογραφίες, μουσική, ταινίες, εφαρμογές ή άλλα δεδομένα που καταλαμβάνουν <xliff:g id="SIZE">^2</xliff:g> στο χώρο αποθήκευσης. \n\nΓια να δείτε λεπτομέρειες, κάντε εναλλαγή στο χρήστη <xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Νομικές πληροφορίες"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Συνεργάτες"</string>
     <string name="manual" msgid="3025943393642974445">"Εγχειρίδιο χρήσης"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Ρυθμιστικές πληροφορίες"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Ρυθμιστικές ετικέτες"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Πληροφορίες ασφάλειας και κανονισμών"</string>
     <string name="copyright_title" msgid="865906688917260647">"Πνευματικά δικαιώματα"</string>
     <string name="license_title" msgid="1990487604356037871">"Άδεια"</string>
     <string name="terms_title" msgid="7697580845616764642">"Όροι και προϋποθέσεις"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Πάντα ενεργοποιημένο VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Δεν έχουν προστεθεί VPN."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Πάντα ενεργό"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Δεν υποστηρίζεται από αυτήν την εφαρμογή"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Επιλέξτε ένα προφίλ VPN στο οποίο θα παραμένετε πάντα συνδεδεμένοι. Η κίνηση δικτύου θα επιτρέπεται μόνο κατά τη σύνδεση σε αυτό το VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Κανένα"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Το VPN που έχει ρυθμιστεί να είναι ενεργοποιημένο πάντα απαιτεί μια διεύθυνση IP τόσο για τον διακομιστή όσο και για το DNS."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"σύρετε για ξεκλείδωμα, κωδικός πρόσβασης, μοτίβο, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"πρόκληση εργασίας, εργασία, προφίλ"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"προφίλ εργασίας, διαχειριζόμενο προφίλ, ενοποιώ, ενοποίηση, εργασία, προφίλ"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"κίνηση"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Ρύθμιση ετικέτας ΕΚΠ Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Εγγραφή"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Αγγίξτε μια ετικέτα για εγγραφή…"</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Τα δεδομένα παρασκηνίου είναι διαθέσιμα μόνο μέσω Wi-Fi. Αυτό ενδέχεται να επηρεάσει ορισμένες εφαρμογές ή υπηρεσίες όταν δεν υπάρχει διαθέσιμο δίκτυο Wi-Fi."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Προφίλ εργασίας απενεργοποιημ."</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Οι εφαρμογές, ο συγχρονισμός στο παρασκήνιο και άλλες λειτουργίες που σχετίζονται με το προφίλ εργασίας σας έχουν απενεργοποιηθεί."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Προτάσεις (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Προτάσεις"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Κατάργηση"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Ψυχρή θερμοκρασία χρώματος"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Χρήση πιο ψυχρών χρωμάτων οθόνης"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Επαναφορά μετρητών ορίου ρυθμού ShortcutManager;"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Έλεγχος ειδοποιήσεων κλειδώματος οθόνης"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Εμφάνιση ή απόκρυψη περιεχομένου ειδοποιήσεων"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Όλες"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Υποστήριξη"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Μικρότερο πλάτος"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Δεν ζητήθηκε πρόσβαση σε SMS ειδικής χρέωσης από εγκατεστημένες εφαρμογές"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Πρόσβαση σε SMS ειδικής χρέωσης"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Ανενεργό"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Λειτουργία επίδειξης"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Είμαστε εδώ για να σας βοηθήσουμε"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Είμαστε εδώ για εσάς 24/7"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Η ομάδα υποστήριξης είναι εδώ για να σας βοηθήσει να αντιμετωπίσετε τυχόν προβλήματα"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Η ομάδα υποστήριξης είναι διαθέσιμη όλη μέρα, κάθε μέρα"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Ώρες τηλεφωνικής υποστήριξης (τοπική ώρα)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Αναζητήστε βοήθεια ή εξερευνήστε συμβουλές και κόλπα"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Υποστήριξη για:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Ταξιδεύετε στο εξωτερικό;"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Ενδέχεται να ισχύουν διεθνείς χρεώσεις"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Τηλέφωνο"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Συζήτηση"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Εξερευνήστε συμβουλές και κόλπα"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Αναζήτηση βοήθειας και αποστολή σχολίων"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Συνδεθείτε για να λάβετε υποστήριξη"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Σύνδεση"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Δεν έχετε πρόσβαση στον λογαριασμό σας;"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Αποστολή πληροφοριών συστήματος"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Χρειαζόμαστε πληροφορίες συστήματος για διαγνωστικούς σκοπούς, για να σας βοηθήσουμε να αντιμετωπίσετε γρήγορα το πρόβλημα που παρουσιάστηκε."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Να μην εμφανιστεί ξανά"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Ρυθμίσεις προφίλ εργασίας"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Αναζήτηση επαφών"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Επιτρέψτε τις αναζητήσεις επαφών από τον οργανισμό σας, για την αναγνώριση καλούντων και επαφών"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ώρες</item>
+      <item quantity="one">1 ώρα</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> λεπτά</item>
+      <item quantity="one">1 λεπτό</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> δευτερόλεπτα</item>
+      <item quantity="one">1 δευτερόλεπτο</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Αναμονή ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Υπολογιστής"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Ακουστικό"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Τηλέφωνο"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Ακουστικά"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Περιφερειακό εισόδου"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Η Διαχείριση αποθηκευτικού χώρου βοηθά στην απελευθέρωση αποθηκευτικού χώρου καταργώντας από τη συσκευή σας φωτογραφίες και βίντεο για τα οποία έχουν δημιουργηθεί αντίγραφα ασφαλείας."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Κατάργηση φωτογραφιών και βίντεο"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Διαχείριση αποθηκευτικού χώρου"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Αυτόματο"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Εγχειρίδιο χρήσης"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Κινήσεις"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Μετάβαση στην κάμερα"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Για να ανοίξετε γρήγορα την κάμερα, απλώς πατήστε δύο φορές στο κουμπί λειτουργίας. Λειτουργεί για όλες τις οθόνες."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Αναστροφή κάμερας"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Για εναλλαγή μεταξύ μπροστινής και πίσω κάμερας, κάντε διπλή περιστροφή."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Γρήγορος έλεγχος οθόνης"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Για να ελέγξετε το τηλέφωνό σας χωρίς να το ενεργοποιήσετε πλήρως, μετατοπίστε ή σηκώστε το."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Σύρετε για ειδοποιήσεις"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Για να ελέγξετε τις ειδοποιήσεις σας από οποιαδήποτε οθόνη, σύρετε προς τα κάτω στον αισθητήρα δακτυλικών αποτυπωμάτων."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Ενεργό"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Ανενεργό"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Το bootloader είναι ήδη ξεκλείδωτο"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Αρχικά, συνδεθείτε στο διαδίκτυο"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Δεν διατίθεται σε συσκευές που έχουν κλειδωθεί από εταιρεία κινητής τηλεφωνίας"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml
index 887cf10..e0085e7 100644
--- a/res/values-en-rAU/arrays.xml
+++ b/res/values-en-rAU/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Pink"</item>
     <item msgid="6131821495505931173">"Red"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Over 30 days old"</item>
+    <item msgid="2900554746706302178">"Over 60 days old"</item>
+    <item msgid="5692284879054004388">"Over 90 days old"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-en-rAU/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-en-rAU/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-en-rAU/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index d0a3ac4..2b17af1 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Enable data connection"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Disable data connection"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE provisioned"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Video Calling provisioned"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi Calling provisioned"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Mobile radio power"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"View SIM address book"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"View fixed dialling numbers"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Unlock with fingerprint"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Just touch the fingerprint sensor to unlock your phone, authorise purchases or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN. "<annotation id="url">"Find out more"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Just touch the fingerprint sensor to unlock your phone, authorise purchases or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancel"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continue"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Skip"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Delete"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Let\'s start!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Put your finger on the sensor and lift after you feel a vibration"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Great! Now repeat"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Keep going"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Move your finger slightly to add all the different parts of your fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Fingerprint added!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Whenever you see this icon, you can use your fingerprint for identification or to authorise a purchase."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Just touch the fingerprint sensor to wake and unlock your device."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"When you see this icon, you can use your fingerprint."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"When you see this icon, you can also authorise purchases or sign in to apps."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Skip fingerprint setup?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"You’ve chosen to use your fingerprint as one way to unlock your phone. If you skip now, you’ll need to set this up later. Setup takes only a minute or so."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Set up screen lock"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Update Emergency Address"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Address used by emergency services as your location if you make a 999 call using Wi-Fi"</string>
     <string name="home_settings" msgid="212375129455718176">"Home"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Forget"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Set-up"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Explore"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Free up space"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Manage storage"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB computer connection"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Connect as"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Media device (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Cached data"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Other"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explore <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Other includes shared files saved by apps, files downloaded from the Internet or Bluetooth, Android files and so on. \n\nTo see the entire contents of this <xliff:g id="NAME">^1</xliff:g>, tap Explore."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"System includes files used internally by the Android operating system. \n\nThese files can’t be viewed individually."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> may have saved photos, music, movies, apps or other data that is taking up <xliff:g id="SIZE">^2</xliff:g> of storage. \n\nTo view details, switch to <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Legal information"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contributors"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Regulatory information"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Regulatory labels"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Safety &amp; regulatory information"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Terms and conditions"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Always-on VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"No VPNs added."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Always-on active"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Not supported by this app"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Select a VPN profile to always remain connected to. Network traffic will only be allowed when connected to this VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"None"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Always-on VPN requires an IP address for both server and DNS."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"slide to unlock, password, pattern, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"work challenge, work, profile"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"work profile, managed profile, unify, unification, work, profile"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"gesture"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Set up Wi-Fi NFC Tag"</string>
     <string name="write_tag" msgid="8571858602896222537">"Write"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tap a tag to write..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Background data is only available via Wi-Fi. This may affect some apps or services when Wi-Fi is not available."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Work profile is off"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Apps, background sync and other features related to your work profile are turned off."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Suggestions (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Suggestions"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Remove"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Cool colour temperature"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Reset ShortcutManager rate-limiting counters?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Control lock screen notifications"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Show or hide notification content"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"All"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Support"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Smallest width"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"No installed apps have requested Premium SMS access"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium SMS access"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Disabled"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Demo mode"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"We\'re here to help"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"We\'re here for you 24/7"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Our support team is here to help address any issues"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Our support team is available all day, every day"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Phone support hours (local time)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Search help or explore tips &amp; tricks"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Support for:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Traveling aboard?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"International charges may apply"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Phone"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Explore tips &amp; tricks"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Search help &amp; send feedback"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Sign in for support"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Sign In"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Can\'t access your account?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Send system information"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"To help address your issue quickly, we need system information for diagnosis."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Do not show this again"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Work profile settings"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Contact search"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Allow contact searches by your organisation to identify callers and contacts"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> hours</item>
+      <item quantity="one">1 hour</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
+      <item quantity="one">1 minute</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> seconds</item>
+      <item quantity="one">1 second</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> wait"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Computer"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Headset"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telephone"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Headphone"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Input Peripheral"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"To help free up storage space, storage manager removes backed up photos and videos from your device."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Remove photos &amp; videos"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Storage manager"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatic"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestures"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Jump to Camera"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"To quickly open camera, just double-tap the power button. Works from any screen."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Flip camera"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"To switch between front and back cameras, double-twist."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Quick screen check"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"To check your phone without waking it up fully, nudge or pick it up."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Swipe for notifications"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"To check your notifications from any screen, swipe down on the fingerprint sensor."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"On"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Off"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader is already unlocked"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Connect to the Internet first"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Unavailable on mobile-locked devices"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 887cf10..e0085e7 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Pink"</item>
     <item msgid="6131821495505931173">"Red"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Over 30 days old"</item>
+    <item msgid="2900554746706302178">"Over 60 days old"</item>
+    <item msgid="5692284879054004388">"Over 90 days old"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-en-rGB/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-en-rGB/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-en-rGB/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index d0a3ac4..2b17af1 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Enable data connection"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Disable data connection"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE provisioned"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Video Calling provisioned"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi Calling provisioned"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Mobile radio power"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"View SIM address book"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"View fixed dialling numbers"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Unlock with fingerprint"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Just touch the fingerprint sensor to unlock your phone, authorise purchases or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN. "<annotation id="url">"Find out more"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Just touch the fingerprint sensor to unlock your phone, authorise purchases or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancel"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continue"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Skip"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Delete"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Let\'s start!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Put your finger on the sensor and lift after you feel a vibration"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Great! Now repeat"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Keep going"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Move your finger slightly to add all the different parts of your fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Fingerprint added!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Whenever you see this icon, you can use your fingerprint for identification or to authorise a purchase."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Just touch the fingerprint sensor to wake and unlock your device."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"When you see this icon, you can use your fingerprint."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"When you see this icon, you can also authorise purchases or sign in to apps."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Skip fingerprint setup?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"You’ve chosen to use your fingerprint as one way to unlock your phone. If you skip now, you’ll need to set this up later. Setup takes only a minute or so."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Set up screen lock"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Update Emergency Address"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Address used by emergency services as your location if you make a 999 call using Wi-Fi"</string>
     <string name="home_settings" msgid="212375129455718176">"Home"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Forget"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Set-up"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Explore"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Free up space"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Manage storage"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB computer connection"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Connect as"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Media device (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Cached data"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Other"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explore <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Other includes shared files saved by apps, files downloaded from the Internet or Bluetooth, Android files and so on. \n\nTo see the entire contents of this <xliff:g id="NAME">^1</xliff:g>, tap Explore."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"System includes files used internally by the Android operating system. \n\nThese files can’t be viewed individually."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> may have saved photos, music, movies, apps or other data that is taking up <xliff:g id="SIZE">^2</xliff:g> of storage. \n\nTo view details, switch to <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Legal information"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contributors"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Regulatory information"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Regulatory labels"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Safety &amp; regulatory information"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Terms and conditions"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Always-on VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"No VPNs added."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Always-on active"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Not supported by this app"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Select a VPN profile to always remain connected to. Network traffic will only be allowed when connected to this VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"None"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Always-on VPN requires an IP address for both server and DNS."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"slide to unlock, password, pattern, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"work challenge, work, profile"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"work profile, managed profile, unify, unification, work, profile"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"gesture"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Set up Wi-Fi NFC Tag"</string>
     <string name="write_tag" msgid="8571858602896222537">"Write"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tap a tag to write..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Background data is only available via Wi-Fi. This may affect some apps or services when Wi-Fi is not available."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Work profile is off"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Apps, background sync and other features related to your work profile are turned off."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Suggestions (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Suggestions"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Remove"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Cool colour temperature"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Reset ShortcutManager rate-limiting counters?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Control lock screen notifications"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Show or hide notification content"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"All"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Support"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Smallest width"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"No installed apps have requested Premium SMS access"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium SMS access"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Disabled"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Demo mode"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"We\'re here to help"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"We\'re here for you 24/7"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Our support team is here to help address any issues"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Our support team is available all day, every day"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Phone support hours (local time)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Search help or explore tips &amp; tricks"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Support for:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Traveling aboard?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"International charges may apply"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Phone"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Explore tips &amp; tricks"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Search help &amp; send feedback"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Sign in for support"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Sign In"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Can\'t access your account?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Send system information"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"To help address your issue quickly, we need system information for diagnosis."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Do not show this again"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Work profile settings"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Contact search"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Allow contact searches by your organisation to identify callers and contacts"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> hours</item>
+      <item quantity="one">1 hour</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
+      <item quantity="one">1 minute</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> seconds</item>
+      <item quantity="one">1 second</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> wait"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Computer"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Headset"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telephone"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Headphone"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Input Peripheral"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"To help free up storage space, storage manager removes backed up photos and videos from your device."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Remove photos &amp; videos"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Storage manager"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatic"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestures"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Jump to Camera"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"To quickly open camera, just double-tap the power button. Works from any screen."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Flip camera"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"To switch between front and back cameras, double-twist."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Quick screen check"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"To check your phone without waking it up fully, nudge or pick it up."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Swipe for notifications"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"To check your notifications from any screen, swipe down on the fingerprint sensor."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"On"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Off"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader is already unlocked"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Connect to the Internet first"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Unavailable on mobile-locked devices"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index 887cf10..e0085e7 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Pink"</item>
     <item msgid="6131821495505931173">"Red"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Over 30 days old"</item>
+    <item msgid="2900554746706302178">"Over 60 days old"</item>
+    <item msgid="5692284879054004388">"Over 90 days old"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-en-rIN/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-en-rIN/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-en-rIN/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index d0a3ac4..2b17af1 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Enable data connection"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Disable data connection"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE provisioned"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Video Calling provisioned"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi Calling provisioned"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Mobile radio power"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"View SIM address book"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"View fixed dialling numbers"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Unlock with fingerprint"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Just touch the fingerprint sensor to unlock your phone, authorise purchases or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN. "<annotation id="url">"Find out more"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Just touch the fingerprint sensor to unlock your phone, authorise purchases or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancel"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continue"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Skip"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Delete"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Let\'s start!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Put your finger on the sensor and lift after you feel a vibration"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Great! Now repeat"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Keep going"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Move your finger slightly to add all the different parts of your fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Fingerprint added!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Whenever you see this icon, you can use your fingerprint for identification or to authorise a purchase."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Just touch the fingerprint sensor to wake and unlock your device."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"When you see this icon, you can use your fingerprint."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"When you see this icon, you can also authorise purchases or sign in to apps."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Skip fingerprint setup?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"You’ve chosen to use your fingerprint as one way to unlock your phone. If you skip now, you’ll need to set this up later. Setup takes only a minute or so."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Set up screen lock"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Update Emergency Address"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Address used by emergency services as your location if you make a 999 call using Wi-Fi"</string>
     <string name="home_settings" msgid="212375129455718176">"Home"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Forget"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Set-up"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Explore"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Free up space"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Manage storage"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB computer connection"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Connect as"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Media device (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Cached data"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Other"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explore <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Other includes shared files saved by apps, files downloaded from the Internet or Bluetooth, Android files and so on. \n\nTo see the entire contents of this <xliff:g id="NAME">^1</xliff:g>, tap Explore."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"System includes files used internally by the Android operating system. \n\nThese files can’t be viewed individually."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> may have saved photos, music, movies, apps or other data that is taking up <xliff:g id="SIZE">^2</xliff:g> of storage. \n\nTo view details, switch to <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Legal information"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contributors"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Regulatory information"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Regulatory labels"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Safety &amp; regulatory information"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Terms and conditions"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Always-on VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"No VPNs added."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Always-on active"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Not supported by this app"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Select a VPN profile to always remain connected to. Network traffic will only be allowed when connected to this VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"None"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Always-on VPN requires an IP address for both server and DNS."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"slide to unlock, password, pattern, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"work challenge, work, profile"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"work profile, managed profile, unify, unification, work, profile"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"gesture"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Set up Wi-Fi NFC Tag"</string>
     <string name="write_tag" msgid="8571858602896222537">"Write"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tap a tag to write..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Background data is only available via Wi-Fi. This may affect some apps or services when Wi-Fi is not available."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Work profile is off"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Apps, background sync and other features related to your work profile are turned off."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Suggestions (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Suggestions"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Remove"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Cool colour temperature"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Reset ShortcutManager rate-limiting counters?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Control lock screen notifications"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Show or hide notification content"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"All"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Support"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Smallest width"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"No installed apps have requested Premium SMS access"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium SMS access"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Disabled"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Demo mode"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"We\'re here to help"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"We\'re here for you 24/7"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Our support team is here to help address any issues"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Our support team is available all day, every day"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Phone support hours (local time)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Search help or explore tips &amp; tricks"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Support for:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Traveling aboard?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"International charges may apply"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Phone"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Explore tips &amp; tricks"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Search help &amp; send feedback"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Sign in for support"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Sign In"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Can\'t access your account?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Send system information"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"To help address your issue quickly, we need system information for diagnosis."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Do not show this again"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Work profile settings"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Contact search"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Allow contact searches by your organisation to identify callers and contacts"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> hours</item>
+      <item quantity="one">1 hour</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
+      <item quantity="one">1 minute</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> seconds</item>
+      <item quantity="one">1 second</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> wait"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Computer"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Headset"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telephone"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Headphone"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Input Peripheral"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"To help free up storage space, storage manager removes backed up photos and videos from your device."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Remove photos &amp; videos"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Storage manager"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatic"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestures"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Jump to Camera"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"To quickly open camera, just double-tap the power button. Works from any screen."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Flip camera"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"To switch between front and back cameras, double-twist."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Quick screen check"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"To check your phone without waking it up fully, nudge or pick it up."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Swipe for notifications"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"To check your notifications from any screen, swipe down on the fingerprint sensor."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"On"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Off"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader is already unlocked"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Connect to the Internet first"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Unavailable on mobile-locked devices"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 8a93d94..7d12d4a 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Rosado"</item>
     <item msgid="6131821495505931173">"Rojo"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Más de treinta días"</item>
+    <item msgid="2900554746706302178">"Más de sesenta días"</item>
+    <item msgid="5692284879054004388">"Más de noventa días"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-es-rUS/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-es-rUS/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-es-rUS/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index d3572a7..e3e036b 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Habilitar la conexión de datos"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Inhabilitar la conexión de datos"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE suministrada"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videollamadas suministradas"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Llamadas por Wi-Fi suministradas"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Potencia de la señal móvil del teléfono"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Ver libreta de direcciones de SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Ver números fijos"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Usar huella digital"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Toca el sensor de huellas digitales para desbloquear el teléfono, autorizar compras o acceder a las apps. Ten cuidado con las personas que agregas, ya que todas las huellas digitales que agregues al teléfono podrán realizar estas acciones.\n\nNota: Es posible que la huella digital sea menos segura que un PIN o patrón eficaz. "<annotation id="url">"Más información"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Solo toca el sensor de huellas digitales para desbloquear tu teléfono, autorizar compras o acceder a las apps. Ten cuidado con las personas que agregas, ya que todas las huellas digitales que agregues podrán realizar estas acciones.\n\nNota: Tu huella digital puede ser menos segura que un PIN o un patrón eficaz."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Omitir"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Borrar"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"¡Comencemos!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Coloca el dedo en el sensor y levántalo cuando sientas una vibración."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"¡Muy bien! Hazlo de nuevo."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Mueve el dedo ligeramente para agregar todas las partes de tu huella digital."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Huella digital agregada"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Cuando veas este ícono, podrás utilizar tu huella digital para identificarte o para autorizar una compra."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Solo toca el sensor de huellas digitales para activar y desbloquear el dispositivo."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Cuando veas este ícono, podrás utilizar tu huella digital."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Cuando veas este ícono, podrás autorizar compras o acceder a las apps."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"¿Omitir configuración de huella digital?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Decidiste usar la huella digital como una de las formas para desbloquear el teléfono. Si omites este paso, tendrás que configurarla más tarde. La configuración tarda un minuto aproximadamente."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurar bloqueo de pantalla"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Actualizar dirección de emergencia"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Dirección que los servicios de ayuda usarán como tu ubicación si realizas alguna llamada de emergencia mediante Wi-Fi"</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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Olvidar"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Configurar"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Explorar"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Liberar espacio"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Administrar el almacenamiento"</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>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Dispositivo multimedia (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Datos almacenados en caché"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Otro"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorar <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"\"Otros\" incluye los archivos compartidos que guardan las apps, archivos descargados de Internet o mediante Bluetooth, archivos de Android, etc. \n\nPara ver el contenido completo de <xliff:g id="NAME">^1</xliff:g>, presiona Explorar."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"El sistema incluye archivos de uso interno del sistema operativo Android. \n\nEstos archivos no pueden verse de forma individual."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Es posible que el usuario <xliff:g id="USER_0">^1</xliff:g> haya guardado fotos, música, películas, aplicaciones u otros datos que ocupan <xliff:g id="SIZE">^2</xliff:g> de almacenamiento. \n\nPara ver los detalles, cambia al usuario <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Información legal"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Colaboradores"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Información regulatoria"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Etiquetas reglamentarias"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Información reglamentaria y de seguridad"</string>
     <string name="copyright_title" msgid="865906688917260647">"Derechos de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencia"</string>
     <string name="terms_title" msgid="7697580845616764642">"Términos y condiciones"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN siempre activada"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"No se agregaron VPN."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"La opción Siempre activa está habilitada"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"La opción no es compatible con esta app"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecciona el perfil de la VPN con la que deseas establecer una conexión ininterrumpida. El tráfico de red solo se permitirá cuando estés conectado a esta VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Ninguna"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"La VPN siempre activada requiere una dirección IP tanto para el servidor como para el DNS."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"desliza para desbloquear, contraseña, patrón, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"desafíos de trabajo, trabajo, perfil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"perfil de trabajo, perfil administrado, unificar, unificación, trabajo, perfil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escribir"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Presiona una etiqueta para editarla…"</string>
@@ -2987,7 +2998,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Los datos en segundo plano solo están disponibles por medio de Wi-Fi. Si no hay una conexión Wi-Fi disponible, podrían verse afectados algunos servicios o apps."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Perfil de trabajo desactivado"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Las apps, la sincronización en segundo plano y otras funciones relacionadas con tu perfil de trabajo están desactivadas."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Sugerencias (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Sugerencias"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Quitar"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de colores fríos"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Usar colores de pantalla más fríos"</string>
@@ -3080,6 +3092,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"¿Quieres restablecer los contadores de limitación de frecuencia de ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notific. en pantalla bloqueada"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Ocultar o mostrar el contenido de las notificaciones"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Todas"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Asistencia"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Ancho más pequeño"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ninguna app que instalaste solicitó acceso a SMS premium"</string>
@@ -3087,9 +3101,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Acceso a SMS premium"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Inhabilitado"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Modo demostración"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Estamos aquí para ayudarte"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Estamos disponibles a toda hora, todos los días"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Nuestro equipo de asistencia está disponible para solucionar cualquier problema"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Nuestro equipo de asistencia está disponible a toda hora, todos los días"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Horario de atención telefónica (hora local)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Busca ayuda o explora sugerencias y trucos"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Compatibilidad con:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"¿Viajas al exterior?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Pueden aplicarse cargos internacionales"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Teléfono"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Explorar sugerencias y trucos"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Buscar ayuda y enviar comentarios"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Accede para obtener ayuda"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Acceder"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"¿No puedes acceder a tu cuenta?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Enviar información del sistema"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Necesitamos la información del sistema para realizar un diagnóstico y resolver tu problema rápidamente."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"No volver a mostrar"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Configuración del perfil de trabajo"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Búsqueda de contactos"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Permitir que tu organización busque contactos para identificar a emisores y contactos"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> horas</item>
+      <item quantity="one">1 hora</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
+      <item quantity="one">1 minuto</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
+      <item quantity="one">1 segundo</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Espera estimada: alrededor de <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Computadora"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Auriculares"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Teléfono"</string>
@@ -3097,4 +3145,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Auriculares"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Periférico de entrada"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"El administrador de almacenamiento quita de tu dispositivo las fotos y los videos con copia de seguridad para liberar espacio de almacenamiento."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Quitar fotos y videos"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Administrador de almacenamiento"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automático"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestos"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Ir a la cámara"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Para abrir la cámara rápidamente, presiona dos veces el botón de encendido. Funciona desde cualquier pantalla."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Alternar cámara"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Para alternar entre la cámara frontal y la posterior, gira el teléfono dos veces."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Verificación rápida de pantalla"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Para revisar tu teléfono sin activarlo por completo, muévelo o agárralo."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Desliza el dedo para ver las notificaciones"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Para revisar tus notificaciones desde cualquier pantalla, desliza el dedo hacia abajo en el sensor de huellas digitales."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Activado"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Desactivado"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"El cargador de inicio está desbloqueado"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Conectarse a Internet primero"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"No disponible en dispositivos bloqueados por el proveedor"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index ae8caf6..f396667 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Rosa"</item>
     <item msgid="6131821495505931173">"Rojo"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Más de 30 días de antigüedad"</item>
+    <item msgid="2900554746706302178">"Más de 60 días de antigüedad"</item>
+    <item msgid="5692284879054004388">"Más de 90 días de antigüedad"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-es/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-es/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-es/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 85c9ffc..8c42f29 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Habilitar conexión de datos"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Inhabilitar conexión de datos"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE administrada"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videollamada preparada"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Llamada Wi-Fi preparada"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Potencia de la señal móvil del teléfono"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Ver libreta de direcciones de tarjeta SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Ver números de marcación fija"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloqueo con huella"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Toca el sensor de huellas digitales para desbloquear el teléfono y autorizar compras o iniciar sesión en aplicaciones. Cualquier huella digital que añadas podrá realizar estas acciones, por lo que debes tener cuidado.\n\nNota: Es posible que tu huella digital sea menos segura que un buen patrón o PIN. "<annotation id="url">"Más información"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Solo tienes que tocar el sensor de huellas digitales para desbloquear el teléfono, autorizar compras o iniciar sesión en aplicaciones. Cualquier huella digital que añadas podrá realizar estas acciones, por lo que debes tener cuidado con las huellas que incluyes.\n\nNota: Es posible que tu huella digital sea menos segura que un buen patrón o PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Saltar"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Eliminar"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"¡Empecemos!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Pon el dedo en el sensor y levántalo cuando notes una vibración."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"¡Genial! Ahora repítelo"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Mueve el dedo ligeramente para añadir todas las partes de tu huella digital."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Huella digital añadida"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Cuando aparezca este icono, puedes usar tu huella digital para identificarte o autorizar una compra."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Solo tienes que tocar el sensor de huellas digitales para activar y desbloquear el dispositivo."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Cuando aparezca este icono, puedes utilizar tu huella digital."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Si aparece este icono, significa que también puedes autorizar las compras o iniciar sesión en las aplicaciones."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"¿Saltar la configuración de huella digital?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Has decidido utilizar tu huella digital para desbloquear el teléfono. Si te saltas este paso ahora, tendrás que configurarlo más tarde (este proceso tarda aproximadamente un minuto)."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurar bloqueo de pantalla"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Actualizar dirección de emergencia"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Dirección que utilizan los servicios de emergencia como tu ubicación si llamas al 911 por Wi-Fi"</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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Olvidar"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Configurar"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Explorar"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Liberar espacio"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Administrar almacenamiento"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Conexión USB a ordenador"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Conectar como"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Dispositivo multimedia (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Datos almacenados en caché"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Otros"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorar <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"En Otros se incluyen archivos compartidos almacenados por aplicaciones, archivos descargados de Internet o por Bluetooth, archivos de Android y mucho más. \n\nPara ver todo el contenido de este <xliff:g id="NAME">^1</xliff:g>, toca Explorar."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"El sistema incluye archivos utilizados por el sistema operativo Android de forma interna. \n\nEstos archivos no se pueden ver por separado."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> puede tener aplicaciones, películas, música, fotos y otros datos guardados que ocupan un espacio de <xliff:g id="SIZE">^2</xliff:g>. \n\nPara ver información detallada, cambia a <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Información legal"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contribuidores"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Información regulatoria"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Etiquetas normativas"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Información sobre seguridad y normativas"</string>
     <string name="copyright_title" msgid="865906688917260647">"Derechos de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencia"</string>
     <string name="terms_title" msgid="7697580845616764642">"Condiciones de uso"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN siempre activada"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"No se ha añadido ninguna VPN."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Siempre activada habilitada"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"No compatible con esta aplicación"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecciona un perfil de VPN para permanecer conectado de forma continua. Solo se permitirá el tráfico de red cuando estés conectado a esta red VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Ninguno"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Las redes VPN activadas continuamente requieren una dirección IP para el servidor y el DNS."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"deslizar para desbloquear, contraseña, patrón, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"reto de trabajo, perfil, trabajo"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"perfil de trabajo, perfil administrado, unificar, unificación, trabajo, perfil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Editar"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Toca una etiqueta para editarla..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Las conexiones automáticas solo están disponibles a través de redes Wi-Fi. Si la conexión Wi-Fi no está disponible, algunas aplicaciones o algunos servicios pueden verse afectados."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Perfil de trabajo desactivado"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Las aplicaciones, la sincronización en segundo plano y otras funciones relacionadas con tu perfil de trabajo están desactivadas."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Sugerencias (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Sugerencias"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"Más de <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Quitar"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de colores fríos"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilizar colores de pantalla más fríos"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"¿Restablecer contadores de límite de frecuencia de ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notificac. en pantalla bloqueo"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar u ocultar contenido de las notificaciones"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Todo"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Ayuda"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Ancho más pequeño"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ninguna aplicación instalada ha solicitado acceso SMS premium"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Acceso SMS premium"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Inhabilitado"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Modo de demostración"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Queremos ayudarte"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Estamos disponibles las 24 horas del día, 7 días a la semana"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Nuestro equipo de asistencia está a tu disposición para ayudarte con cualquier problema"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Nuestro equipo de asistencia está disponible siempre que lo necesites"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Horario del servicio de asistencia telefónica (hora local)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Busca en la Ayuda o consulta la sección Consejos y sugerencias"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Compatibilidad con:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"¿Vas a viajar al extranjero?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Pueden aplicarse cargos internacionales"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Teléfono"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Consulta la sección Consejos y sugerencias"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Buscar en la ayuda y enviar sugerencias"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Iniciar sesión para obtener asistencia"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Iniciar sesión"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"¿No puedes acceder a tu cuenta?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Enviar información del sistema"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Para poder hacer un diagnóstico y ayudarte a solucionar el problema rápidamente, necesitamos información del sistema."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"No volver a mostrar"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Ajustes de perfil de trabajo"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Búsqueda de contactos"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Permitir que tu organización busque contactos para identificar llamadas y contactos"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> horas</item>
+      <item quantity="one">1 hora</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
+      <item quantity="one">1 minuto</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
+      <item quantity="one">1 segundo</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Tiempo de espera aproximado: <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Ordenador"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Cascos"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Teléfono"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Auriculares"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Periférico de entrada"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Para liberar espacio, el Administrador de Almacenamiento borrará de tu dispositivo las fotos y vídeos que tengan copia de seguridad."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Borrar fotos y vídeos"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Administrador de Almacenamiento"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automático"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestos"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Abrir cámara"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Pulsa dos veces el botón de encendido para abrir la cámara rápidamente. Funciona desde cualquier pantalla."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Cambiar cámara"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Gira el dispositivo dos veces para cambiar entre la cámara frontal y la trasera."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Vistazo rápido"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Mueve o coge el teléfono para comprobar notificaciones sin activarlo completamente."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Deslizar el dedo para ver notificaciones"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Desliza el dedo hacia abajo en el sensor de huellas digitales para ver las notificaciones en cualquier pantalla."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Sí"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"No"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"El gestor de arranque ya está desbloqueado"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Conectarse a Internet primero"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"No disponible en dispositivos bloqueados por operadores"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-et-rEE/arrays.xml b/res/values-et-rEE/arrays.xml
index 6dacf24..caa5a2c 100644
--- a/res/values-et-rEE/arrays.xml
+++ b/res/values-et-rEE/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Roosa"</item>
     <item msgid="6131821495505931173">"Punane"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Üle 30 päeva vana"</item>
+    <item msgid="2900554746706302178">"Üle 60 päeva vana"</item>
+    <item msgid="5692284879054004388">"Üle 90 päeva vana"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-et-rEE/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-et-rEE/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-et-rEE/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 49eca32..057c689 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Luba andmesideühendus"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Keela andmesideühendus"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE on ette valmistatud"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videokõne ettevalmistamine"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"WiFi-kõne ettevalmistamine"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Mobiiliraadio toide"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM-kaardi aadressiraamatu kuvamine"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Kuva määratud valimisnumbrid"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Sõrmejäljega avamine"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Telefoni avamiseks, ostude volitamiseks või rakendustesse sisse logimiseks peate vaid puudutama sõrmejäljeandurit. Olge sõrmejälgede lisamisel ettevaatlik. Neid toiminguid saab teha isegi ühe lisatud sõrmejäljega.\n\nMärkus. Sõrmejälg võib olla vähem turvaline kui keerukas muster või PIN-kood. "<annotation id="url">"Lisateave"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Telefoni avamiseks, ostude volitamiseks või rakendustesse sisse logimiseks peate vaid puudutama sõrmejäljeandurit. Olge sõrmejälgede lisamisel ettevaatlik. Neid toiminguid saab teha isegi ühe lisatud sõrmejäljega.\n\nMärkus. Sõrmejälg võib olla vähem turvaline kui keerukas muster või PIN-kood."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Tühista"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Jätka"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Jäta vahele"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Kustuta"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Alustame!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Asetage oma sõrm andurile ja tõstke see üles, kui tunnete vibratsiooni"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Hästi! Nüüd korrake"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Jätkake"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Liigutage veidi oma sõrme, et lisada oma sõrmejälje kõik erinevad osad"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Sõrmejälg lisati."</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Alati kui seda ikooni näete, saate tuvastamiseks või ostu volitamiseks kasutada oma sõrmejälge."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Seadme äratamiseks ja avamiseks puudutage lihtsalt sõrmejäljelugejat."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Kui näete seda ikooni, saate sõrmejälge kasutada."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Kui näete seda ikooni, saate ka oste volitada ja rakendustesse sisse logida."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Kas jätta sõrmejälje seadistus vahele?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Valisite telefoni avamise üheks viisiks sõrmejälje kasutamise. Kui seadistamise praegu vahele jätate, peate seda tegema hiljem. See võtab ainult umbes minuti."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Seadista ekraanilukk"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Hädaabi aadressi värskendamine"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Aadress, mida hädaabiteenused kasutavad teie asukohana, kui teete WiFi kaudu hädaabikõne"</string>
     <string name="home_settings" msgid="212375129455718176">"Avaekraan"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekraan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Heli"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Unustamine"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Seadistus"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Avastamine"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Ruumi vabastamine"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Salvestusruumi haldamine"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-arvutiühendus"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Ühenda kui"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Meediumiseade (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Heli"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Vahemälus olevad andmed"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Muu"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Süsteem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Üksuse <xliff:g id="NAME">^1</xliff:g> avastamine"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Muud failid hõlmavad rakenduste salvestatud faile, Internetist või Bluetoothi kaudu alla laaditud faile, Androidi faile jms. \n\nJaotise <xliff:g id="NAME">^1</xliff:g> kogu sisu vaatamiseks puudutage käsku Avasta."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Süsteem sisaldab faile, mida Androidi operatsioonisüsteem kasutab sisemiselt. \n\nNeid faile ei saa üksikult vaadata."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Kasutaja <xliff:g id="USER_0">^1</xliff:g> võib olla salvestanud fotosid, muusikat, filme, rakendusi või teisi andmeid, mis võtavad ruumi <xliff:g id="SIZE">^2</xliff:g>. \n\nÜksikasjade vaatamiseks lülitage kasutajale <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Juriidiline teave"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Kaasautorid"</string>
     <string name="manual" msgid="3025943393642974445">"Käsitsi"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Regulatiivteave"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Regulatiivsildid"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Ohutus- ja regulatiivteave"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autoriõigus"</string>
     <string name="license_title" msgid="1990487604356037871">"Litsents"</string>
     <string name="terms_title" msgid="7697580845616764642">"Nõuded ja tingimused"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Alati sees VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Ühtegi VPN-i pole lisatud."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Valik Alati sees on aktiivne"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Rakendus ei toeta seda"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Valige VPN-i profiil, millega olla alati ühendatud. Võrguliiklus on lubatud ainult siis, kui olete ühendatud selle VPN-iga."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Puudub"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Alati sees VPN-i jaoks on vaja IP-aadressi nii serverile kui ka DNS-ile."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"libista avamiseks, parool, muster, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"töö väljakutse, töö, profiil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"tööprofiil, hallatud profiil, ühenda, ühendamine, töö, profiil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"liigutus"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"WiFi NFC-kiibi seadistamine"</string>
     <string name="write_tag" msgid="8571858602896222537">"Kirjuta"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Kirjutamiseks puudutage kiipi ..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Taustaandmed on saadaval ainult WiFi kaudu. Kui WiFi pole saadaval, võib see mõjutada mõne rakenduse või teenuse tööd."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Tööprofiil on välja lülitatud"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Rakendused, taustal sünkroonimine ja muud tööprofiiliga seotud funktsioonid on välja lülitatud."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Soovitused (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Soovitused"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Eemalda"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Külm värvitemperatuur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Kasutatakse külmemaid ekraanivärve"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Kas lähtestada teenuses ShortcutManager sageduse piiramise loendurid?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Lukustuskuva märguannete juhtimine"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Märguande sisu kuvamine või peitmine"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Kõik"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Tugi"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Kõige väiksem laius"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ükski installitud rakendus pole taotlenud juurdepääsu tasuliste SMS-ide saatmiseks"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Juurdepääs tasuliste SMS-ide saatmiseks"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Keelatud"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Demorežiim"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Oleme valmis teid aitama"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Aitame teid 24/7"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Meie tugitiim aitab teid kõigi probleemide korral"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Meie tugitiim on iga päev ja iga kell saadaval"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Telefonitoe tööaeg (kohaliku aja järgi)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Otsige abi või avastage nõuandeid ja nippe"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Toe riik:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> – <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Kas reisite välismaale?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Rakenduda võivad rahvusvaheliste kõnede tasud"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Vestlus"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Avastage nõuandeid ja nippe"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Otsige abist ja saatke tagasisidet"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Toe saamiseks logige sisse"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Logi sisse"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Kas te ei pääse oma kontole juurde?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Süsteemiteabe saatmine"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Teie probleemi kiireks lahendamiseks vajame diagnoosimiseks süsteemiteavet."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Ära kuva enam"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Tööprofiili seaded"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaktiotsing"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Lubage organisatsioonile helistajate ja kontaktide tuvastamiseks kontaktiotsingud"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> tundi</item>
+      <item quantity="one">1 tund</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutit</item>
+      <item quantity="one">1 minut</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekundit</item>
+      <item quantity="one">1 sekund</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Ooteaeg umbes <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Arvuti"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Peakomplekt"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telefon"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Kõrvaklapid"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Sisestatud välisseade"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Salvestusruumi vabastamiseks eemaldab salvestusruumi haldur varundatud fotod ja videod teie seadmest."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Fotode ja videote eemaldamine"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Salvestusruumi haldur"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automaatne"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Käsitsi"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Liigutused"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Ava kaamera"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Kaamera kiireks avamiseks topeltpuudutage toitenuppu. See töötab igal ekraanil."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Kaamera vahetamine"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Esi- ja tagakaamera vahel vahetamiseks pöörake kaks korda."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Kiire ekraanikontroll"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Telefoni kontrollimiseks seda täielikult äratamata müksake seda või võtke see kätte."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Pühkimine märguannete kontrollimiseks"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Märguannete kontrollimiseks mis tahes ekraanil pühkige sõrmejäljeanduril alla."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Sees"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Väljas"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Buudilaadur on juba avatud"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Looge esmalt Interneti-ühendus"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Ei ole operaatori lukustatud seadmetes saadaval"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-eu-rES/arrays.xml b/res/values-eu-rES/arrays.xml
index 178e00c..0a23b33 100644
--- a/res/values-eu-rES/arrays.xml
+++ b/res/values-eu-rES/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Arrosa"</item>
     <item msgid="6131821495505931173">"Gorria"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"30 egunetik gorakoak"</item>
+    <item msgid="2900554746706302178">"60 egunetik gorakoak"</item>
+    <item msgid="5692284879054004388">"90 egunetik gorakoak"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-eu-rES/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-eu-rES/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-eu-rES/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 5305b14..17c924a 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Gaitu datu-konexioa"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Desgaitu datu-konexioa"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE hornituta"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Bideo-deiak aktibatuta"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi bidezko deiak aktibatuta"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Sare mugikorraren irrati-seinalea"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Ikusi SIMeko kontaktuak"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Ikusi markatze finkoko zenbakiak"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desblokeatu hatz-marka bidez"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Ukitu hatz-marken sentsorea telefonoa desblokeatzeko, erosketak baimentzeko edo aplikazioetan saioa hasteko. Kontuz aukeratu noren hatz-markak gehitzen dituzun. Hatz-marka bakar bat gehituta ere gauza daitezke aipatutako ekintzak.\n\nOharra: baliteke hatz-marka ez izatea eredu edo PIN kode konplexu bat bezain segurua. "<annotation id="url">"Lortu informazio gehiago"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Ukitu hatz-marken sentsorea telefonoa desblokeatzeko, erosketak baimentzeko edo aplikazioetan saioa hasteko. Kontuz aukeratu noren hatz-markak gehitzen dituzun. Hatz-marka bakar bat gehituta ere gauza daitezke aipatutako ekintzak.\n\nOharra: baliteke hatz-marka ez izatea eredu edo PIN kode konplexu bat bezain segurua."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Utzi"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Jarraitu"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Saltatu"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Ezabatu"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Ekiogun!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Ezarri hatza sentsorean eta, dardara sentitzen duzunean, jaso ezazu"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Bikain! Egin ezazu berriro"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Ez gelditu"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Mugitu hatza pixka bat, hatz-markaren zati guztiak gehitzeko"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Gehitu da hatz-marka!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Ikono hau ikusten duzunean, hatz-marka digitala erabil dezakezu zeure burua identifikatzeko edo erosketak baimentzeko."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Ukitu hatz-marka digitalaren sentsorea gailua aktibatzeko eta desblokeatzeko."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Ikono hau ikusten duzunean, hatz-marka digitala erabil dezakezu."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Ikono hau ikusten duzunean, erosketak baimendu ahal izango dituzu edo aplikazioetan saioa hasi."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Hatz-markaren konfigurazioa saltatu?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Hatz-marka erabiltzea aukeratu duzu telefonoa desblokeatzeko modu bat gisa. Urratsa saltatzen baduzu, geroago konfiguratu beharko duzu. Minutu bat inguru baino ez duzu beharko konfiguratzeko."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Konfiguratu pantailaren blokeoa"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Eguneratu larrialdietarako helbidea"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Wi-Fi bidez larrialdi-zerbitzuetara deituz gero kokapen gisa erabiliko den helbidea"</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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Ahaztu"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Konfiguratu"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Arakatu"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Egin tokia"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Kudeatu memoria"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-ordenagailu konexioa"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Konektatu honela"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Multimedia-gailua (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audioa"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Cachean gordetako datuak"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Beste datu batzuk"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Arakatu <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"\"Beste datu batzuk\" atalean daude aplikazioek gordetako fitxategi partekatuak, Internetetik eta Bluetooth konexioa erabilita deskargatutako fitxategiak, Android fitxategiak eta abar. \n\n<xliff:g id="NAME">^1</xliff:g> unitateko eduki guztiak ikusteko, sakatu \"Arakatu\"."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Android sistema eragileak erabiltzen dituen fitxategiak daude Sistema atalean. \n\n Fitxategi horiek ezin dira banaka ikusi."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Baliteke <xliff:g id="USER_0">^1</xliff:g> erabiltzaileak memoriaren <xliff:g id="SIZE">^2</xliff:g> baino gehiago betetzen duten argazkiak, musika, filmak, aplikazioak edo bestelako datuak gorde izana. \n\nXehetasunak ikusteko, hasi saioa <xliff:g id="USER_1">^1</xliff:g> gisa."</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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Lege-informazioa"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Kolaboratzaileak"</string>
     <string name="manual" msgid="3025943393642974445">"Eskuliburua"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Arauei buruzko informazioa"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Legezko etiketak"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Segurtasun- eta lege-informazioa"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyrighta"</string>
     <string name="license_title" msgid="1990487604356037871">"Lizentzia"</string>
     <string name="terms_title" msgid="7697580845616764642">"Zehaztapenak eta baldintzak"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Beti aktibatuta dagoen VPNa"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Ez da gehitu VPN sarerik."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"\"Beti piztuta\" aktibo"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Aplikazio honek ez du onartzen"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Hautatu beti konektatuta egoteko VPN profila. VPN horrekin konektatuta zaudenean soilik onartuko da sare-trafikoa."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Bat ere ez"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Beti aktibatutako VPNa izateko, IP helbidea izan behar dute zerbitzariak nahiz DNSak."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"lerratu desblokeatzeko, pasahitza, eredua, PIN, kodea"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"laneko erronka, lana, profila"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"laneko profila, kudeatutako profila, bateratu, bateratzea, lana, profila"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"keinua"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Konfiguratu Wi-Fi NFC etiketa"</string>
     <string name="write_tag" msgid="8571858602896222537">"Idatzi"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Ukitu etiketa bat bertan idazteko…"</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Atzeko planoko datuak Wi-Fi bidez soilik erabil daitezke. Horrek eragina izango du aplikazio eta zerbitzu batzuetan, Wi-Fi konexiorik ez dagoenean."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Desaktibatuta dago laneko profila"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Desaktibatuta daude aplikazioak, atzeko planoko sinkronizazioa eta laneko profilarekin erlazionatutako bestelako eginbideak."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Iradokizunak (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Iradokizunak"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Kendu"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Kolore hotzak"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Erabili kolore hotzagoak pantailan"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Lasterbideak kudeatzeko ShortcutManager zerbitzuaren muga-kontagailuak berrezarri nahi dituzu?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Pantaila blokeatuko jakinarazpenak"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Erakutsi edo ezkutatu jakinarazpenaren edukia"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Guztiak"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Laguntza"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Zabalerarik txikiena"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ez dago premium SMSetarako sarbidea eskatu duen aplikaziorik."</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium SMSetarako sarbidea"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Desgaituta"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Demo modua"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Laguntzeko gauzkazu"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Laguntzeko prest gauzkazu beti, gau eta egun."</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Arazoak konpontzeko prest duzu gure laguntza-zerbitzua"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Gure laguntza-taldea laguntzeko prest izango duzu egunero-egunero, gau eta egun"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Telefono bidezko laguntza-zerbitzuaren ordutegia (bertako orduan)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Bilatu laguntza edo arakatu aholkuak"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Jaso laguntza hemen:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Atzerrira joango al zara?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Nazioarteko gastuak izan ditzakezu"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefonoa"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Txateatu"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Irakurri aholkuak eta trikimailuak"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Egin bilaketak laguntza-edukian eta eman zure iritzia"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Hasi saioa laguntza eskuratzeko"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Hasi saioa"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Ezin al zara kontuan sartu?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Bidali sistemari buruzko informazioa"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Arazoa konpontzeari ahal bezain laster ekiteko, sistemari buruzko informazioa behar dugu diagnosia egiteko."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Ez erakutsi berriro"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Laneko profilaren ezarpenak"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaktu-bilaketak"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Onartu erakundeko kontaktu-bilaketek deitzaileak eta kontaktuak identifikatzea"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ordu</item>
+      <item quantity="one">Ordubete</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutu</item>
+      <item quantity="one">Minutu bat</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundo</item>
+      <item quantity="one">Segundo bat</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"<xliff:g id="ESTIMATE">%1$s</xliff:g> inguru itxaron behar izaten da"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Ordenagailua"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Mikrofonodun entzungailua"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telefonoa"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Aurikularra"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Idazteko gailua"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth gailua"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Memorian tokia egiteko, babeskopiak dituzten argazkiak eta bideoak gailutik kentzen ditu memoria-kudeatzaileak."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Kendu argazkiak eta bideoak"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Memoria-kudeatzailea"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatikoa"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Eskuzko ezarpenak"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Keinuak"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Saltatu kamerara"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Kamera bizkor irekitzeko, sakatu birritan etengailua. Edozein pantailatan zaudela egin dezakezu."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Biratu kamera"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Atzeko eta aurreko kameren artean aldatzeko, biratu birritan."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Pantaila bizkor ikustea"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Telefonoaren pantaila ikusteko guztiz aktibatu gabe, mugitu zertxobait edo hartu eskuan."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Pasatu hatza jakinarazpenak ikusteko"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Jakinarazpenak edozein pantailatan zaudela ikusteko, pasatu hatza behera hatz-marken sentsorean."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Aktibatuta"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Desaktibatuta"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Abiarazlea desblokeatuta dago dagoeneko"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Lehendabizi, konektatu Internetera"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Ezin da erabili operadore bakarra erabil dezaketen gailuetan"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 9fb2b41..9ab696d 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"صورتی"</item>
     <item msgid="6131821495505931173">"قرمز"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"بیش از ۳۰ روز پیش"</item>
+    <item msgid="2900554746706302178">"بیش از ۶۰ روز پیش"</item>
+    <item msgid="5692284879054004388">"بیش از ۹۰ روز پیش"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-fa/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-fa/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-fa/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index d2650ac..a31ac06 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"فعال کردن اتصال داده"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"غیرفعال کردن اتصال داده"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"‏مشروط به VoLTE"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"مجوز تماس تصویری داده شد"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"‏مجوز تماس با Wifi داده شد"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"توان رادیویی شبکه همراه"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"مشاهده دفترچه نشانی سیم‌کارت"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"مشاهده شماره‌های شماره‌گیری ثابت"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"بازکردن قفل با اثر انگشت"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"برای باز کردن قفل تلفن، تأیید خریدها یا ثبت ورود در برنامه‌ها، کافی است حسگر اثر انگشت را لمس کنید. مراقب باشید اثر انگشت چه کسی را اضافه می‌کنید. حتی یک اثر انگشت اضافه‌شده می‌تواند همه این کارها را انجام دهد.\n\nتوجه: ممکن است اثر انگشت از الگو یا پین قدرتمند امنیت کمتری داشته باشد. "<annotation id="url">"بیشتر بدانید"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"برای باز کردن قفل تلفن، تأیید خریدها یا ورود به سیستم برنامه‌ها، کافی است حسگر اثر انگشت را لمس کنید. مراقب باشید اثر انگشت چه کسی را اضافه می‌کنید. حتی یک اثر انگشت اضافه‌شده می‌تواند همه این کارها را انجام دهد.\n\nتوجه: ممکن است اثر انگشت از الگو یا پین قدرتمند امنیت کمتری داشته باشد."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"لغو"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ادامه"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"رد شدن"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"حذف"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"شروع می‌کنیم!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"انگشتتان را روی حسگر بگذارید و بعد از احساس لرزش، آن را بردارید"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"عالی است! اکنون تکرار کنید"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"ادامه دهید"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"اندکی انگشتتان را حرکت دهید تا همه قسمت‌های متفاوت اثر انگشتتان اضافه شود"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"اثر انگشت اضافه شد."</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"هر زمان این نماد را ببینید، می‌توانید از اثر انگشتتان برای شناسایی یا تأیید خرید استفاده کنید."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"برای روشن کردن و باز کردن قفل دستگاهتان کافیست حسگر اثر انگشت را لمس کنید."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"وقتی این نماد را می‌بینید، می‌توانید از اثر انگشتتان استفاده کنید."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"وقتی این نماد را می‌بینید، همچنین می‌توانید خریدها را مجاز کنید یا به سیستم برنامه‌ها وارد شوید."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"از تنظیم اثر انگشت رد می‌شوید؟"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"انتخاب کرده‌اید که از اثر انگشتتان به‌عنوان روشی برای باز کردن قفل تلفن استفاده کنید. اگر اکنون این مرحله را رد کنید، باید بعداً آن را تنظیم کنید. تنظیم فقط یک دقیقه یا همین حدود طول می‌کشد."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"تنظیم قفل صفحه"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"۱"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"‏وقتی تماس Wi-Fi روشن است، تلفن شما می‌تواند بنابر تنظیمات ترجیحی‌تان و اینکه چه سیگنالی قدرتمندتر است، تماس‌ها را از طریق شبکه‌های Wi-Fi یا شبکه شرکت مخابراتی‌تان هدایت کند. قبل از روشن کردن این قابلیت، هزینه‌ها و سایر جزئیات را با شرکت مخابراتی‌تان بررسی کنید."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"به‌روزرسانی نشانی اضطراری"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"‏نشانی‌ای که اگر از طریق 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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"فراموش کردن"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"راه‌اندازی"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"کاوش"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"آزاد کردن فضا"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"مدیریت حافظه"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"‏اتصال به کامپیوتر با USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"اتصال به‌عنوان"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"‏دستگاه رسانه‌ای (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"صوتی"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"داده‌های موجود در حافظه پنهان"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"موارد دیگر"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"سیستم"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"کاوش <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"‏موارد دیگر شامل فایل‌های به‌اشتراک گذاشته شده‌ای که برنامه‌ها ذخیره کرده‌اند، فایل‌های دانلودشده از اینترنت یا بلوتوث، فایل‌های Android وغیره است. \n\nبرای دیدن کل محتوای این <xliff:g id="NAME">^1</xliff:g>، روی کاوش ضربه بزنید."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"‏سیستم شامل فایل‌هایی است که مورد استفاده داخلی سیستم عامل Android قرار می‌گیرد. \n\nاین فایل را نمی‌توان به‌صورت جداگانه مشاهده کرد."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> ممکن است عکس، موسیقی، فیلم، برنامه یا داده‌های دیگری داشته باشد که <xliff:g id="SIZE">^2</xliff:g> از حافظه را اشغال کرده است. \n\nبرای مشاهده جزئیات، به <xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"اطلاعات حقوقی"</string>
     <string name="contributors_title" msgid="5917703088825286504">"شرکت کنندگان"</string>
     <string name="manual" msgid="3025943393642974445">"دفترچه راهنما"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"اطلاعات تنظیمی"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"برچسب‌های نظارتی"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"اطلاعات ایمنی و قوانین نظارتی"</string>
     <string name="copyright_title" msgid="865906688917260647">"حق نسخه‌برداری"</string>
     <string name="license_title" msgid="1990487604356037871">"مجوز"</string>
     <string name="terms_title" msgid="7697580845616764642">"شرایط و مقررات"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"‏VPN همیشه فعال"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"‏هیچ VPN اضافه نشده است."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"همیشه روشن، فعال است"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"توسط این برنامه پشتیبانی نمی‌شود"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"‏یک نمایه VPN انتخاب کنید تا همیشه متصل بمانید. فقط درصورتی‌که به این VPN متصل باشید ترافیک شبکه مجاز خواهد بود."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"هیچ‌کدام"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"‏VPN همیشه فعال به یک آدرس IP برای سرور و DNS نیاز دارد."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"لغزاندن برای بازگشایی قفل، گذرواژه، الگو، پین"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"چالش کار، کار، نمایه"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"نمایه کاری، نمایه مدیریت‌شده، یکی شدن، یکپارچگی، کار، نمایه"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"اشاره"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏تنظیم برچسب NFC برای Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"نوشتن"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ضربه زدن روی یک برچسب برای نوشتن..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"‏داده پس‌زمینه فقط از طریق Wi-Fi در دسترس است. وقتی Wi-Fi در دسترس نباشد، این قابلیت می‌تواند بعضی از برنامه‌ها یا خدمات را تحت تأثیر قرار دهد."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"نمایه کاری خاموش است"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"برنامه‌ها، همگام‌سازی در پس‌زمینه و قابلیت‌های دیگر مربوط به نمایه کاری شما خاموش هستند."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"پیشنهادات (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"پیشنهادات"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"حذف"</string>
     <string name="color_temperature" msgid="2070126836910615605">"دمای رنگ سرد"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"استفاده از رنگ‌های سردتر نمایشگر"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"‏شمارنده محدودکننده سرعت ShortcutManager بازنشانی شود؟"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"کنترل اعلان‌های قفل صفحه"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"نمایش یا پنهان کردن محتوای اعلان"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"همه"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"پشتیبانی"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"‏dp ‏<xliff:g id="ID_1">%d</xliff:g>"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"کوچک‌ترین عرض"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"هیچ برنامه نصب‌شده‌ای دسترسی به «پیامک ویژه» را درخواست نکرده است"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"دسترسی پیامک ویژه"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"غیرفعال است"</string>
     <string name="demo_mode" msgid="2655748420527206870">"حالت نمایشی"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"ما اینجاییم تا به شما کمک کنیم"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"۲۴ ساعت روز/۷ روز هفته آماده کمک به شما هستیم"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"تیم پشتیبانی ما اینجاست تا در رسیدگی به هر مشکلی کمک کند"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"تیم پشتیبانی ما به‌صورت شبانه‌روزی دردسترس است"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"‏ساعت‌های پشتیبانی تلفنی (به وقت محلی)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"جستجوی راهنما یا کاوش در نکات و ترفندها"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"پشتیبانی از:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"به خارج از کشور سفر می‌کنید؟"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"ممکن است هزینه‌های بین‌المللی لحاظ شود"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"تلفن"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"گپ"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"کاوش نکته‌ها و ترفندها"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"جستجوی راهنما و ارسال بازخورد"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"ورود به سیستم برای پشتیبانی"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"ورود به سیستم"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"قادر به دسترسی به حساب خود نیستید؟"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"ارسال اطلاعات سیستم"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"برای کمک به حل سریع‌تر مشکلتان، به اطلاعات سیستم برای عیب‌یابی نیاز داریم."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"دیگر نشان داده نشود"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"تنظیمات نمایه کاری"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"جستجوی مخاطب"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"جستجوهای مخاطب توسط سازمانتان برای شناسایی تماس‌گیرندگان و مخاطبین مجاز است"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ساعت</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ساعت</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> دقیقه</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> دقیقه</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one">‏<xliff:g id="NUMBER">%s</xliff:g> ثانیه</item>
+      <item quantity="other">‏<xliff:g id="NUMBER">%s</xliff:g> ثانیه</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> انتظار"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"رایانه"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"هدست"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"تلفن"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"هدفون"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"ورودی محیطی"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"بلوتوث"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"برای کمک به خالی کردن فضای ذخیره‌سازی، مدیر ذخیره‌سازی عکس‌ها و ویدیوهای پشتیبان‌گیری‌شده را از دستگاهتان پاک می‌کند."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"پاک کردن عکس‌ها و ویدیوها"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"مدیر فضای ذخیره‌سازی"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"خودکار"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"دستی"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"اشاره‌ها"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"رفتن به دوربین"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"برای باز کردن سریع دوربین، فقط کافی است روی دکمه روشن/خاموش دو ضربه سریع بزنید. در هر صفحه‌ نمایشی قابل انجام است."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"چرخش دوربین"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"برای جابه‌جایی بین دوربین‌های پشت و جلو، دو بار بچرخانید."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"بررسی سریع صفحه‌ نمایش"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"برای بررسی تلفن بدون بیدار کردن، آن را فشار دهید یا بردارید."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"تند کشیدن انگشت برای اعلان‌ها"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"برای بررسی اعلان‌ها از هر صفحه نمایشی، در حسگر اثر انگشت انگشتتان را تند به پایین بکشید."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"روشن"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"خاموش"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"‏قفل Bootloader قبلاً باز شده است"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"ابتدا به اینترنت متصل شوید"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"در دستگاه‌های دارای قفل شرکت مخابراتی در دسترس نیست"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 2fd3b22..63c74e5 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Vaaleanpunainen"</item>
     <item msgid="6131821495505931173">"Punainen"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Yli 30 päivää vanhat"</item>
+    <item msgid="2900554746706302178">"Yli 60 päivää vanhat"</item>
+    <item msgid="5692284879054004388">"Yli 90 päivää vanhat"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-fi/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-fi/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-fi/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 9acb2e0..b86475e 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Ota tiedonsiirto käyttöön"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Poista tiedonsiirto käytöstä"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTEn hallinnoima"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videopuhelukäyttäjiä hallitaan"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi-puhelukäyttäjiä hallitaan"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Matkapuhelinradion voimakkuus"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Näytä SIM-kortin osoitekirja"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Näytä sallitut numerot"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Avaa sormenjäljellä"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Avaa puhelimen lukitus, valtuuta ostoksia ja kirjaudu sovelluksiin helposti koskettamalla sormenjälkitunnistinta. Ole varovainen lisätessäsi sormenjälkiä – edellä mainitut toiminnot onnistuvat kaikilla laitteeseen lisätyillä sormenjäljillä.\n\nHuom. Sormenjälki ei välttämättä ole yhtä turvallinen kuin vahva kuvio tai PIN-koodi. "<annotation id="url">"Lisätietoja"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Avaa puhelimen lukitus, hyväksy ostoksia tai kirjaudu sovelluksiin koskettamalla sormenjälkitunnistinta. Ole varovainen lisätessäsi sormenjälkiä – edellä mainitut toiminnot onnistuvat vain yhdellä laitteeseen lisätyllä sormenjäljellä.\n\nHuom. Sormenjälki ei välttämättä ole yhtä turvallinen kuin vahva kuvio tai PIN-koodi."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Peruuta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Jatka"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Ohita"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Poista"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Aloitetaan!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Aseta sormesi tunnistimelle ja nosta se, kun tunnet värähdyksen."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Hyvä! Toista kosketus."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Jatka koskettamista"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Lisää sormenjälkesi kokonaisuudessaan liikuttamalla sormeasi varovasti."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Sormenjälki lisättiin!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kun tämä kuvake on näkyvissä, voit tunnistautua tai vahvistaa ostoksen sormenjälkesi avulla."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Voit avata laitteesi lukituksen koskettamalla sormenjälkianturia."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Voit käyttää sormenjälkeäsi, kun tämä kuvake on näkyvissä."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Kun näet tämän kuvakkeen, voit myös hyväksyä ostoksia ja kirjautua sovelluksiin."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Ohitetaanko sormenjäljen määritys?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Olet valinnut sormenjäljen yhdeksi tavaksi avata puhelimesi lukitus. Jos ohitat tämän nyt, sinun on määritettävä se myöhemmin. Määritys kestää vain noin minuutin."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Ota näytön lukitus käyttöön"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Päivitä hätäosoite"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Osoite, jota hätäpalvelut käyttävät sijaintinasi, jos soitat hätäpuhelun Wi-Fillä"</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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Unohda"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Asenna"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Tutki"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Vapauta tilaa"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Hallinnoi tallennustilaa"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-tietokoneyhteys"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Yhdistä tyyppinä"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Medialaite (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Välimuistitiedot"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Muu"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Järjestelmä"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Tutki: <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Muihin tiedostoihin sisältyvät esimerkiksi sovellusten tallentamat tiedostot, internetistä ja Bluetoothin kautta ladatut tiedostot ja Android-tiedostot. \n\nAvaa <xliff:g id="NAME">^1</xliff:g> selattavaksi valitsemalla Tutki."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Järjestelmätiedostot ovat Android-käyttöjärjestelmän sisäisessä käytössä. \n\nNiitä ei voi näyttää yksittäin."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> voi sisältää tallennettuja valokuvia, musiikkia, elokuvia, sovelluksia tai muita tietoja, jotka vievät <xliff:g id="SIZE">^2</xliff:g> tallennustilaa. \n\nJos haluat nähdä tarkemmat tiedot, valitse <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Oikeudelliset tiedot"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Avustajat"</string>
     <string name="manual" msgid="3025943393642974445">"Käyttöopas"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Lakitiedot"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Viranomaismerkinnät"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Turvallisuus- ja lakitiedot"</string>
     <string name="copyright_title" msgid="865906688917260647">"Tekijänoikeudet"</string>
     <string name="license_title" msgid="1990487604356037871">"Käyttölupa"</string>
     <string name="terms_title" msgid="7697580845616764642">"Käyttöehdot"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Aina käytössä oleva VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"VPN-verkkoja ei ole lisätty."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Aina käytössä oleva VPN: päällä"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Tämä sovellus ei tue toimintoa."</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Valitse VPN-profiili, johon muodostettu yhteys on aina käytössä. Verkkoliikenne sallitaan vain tämän VPN-yhteyden ollessa käytössä."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"-"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Aina käytössä oleva VPN edellyttää, että sekä palvelimella että DNS-palvelulla on IP-osoite."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"avaa liu\'uttamalla, salasana, lukituksenpoistokuvio, PIN-koodi"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"työhaaste, työ, profiili"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"työprofiili, hallinnoitu profiili, yhdistä, yhdistäminen, työ, profiili"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"eleet"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Määritä Wi-Fi ja NFC-tagi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Kirjoita"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Kirjoita napauttamalla tagia…"</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Taustatiedonsiirto on käytettävissä vain Wi-Fi-yhteyden kautta. Tämä voi vaikuttaa joidenkin sovellusten tai palvelujen toimintaan, kun et käytä Wi-Fi-yhteyttä."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Työprofiili on pois päältä."</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Työprofiiliin liittyvät ominaisuudet, kuten sovellukset ja taustasynkronointi, ovat pois päältä."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Ehdotukset (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Ehdotukset"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Poista"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Viileä värilämpötila"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Käytä viileämpiä värilämpötiloja"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Nollataanko ShortcutManagerin kutsurajoituslaskurit?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Hallinnoi lukitusnäytön ilmoituksia"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Näytä tai piilota ilmoituksien sisältö."</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Kaikki"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Tuki"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Pienin leveys"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Yksikään asennettu sovellus ei ole pyytänyt premium-tekstiviestien käyttöoikeutta."</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium-tekstiviestien käyttö"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Pois käytöstä"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Esittelytila"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Autamme mielellämme"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Autamme milloin tahansa"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Tukitiimimme vastaa kysymyksiin ja huolenaiheisiin."</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Tukitiimimme on käytössäsi vuorokauden ympäri vuoden jokaisena päivänä."</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Puhelintuki palvelee &lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt; paikallista aikaa"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Hae ohjeita tai tutki vinkkejä."</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Tuki:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> – <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Matkustatko ulkomailla?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Kansainvälisiä maksuja saatetaan periä."</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Puhelin"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chattaa"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Tutki vinkkejä"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Etsi ohjeista ja lähetä palautetta"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Kirjaudu sisään tukea varten"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Kirjaudu sisään"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Etkö pysty käyttämään tiliäsi?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Lähetä järjestelmätiedot"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Tarvitsemme järjestelmätietoja, jotka nopeuttavat vianetsintää ja ongelman selvittämistä."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Älä näytä uudelleen"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Työprofiilin asetukset"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Yhteystietohaku"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Salli organisaatiosi yhteystietohakujen tunnistaa soittajia ja yhteystietoja."</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> tuntia</item>
+      <item quantity="one">1 tunti</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuuttia</item>
+      <item quantity="one">1 minuutti</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekuntia</item>
+      <item quantity="one">1 sekunti</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Odotusaika ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Tietokone"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Kuulokemikrofoni"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Puhelin"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Kuulokkeet"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Syöttölisälaite"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Tallennustilan hallinta vapauttaa tilaa poistamalla varmuuskopioituja kuvia ja videoita laitteeltasi."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Poista kuvia ja videoita"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Tallennustilan hallinta"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automaattinen"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuaalinen"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Eleet"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Kameraan siirtyminen"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Voit avata kameran nopeasti kaksoisnapauttamalla virtapainiketta. Tämä toimii miltä tahansa näytöltä."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Kameran vaihtaminen"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Voit vaihtaa etu- ja takakameran välillä kiertämällä laitetta kahdesti."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Näytön pikatarkistus"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Jos haluat katsoa puhelimesi näyttöä palauttamatta sitä virransäästötilasta, liikauta sitä vähän tai ota se käteesi."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Ilmoitukset pyyhkäisemällä"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Voit tarkistaa ilmoitukset miltä tahansa näytöltä pyyhkäisemällä alaspäin sormenjälkitunnistimesta."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Käytössä"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Ei käytössä"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Käynnistysohjelman lukitus on jo avattu."</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Muodosta ensin internetyhteys"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Ei käytettävissä operaattorin lukitsemissa laitteissa"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index e15c8a2..2d0bdad 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Rose"</item>
     <item msgid="6131821495505931173">"Rouge"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Datées de plus de 30 jours"</item>
+    <item msgid="2900554746706302178">"Datées de plus de 60 jours"</item>
+    <item msgid="5692284879054004388">"Datées de plus de 90 jours"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-fr-rCA/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-fr-rCA/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-fr-rCA/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 8780350..3339b3a 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Activer la connexion de données"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Désactiver la connexion de données"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Indicateur de configuration VoLTE activé"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Appel vidéo géré"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Appel Wi-Fi géré"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Alimentation de la radio cellulaire"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Afficher le carnet d\'adresses de la carte SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Afficher les numéros autorisés"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Déverrouillage avec empreinte"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Il vous suffit de toucher le lecteur d\'empreintes digitales pour déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications. Toutes les personnes dont les empreintes digitales sont ajoutées sur votre téléphone peuvent effectuer ces opérations. Sélectionnez donc ces personnes avec soin.\n\nRemarque : Vos empreintes digitales peuvent être moins sécurisées qu\'un schéma ou un NIP fiables."<annotation id="url">"En savoir plus"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Il vous suffit de toucher le lecteur d\'empreintes digitales pour déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications. Toutes les personnes dont les empreintes digitales sont ajoutées sur votre téléphone peuvent effectuer ces opérations. Sélectionnez donc ces personnes avec soin.\n\nRemarque : Vos empreintes digitales peuvent être moins sécurisées qu\'un schéma ou un code fiables."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Annuler"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuer"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Passer"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Supprimer"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Commençons!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Placez votre doigt sur le capteur, puis soulevez-le lorsque vous sentez une vibration."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Excellent! Maintenant, refaites-le."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Continuer"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Déplacez légèrement votre doigt pour ajouter toutes les parties de votre empreinte digitale."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Empreinte digitale ajoutée!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Chaque fois que vous voyez cette icône, vous pouvez utiliser votre empreinte digitale pour vous identifier ou pour autoriser un achat."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Il suffit de toucher le capteur d\'empreintes digitales pour activer et déverrouiller votre appareil."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Lorsque vous voyez cette icône, vous pouvez utiliser votre empreinte digitale."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Lorsque vous voyez cette icône, vous pouvez également autoriser des achats ou vous connecter à des applications."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Ignorer config. empreintes digitales?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Vous avez choisi de déverrouiller votre téléphone à l\'aide de votre empreinte digitale. Si vous ignorez cette étape maintenant, vous devrez reprendre la configuration plus tard. L\'opération prend environ une minute."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurer le verrouil. de l\'écran"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Mise à jour l\'adresse d\'urgence"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"L\'adresse utilisée par les services d\'urgence pour déterminer votre position si vous faites un appel au 911 en utilisant le Wi-Fi"</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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Supprimer"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Configurer"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Explorer"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Libérer de l\'espace"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Gérer l\'espace de stockage"</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>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Périphérique multimédia (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Données mises en cache"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Autre"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Système"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorer « <xliff:g id="NAME">^1</xliff:g> »"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"L’étiquette « Autre » fait référence aux fichiers partagés enregistrés par les applications, aux fichiers téléchargés sur Internet ou par Bluetooth, aux fichiers Android, etc. \n\n Pour voir l\'intégralité du contenu de la mémoire de stockage « <xliff:g id="NAME">^1</xliff:g> », touchez « Explorer »."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Le système comprend des fichiers utilisés sur l\'appareil par le système d\'exploitation Android.\n\nCes fichiers ne peuvent pas être affichés individuellement."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"L\'utilisateur « <xliff:g id="USER_0">^1</xliff:g> » a peut-être enregistré des photos, de la musique, des films, des applications et d\'autres données qui occupent <xliff:g id="SIZE">^2</xliff:g> d\'espace. \n\nPour afficher des informations détaillées, utilisez le compte d\'utilisateur « <xliff:g id="USER_1">^1</xliff:g> »."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurer 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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Renseignements juridiques"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contributeurs"</string>
     <string name="manual" msgid="3025943393642974445">"Manuel"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Infos réglementaires"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Étiquettes réglementaires"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Sécurité et données réglementaires"</string>
     <string name="copyright_title" msgid="865906688917260647">"Droits d\'auteur"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Conditions d\'utilisation"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN permanent"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Aucun RPV ajouté."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"RPV toujours actif : activé"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Cette fonction n\'est pas prise en charge dans cette application"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Sélectionnez un profil VPN auquel rester connecté en permanence. Le trafic réseau ne sera autorisé que lorsque vous serez connecté à ce VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Aucun"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Le VPN permanent nécessite une adresse IP pour le serveur et le DNS."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"glisser pour déverrouiller, mot de passe, schéma, nip"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"défi professionnel, travail, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"profil professionnel, profil géré, unifier, unification, travail, profil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"geste"</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>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Touchez une balise pour pour écrire..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Les données en arrière-plan ne sont accessibles que par Wi-Fi. Cela peut nuire à certaines applications ou certains services lorsque le Wi-Fi n\'est pas accessible."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Profil professionnel désactivé"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Les applications, la synchronisation en arrière-plan et d\'autres fonctionnalités liées à votre profil professionnel sont désactivées."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Suggestions (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Suggestions"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Supprimer"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Température des couleurs froides"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utiliser des couleurs plus froides à l\'écran"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Réinitialiser les compteurs de limitation de fréquence ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Gérer notifications écran verrouillage"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Afficher ou masquer le contenu des notifications"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Tous"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Assistance"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"La plus petite largeur"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Aucune application installée n\'a demandé l\'accès aux textos payants"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Accès aux textos payants"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Désactivé"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Mode Démo"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Nous sommes là pour vous aider"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Nous sommes là pour vous aider, 24 heures sur 24, sept jours sur sept"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Notre équipe d\'assistance est là pour répondre à toutes vos questions"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Notre équipe d\'assistance est disponible 24 heures sur 24, sept jours sur sept"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Heures d\'ouverture du service d\'assistance téléphonique (heure locale) &lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Effectuer une recherche dans l\'aide ou lire les conseils et astuces"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Assistance :"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Vous voyagez à l\'étranger?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Des frais d\'interurbains peuvent s\'appliquer"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Téléphone"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Clavarder"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Découvrez des conseils et des astuces"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Effectuer des recherches d\'aide et envoyer des commentaires"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Connectez-vous pour obtenir de l\'assistance"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Connexion"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Vous ne pouvez pas accéder à votre compte?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Envoyer les données système"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Pour vous aider à résoudre rapidement la situation, nous avons besoin de certaines données système afin d\'effectuer un diagnostic."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Ne plus afficher"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Paramètres du profil professionnel"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Recherche de contacts"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Autoriser les recherches de contacts dans votre organisation à identifier les appelants et les contacts"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> heure</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> heures</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> seconde</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> secondes</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Durée d\'attente : environ <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Ordinateur"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Écouteurs"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Téléphone"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Écouteurs"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Périphérique d\'entrée"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Pour vous aider à libérer de l\'espace, le Gestionnaire de stockage supprime les photos et les vidéos sauvegardées sur votre appareil."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Supprimer les photos et les vidéos"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Gestionnaire de stockage"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatique"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuel"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestes"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Passer à l\'appareil photo"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Pour ouvrir rapidement l\'appareil photo, il vous suffit d\'appuyer deux fois sur l\'interrupteur. Cela fonctionne à partir de n\'importe quel écran."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Changer d\'appareil photo"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Pour basculer entre les appareils photo avant et arrière, pivotez deux fois le poignet."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Vérification rapide de l\'écran"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Pour consulter votre téléphone sans le sortir de veille complètement, poussez-le doucement ou saisissez-le."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Glissez un doigt pour afficher les notifications"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Pour vérifier vos notifications à partir de tout écran, glissez un doigt vers le bas sur le capteur d\'empreintes digitales."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Activé"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Désactivé"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Le programme d\'amorçage est déjà déverrouillé"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Connectez-vous d\'abord à Internet"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Non disp. sur les appareils verrouillés par un f. de services"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 2b83368..07d0ede 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Rose"</item>
     <item msgid="6131821495505931173">"Rouge"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Plus de 30 jours"</item>
+    <item msgid="2900554746706302178">"Plus de 60 jours"</item>
+    <item msgid="5692284879054004388">"Plus de 90 jours"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-fr/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-fr/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-fr/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index b3b47a2..c480150 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Activer la connexion des données"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Désactiver la connexion des données"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Configuré par VoLTE"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Appel vidéo géré"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Appel Wi-Fi géré"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Alimentation radio mobile"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Afficher le carnet d\'adresses de la carte SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Afficher les numéros autorisés"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Déverrouillage avec empreinte"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Il vous suffit d\'appuyer sur le lecteur d\'empreintes digitales pour déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications. Toutes les personnes dont les empreintes digitales sont ajoutées sur votre téléphone peuvent effectuer ces opérations. Choisissez donc ces personnes avec soin.\n\nRemarque : Vos empreintes digitales peuvent être moins sécurisées qu\'un schéma ou un code fiables. "<annotation id="url">"En savoir plus"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Il vous suffit d\'appuyer sur le lecteur d\'empreintes digitales pour déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications. Toutes les personnes dont les empreintes digitales sont ajoutées sur votre téléphone peuvent effectuer ces opérations. Choisissez donc ces personnes avec soin.\n\nRemarque : Vos empreintes digitales peuvent être moins sécurisées qu\'un schéma ou un code fiables."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Annuler"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuer"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Ignorer"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Supprimer"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Commencer"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Placez votre doigt sur le lecteur, puis soulevez-le lorsque vous sentez une vibration."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Bravo ! Recommencez"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Continuer"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Déplacez légèrement votre doigt pour ajouter toutes les parties de votre empreinte digitale."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Empreinte ajoutée"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Chaque fois que cette icône apparaît, vous pouvez utiliser votre empreinte pour vous identifier ou autoriser un achat."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Il vous suffit de toucher le lecteur d\'empreintes digitales pour activer et déverrouiller votre appareil."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Lorsque cette icône s\'affiche, vous pouvez utiliser votre empreinte digitale."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Lorsque cette icône s\'affiche, vous pouvez également autoriser des achats ou vous connecter à des applications."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Ignorer config. empreintes digitales ?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Vous avez choisi de déverrouiller votre téléphone à l\'aide de votre empreinte digitale. Si vous ignorez cette étape maintenant, vous devrez reprendre la configuration ultérieurement. L\'opération prend environ une minute."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Verrouillage de l\'écran"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Mettre à jour l\'adresse d\'urgence"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Adresse utilisée par les services d\'urgence pour votre position si vous effectuez un appel d\'urgence à l\'aide du Wi-Fi"</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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Supprimer"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Configurer"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Explorer"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Libérer de l\'espace"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Gérer l\'espace de stockage"</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>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Périphérique multimédia (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Données en cache"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Autre"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Système"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorer la mémoire de stockage \"<xliff:g id="NAME">^1</xliff:g>\""</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Le libellé \"Autre\" fait référence aux fichiers partagés enregistrés par les applications, aux fichiers téléchargés sur Internet ou via le Bluetooth, aux fichiers Android, etc. \n\nPour afficher l\'intégralité du contenu de la mémoire de stockage \"<xliff:g id="NAME">^1</xliff:g>\", appuyez sur \"Explorer\"."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Le système comprend des fichiers utilisés en interne par le système d\'exploitation Android. \n\nCes derniers ne peuvent pas être consultés individuellement."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"L\'utilisateur \"<xliff:g id="USER_0">^1</xliff:g>\" a peut-être enregistré des photos, de la musique, des films, des applications et d\'autres données qui occupent <xliff:g id="SIZE">^2</xliff:g> d\'espace. \n\nPour afficher des informations détaillées, utilisez le compte utilisateur \"<xliff:g id="USER_1">^1</xliff:g>\"."</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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Informations légales"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Collaborateurs"</string>
     <string name="manual" msgid="3025943393642974445">"Manuel"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Réglementations"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Libellés réglementaires"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Informations sécurité et réglementaires"</string>
     <string name="copyright_title" msgid="865906688917260647">"Droits d\'auteur"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Conditions d\'utilisation"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN permanent"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Aucun VPN ajouté"</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"VPN toujours actif : activé"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Non compatible avec cette application"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Sélectionnez un profil VPN auquel rester connecté en permanence. Le trafic réseau ne sera autorisé que lorsque vous serez connecté à ce VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Aucun"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Le VPN permanent nécessite une adresse IP pour le serveur et le DNS."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"faire glisser pour déverrouiller, mot de passe, schéma, code d\'accès"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"verrouillage profil pro, professionnel, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"profil professionnel, profil géré, unifier, unification, professionnel, profil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"geste"</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>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Appuyer sur un tag pour le modifier…"</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Les données en arrière-plan ne sont disponibles que via le Wi-Fi. Cela peut affecter certaines applications ou certains services lorsque le Wi-Fi n\'est pas accessible."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Profil professionnel désactivé"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Les applications, la synchronisation en arrière-plan et d\'autres fonctionnalités liées à votre profil professionnel sont désactivées."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Suggestions (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Suggestions"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Supprimer"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Température des couleurs froides"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utiliser des couleurs plus froides à l\'écran"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Réinitialiser les compteurs de limitation de fréquence ShortcutManager ?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Contrôler notifications écran verrouillage"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Afficher ou masquer le contenu des notifications"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Tous"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Assistance"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"La plus petite largeur"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Aucune demande d\'accès aux SMS premium n\'a été envoyée pour les applications installées."</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Accès aux SMS premium"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Désactivé"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Mode de démonstration"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Nous sommes là pour vous aider"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Nous sommes là pour vous aider 24h/24 et 7j/7"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Notre équipe d\'assistance se tient à votre disposition pour résoudre vos problèmes."</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Notre équipe d\'assistance est disponible 24h/24 et 7j/7."</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Heures d\'ouverture du service d\'assistance téléphonique (heure locale)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Effectuer une recherche dans l\'aide ou lire les conseils et astuces"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Assistance pour :"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> – <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Vous vous déplacez à l\'étranger ?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Des frais d\'appel internationaux peuvent s\'appliquer."</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Téléphone"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Parcourir les conseils et les astuces"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Effectuer des recherches d\'aide et envoyer des commentaires"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Connectez-vous pour obtenir de l\'aide"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Connexion"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Vous ne parvenez pas à accéder à votre compte ?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Envoyer des informations sur le système"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Pour traiter rapidement votre problème, nous avons besoin d\'informations sur le système afin d\'établir un diagnostic."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Ne plus afficher"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Paramètres du profil professionnel"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Recherche de contacts"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Autoriser les recherches de contacts dans votre organisation à identifier les appelants et les contacts"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> heure</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> heures</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> seconde</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> secondes</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Attente de <xliff:g id="ESTIMATE">%1$s</xliff:g> environ"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Ordinateur"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Casque"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Téléphone"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Casque audio"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Périphérique d\'entrée"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Pour libérer de l\'espace de stockage, le gestionnaire d\'espace de stockage supprime des photos et des vidéos sauvegardées sur votre appareil."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Supprimer des photos et des vidéos"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Gestionnaire d\'espace de stockage"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatique"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuels"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestes"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Accès rapide à la caméra"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Pour accéder rapidement à la caméra, il vous suffit d\'appuyer deux fois sur le bouton Marche/Arrêt. Fonctionne à partir de n\'importe quel écran."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Mode \"twist\""</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Pour passer de la caméra frontale à la caméra arrière et inversement, effectuez un double mouvement de rotation du poignet."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Consultation rapide"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Pour consulter votre téléphone sans le réactiver, frôlez-le ou saisissez-le."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Balayer pour afficher les notifications"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Pour vérifier vos notifications à partir de n\'importe quel écran, faites glisser le doigt vers le bas sur le lecteur d\'empreinte digitale."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Activés"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Désactivés"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader déjà déverrouillé"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Connectez-vous tout d\'abord à Internet."</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Indisponible sur les appareils verrouillés par l\'opérateur"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-gl-rES/arrays.xml b/res/values-gl-rES/arrays.xml
index 883ce3d..e2a275f 100644
--- a/res/values-gl-rES/arrays.xml
+++ b/res/values-gl-rES/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Rosa"</item>
     <item msgid="6131821495505931173">"Vermello"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"De máis de 3 días"</item>
+    <item msgid="2900554746706302178">"De máis de 60 días"</item>
+    <item msgid="5692284879054004388">"De máis de 90 días"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-gl-rES/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-gl-rES/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-gl-rES/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 988ec42..cf1b2cf 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Activar conexión de datos"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Desactivar conexión de datos"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Fornecemento VoLTE"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videochamadas activadas"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Chamadas por wifi activadas"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Potencia da radio para móbiles"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Ver axenda de enderezos da SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Ver números de marcación fixa"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloquear coa impresión dixital"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Só tes que tocar o sensor de impresións dixitais para desbloquear o teu teléfono, autorizar compras ou iniciar sesión nas aplicacións.Ten coidado coas impresións dixitais que engades, pois mesmo cunha soa impresión dixital se pode facer todo o indicado previamente.\n\nNota: A túa impresión dixital é menos segura que un padrón forte ou un PIN. "<annotation id="url">"Máis información"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Toca o sensor da impresión dixital para desbloquear o teléfono, autorizar compras ou iniciar sesión nas aplicacións. Ten coidado coas impresións dixitais que engades, pois mesmo cunha soa impresión dixital se pode facer todo o indicado previamente.\n\nNota: A túa impresión dixital é menos segura que un padrón seguro ou un PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Omitir"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Eliminar"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Comecemos"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Coloca o dedo no sensor e levántao cando notes unha vibración."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Ben! Agora repíteo"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Volve tocalo"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Move suavemente o dedo para engadir todas as partes diferentes da túa impresión dixital."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Identificación engadida"</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="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Simplemente toca o sensor de impresións dixitais para activar e desbloquear o teu dispositivo."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Cando vexas esta icona, podes usar a túa impresión dixital."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Cando vexas esta icona, tamén poderás autorizar compras ou iniciar sesión en aplicacións."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Omitir configuración impresión dixital?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Decidiches usar a túa impresión dixital para desbloquear o teu teléfono. Se omites este paso agora, terás que configuralo máis tarde. Non tardarás máis dun minuto en facelo."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurar bloqueo da pantalla"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Actualizar enderezo de emerxencia"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Enderezo que utilizan os servizos de emerxencia como a túa localización se chamas ao 911 a través da wifi"</string>
     <string name="home_settings" msgid="212375129455718176">"Inicio"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Borrar"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Configurar"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Explorar"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Liberar espazo"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Xestionar almacenamento"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Conexión USB do ordenador"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Conectar como"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Dispositivo multimedia (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Datos almacenados en caché"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Outro"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorar <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Entre outros ficheiros inclúense os compartidos que gardaron as aplicacións, os ficheiros descargados de Internet ou Bluetooth, os ficheiros de Android, etc. \n\nPara ver o contido completo de <xliff:g id="NAME">^1</xliff:g>, toca Explorar."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"O sistema inclúe ficheiros que utiliza de forma interna o sistema operativo de Android. \n\nEstes ficheiros non se poden visualizar de individualmente."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"É posible que <xliff:g id="USER_0">^1</xliff:g> teña gardadas fotos, música, películas, aplicacións ou outros datos que están ocupando <xliff:g id="SIZE">^2</xliff:g> de almacenamento. \n\nPara ver os detalles, cambia a <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Información legal"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Colaboradores"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Información normativa"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Etiquetas normativas"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Información normativa e de seguranza"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenza"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termos e condicións"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN sempre activada"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Non se engadiron VPN."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Opción Sempre activada activa"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Opción non admitida nesta aplicación"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecciona un perfil de VPN ao que permanecer sempre conectado. Só se permitirá tráfico de rede cando esteas conectado a esta VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Ningunha"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"As VPN que están sempre activadas requiren un enderezo IP para o servidor e o DNS."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"pasar o dedo para desbloquear, contrasinal, padrón, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"desafío de traballo, traballo, perfil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"perfil de traballo, perfil xestionado, agrupar, agrupación traballo, perfil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"xesto"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC wifi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escribir"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Toca unha etiqueta para escribir..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Os datos en segundo plano só están dispoñibles a través de wifi. Esta opción pode afectar a algunhas aplicacións ou servizos cando non haxa wifi."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Perfil de traballo desactivado"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"As aplicacións, a sincronización en segundo plano e outras funcións relacionadas co teu perfil de traballo están desactivadas."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Suxestións (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Suxestións"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Eliminar"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de cor fría"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utiliza cores de visualización máis frías"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Queres restablecer os contadores de límite de velocidade de ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notificacións pantalla bloqueo"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar ou ocultar o contido das notificacións"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Todo"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Asistencia"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Menor largura"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ningunha aplicación instalada solicitou acceso ás mensaxes premium"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Acceso ás mensaxes premium"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Desactivado"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Modo de demostración"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Se precisas axuda, conta connosco"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Estamos á túa disposición as 24 horas do día, os 7 días da semana"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"O noso equipo de asistencia está dispoñible para resolver os problemas que xurdan"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"O noso equipo de asistencia está dispoñible as 24 horas do día, os 7 días da semana"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Horario de asistencia telefónica (hora local)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Busca axuda ou consulta consellos e trucos"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Asistencia telefónica para:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Vas viaxar ao estranxeiro?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"É posible que se apliquen tarifas internacionais"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Teléfono"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Consultar consellos e trucos"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Buscar axuda e enviar comentarios"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Inicia sesión para obter asistencia"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Iniciar sesión"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Non podes acceder á túa conta?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Enviar información do sistema"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Para axudar a resolver o problema rapidamente, necesitamos a información do sistema co fin de realizar o diagnóstico."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Non mostrar de novo"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Configuración do perfil de traballo"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Busca de contactos"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Permite buscas de contactos por parte da túa organización para identificar os emisores das chamadas e os contactos"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> horas</item>
+      <item quantity="one">1 hora</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
+      <item quantity="one">1 minuto</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
+      <item quantity="one">1 segundo</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Espera de aproximadamente <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Ordenador"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Auriculares con micrófono"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Teléfono"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Auriculares"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Periférico de entrada"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Para axudar a liberar espazo de almacenamento, o xestor de almacenamento elimina as fotos e vídeos con copia de seguranza do teu dispositivo."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Eliminar fotos e vídeos"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Xestor de almacenamento"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automático"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Xestos"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Saltar á cámara"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Para abrir rapidamente a cámara, simplemente toca dúas veces o botón de acendido. Isto funciona en calquera pantalla."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Voltear a cámara"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Para cambiar entre a cámara dianteira e traseira, xira o dispositivo dúas veces."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Consulta rápida da pantalla"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Colle o teléfono ou acércao para consultalo sen necesidade de activalo por completo."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Pasar o dedo para consultar as notificacións"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Para consultar as túas notificacións desde calquera pantalla, pasa o dedo cara abaixo no sensor de impresión dixital."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Activado"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Desactivado"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"O cargador de inicio xa está desbloqueado"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Conéctate a Internet en primeiro lugar"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Non está dispoñible nos dispositivos bloqueados polo operador"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-gu-rIN/arrays.xml b/res/values-gu-rIN/arrays.xml
index 0011070..1aafd42 100644
--- a/res/values-gu-rIN/arrays.xml
+++ b/res/values-gu-rIN/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"ગુલાબી"</item>
     <item msgid="6131821495505931173">"લાલ"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"30 દિવસથી વધુ જૂનું"</item>
+    <item msgid="2900554746706302178">"60 દિવસથી વધુ જૂનું"</item>
+    <item msgid="5692284879054004388">"90 દિવસથી વધુ જૂનું"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-gu-rIN/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-gu-rIN/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-gu-rIN/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 38b288a..5918eee 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"ડેટા કનેક્શન સક્ષમ કરો"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ડેટા કનેક્શન અક્ષમ કરો"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE ની જોગવાઈ કરી"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"વિડિઓ કૉલિંગની જોગવાઈ કરી"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi કૉલિંગની જોગવાઈ કરી"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"સેલ્યુલર રેડિઓ પાવર"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM સરનામાં પુસ્તિકા જુઓ"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ફિક્સ્ડ ડાયલિંગ નંબર્સ જુઓ"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"ફિંગરપ્રિન્ટથી અનલૉક"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"તમારા ફોનને અનલૉક કરવા, ખરીદીઓ અધિકૃત કરવા અથવા ઍપ્લિકેશનોમાં સાઇન ઇન કરવા માટે બસ ફિંગરપ્રિન્ટ સેન્સરને ટચ કરો. તમે કોની ફિંગરપ્રિન્ટ્સ ઉમેરી છે તે બાબતે સાવચેત રહો.\n\nનોંધ: તમારી ફિંગરપ્રિન્ટ એક સશક્ત પેટર્ન અથવા PIN કરતાં ઓછી સુરક્ષિત હોઈ શકે છે. "<annotation id="url">"વધુ જાણો"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"તમારા ફોનને અનલૉક કરવા, ખરીદીઓ અધિકૃત કરવા અથવા ઍપ્લિકેશનોમાં સાઇન ઇન કરવા માટે બસ ફિંગરપ્રિન્ટ સેન્સરને ટચ કરો. તમે કોની ફિંગરપ્રિન્ટ્સ ઉમેરી છે તે બાબતે સાવચેત રહો. એક ઉમેરેલ ફિંગરપ્રિન્ટ પણ આમાંની કોઈપણ વસ્તુઓ કરી શકે છે.\n\nનોંધ: તમારી ફિંગરપ્રિન્ટ એક સશક્ત પેટર્ન અથવા PIN કરતાં ઓછી સુરક્ષિત હોઈ શકે છે."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"રદ કરો"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ચાલુ રાખો"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"છોડો"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"કાઢી નાખો"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"ચાલો શરૂ કરીએ!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"સેન્સર પર તમારી આંગળી મૂકો અને વાઇબ્રેશનનો અનુભવ થવા પર ઉઠાવી લો"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"સરસ! હવે પુનરાવર્તન કરો"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"ચાલુ રાખો"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"તમારી ફિંગરપ્રિન્ટના તમામ ભિન્ન ભાગોને ઉમેરવા માટે તમારી આંગળીને સહેજ ખસેડો"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"ફિંગરપ્રિન્ટ ઉમેરી!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"જ્યારે પણ તમે આ આઇકન જુઓ, તમે ઓળખ માટે અથવા ખરીદી અધિકૃત કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરી શકો છો."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"તમારા ઉપકરણને સક્રિય કરવા અને અનલૉક કરવા માટે માત્ર ફિંગરપ્રિન્ટ સેન્સરને ટચ કરો."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"જ્યારે તમે આ આયકન જુઓ, ત્યારે તમે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરી શકો છો."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"જ્યારે તમને આ આઇકન દેખાય, ત્યારે તમે ખરીદીઓને અધિકૃત કરી અથવા તો ઍપ્લિકેશનોમાં સાઇન ઇન પણ કરી શકો છો."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ફિંગરપ્રિન્ટ સેટ કરવાનું છોડીએ?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"તમે તમારા ફોનને અનલૉક કરવા માટેની એક રીત તરીકે તમારી ફિંગરપ્રિન્ટને ઉપયોગમાં લેવાનું પસંદ કર્યું છે. જો તમે હવે છોડી દો છો, તો તમારે આને પછીથી સેટ કરવું પડશે. સેટઅપમાં માત્ર એક મિનિટ અથવા તેથી વધુ સમય લાગે છે."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"સ્ક્રીન લૉક સેટ કરો"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"જ્યારે Wi-Fi કૉલિંગ ચાલુ હોય, ત્યારે તમારી પસંદગી અને કયા સિગ્નલ મજબૂત છે તેને આધારે, તમારો ફોન Wi-Fi અથવા તમારા કેરીઅરના નેટવર્ક મારફતે કૉલ્સને રુટ કરી શકે છે. આ સુવિધાને ચાલુ કરતાં પહેલાં, ફી અને અન્ય વિગતો માટે તમારા કેરિઅર સાથે તપાસ કરો."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"કટોકટીના સરનામાંને અપડેટ કરો"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"જો તમે WiFi નો ઉપયોગ કરીને 911 કૉલ કરો તો કટોકટીની સેવાઓ દ્વારા તમારા સ્થાનનો સરનામા તરીકે ઉપયોગ કરવામાં આવે છે"</string>
     <string name="home_settings" msgid="212375129455718176">"ઘર"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ડિસ્પ્લે"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ધ્વનિ"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"ભૂલી જાઓ"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"સેટ કરો"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"અન્વેષણ કરો"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"સ્થાન ખાલી કરો"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"સ્ટોરેજનું સંચાલન કરો"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB કમ્પ્યુટર કનેક્શન"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"આ તરીકે કનેક્ટ કરો"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"મીડિયા ઉપકરણ (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"ઑડિઓ"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"કેશ્ડ ડેટા"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"અન્ય"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"સિસ્ટમ"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> નું અન્વેષણ કરો"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"અન્યમાં ઍપ્લિકેશનો, ફાઇલો દ્વારા સાચવવામાં આવેલ શેર કરેલી ફાઇલો, ઇન્ટરનેટ અથવા Bluetooth માંથી ડાઉનલોડ કરેલી ફાઇલો, Android ફાઇલો અને આના જેવી વધુ શામેલ છે. \n\nઆ <xliff:g id="NAME">^1</xliff:g> ની સંપૂર્ણ સામગ્રીઓ જોવા માટે, અન્વેષણ કરો ટૅપ કરો."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"સિસ્ટમમાં Android ઓપરેટિંગ સિસ્ટમ દ્વારા આંતરિક રીતે ઉપયોગ થયેલ ફાઇલોનો સમાવેશ થાય છે. \n\nઆ ફાઇલો વ્યક્તિગત રીતે જોઈ શકાતી નથી."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> એ <xliff:g id="SIZE">^2</xliff:g> સ્ટોરેજ લેતાં હોય તેવા ફોટા, સંગીત, મૂવીઝ, ઍપ્લિકેશનો અથવા અન્ય ડેટા સાચવ્યો હોઈ શકે. \n\nવિગતો જોવા માટે, <xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"કાનૂની માહિતી"</string>
     <string name="contributors_title" msgid="5917703088825286504">"સહયોગકર્તાઓ"</string>
     <string name="manual" msgid="3025943393642974445">"મેન્યુઅલ"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"નિયમનકારી માહિતી"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"નિયમનકારી લેબલ્સ"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"સુરક્ષા અને નિયમનકારી માહિતી"</string>
     <string name="copyright_title" msgid="865906688917260647">"કોપિરાઇટ"</string>
     <string name="license_title" msgid="1990487604356037871">"લાઇસન્સ"</string>
     <string name="terms_title" msgid="7697580845616764642">"નિયમો અને શરતો"</string>
@@ -2232,6 +2241,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"હંમેશા ચાલુ VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"કોઇ VPN ઉમેર્યાં નથી."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"હંમેશાં ચાલુ સક્રિય"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"આ ઍપ્લિકેશન દ્વારા સમર્થિત નથી"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"હંમેશા તેની સાથે કનેક્ટ રહેવા માટે એક VPN પ્રોફાઇલ પસંદ કરો. આ VPN સાથે કનેક્ટ હશે માત્ર ત્યારે જ નેટવર્ક ટ્રાફિકને મંજૂરી આપવામાં આવશે."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"કોઈ નહીં"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"હંમેશા-ચાલુ VPN ને સર્વર અને DNS બંને માટે એક IP સરનામાંની જરૂર છે."</string>
@@ -2500,6 +2510,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"અનલૉક કરવા માટે સ્લાઇડ કરો, પાસવર્ડ, પેટર્ન, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"કાર્ય પડકાર, કાર્ય, પ્રોફાઇલ"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"કાર્ય પ્રોફાઇલ, સંચાલિત પ્રોફાઇલ, એકીકૃત કરો, એકીકરણ, કાર્ય, પ્રોફાઇલ"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"હાવભાવ"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ટેગ સેટ કરો"</string>
     <string name="write_tag" msgid="8571858602896222537">"લખો"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"લખવા માટે ટેગ પર ટેપ કરો..."</string>
@@ -2991,7 +3002,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"પૃષ્ઠભૂમિ ડેટા માત્ર Wi-Fi મારફતે ઉપલબ્ધ છે. જ્યારે Wi-Fi ઉપલબ્ધ ન હોય ત્યારે આ કેટલીક ઍપ્લિકેશનો અથવા સેવાઓને પ્રભાવિત કરી શકે છે."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"કાર્ય પ્રોફાઇલ બંધ છે"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"તમારી કાર્ય પ્રોફાઇલને સંબંધિત ઍપ્લિકેશનો, પૃષ્ઠભૂમિ સમન્વયન અને અન્ય સુવિધાઓ બંધ છે."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"સૂચનો (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"સૂચનો"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"દૂર કરો"</string>
     <string name="color_temperature" msgid="2070126836910615605">"કૂલ રંગ તાપમાન"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"વધુ કૂલ પ્રદર્શન રંગોનો ઉપયોગ કરો"</string>
@@ -3084,6 +3096,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager દરને મર્યાદિત કરતાં ગણકો ફરીથી સેટ કરીએ?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"લૉક સ્ક્રીન સૂચનાઓ નિયંત્રિત કરો"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"સૂચના સામગ્રી બતાવો અથવા છુપાવો"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"તમામ"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"સમર્થન"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"સૌથી નાની પહોળાઈ"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"કોઈ ઇન્સ્ટૉલ કરેલ ઍપ્લિકેશનોએ પ્રીમિયમ SMS ઍક્સેસની વિનંતી કરી નથી"</string>
@@ -3091,9 +3105,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"પ્રીમિયમ SMS ઍક્સેસ"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"અક્ષમ કરેલ"</string>
     <string name="demo_mode" msgid="2655748420527206870">"ડેમો મોડ"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"સહાય કરવા માટે અમે અહીં ઉપલબ્ધ છીએ"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"અમે તમારા માટે 24/7 અહીં ઉપલબ્ધ છીએ"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"કોઈપણ સમસ્યાઓના સમાધાનમાં સહાય કરવા માટે અમારી સમર્થન ટીમ અહીં ઉપલબ્ધ છે"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"અમારી સમર્થન ટીમ આખો દિવસ, દરરોજ ઉપલબ્ધ છે"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"ફોન સમર્થિત સમય (સ્થાનિક સમય)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"સહાય શોધો અથવા ટિપ્સ અને યુક્તિઓનું અન્વેષણ કરો"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"આ માટે સમર્થન:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"વિદેશની મુસાફરી કરી રહ્યાં છો?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"આંતરરાષ્ટ્રીય શુલ્ક લાગુ થઈ શકે"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"ફોન"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"ચેટ"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"ટિપ્સ અને યુક્તિઓનું અન્વેષણ કરો"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"સહાય શોધો અને પ્રતિસાદ મોકલો"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"સમર્થન માટે સાઇન ઇન કરો"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"સાઇન ઇન કરો"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"તમારું એકાઉન્ટ ઍક્સેસ કરી શકતાં નથી?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"સિસ્ટમ માહિતી મોકલો"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"તમારી સમસ્યાનો ઝડપથી ઉકેલ લાવવામાં સહાય કરવા, નિદાન માટે અમને સિસ્ટમ માહિતીની જરૂર છે."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"ફરી બતાવશો નહીં"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"કાર્ય પ્રોફાઇલ સેટિંગ્સ"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"સંપર્ક શોધ"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"કૉલર્સ અને સંપર્કોને ઓળખવા માટે તમારી સંસ્થા દ્વારા સંપર્ક શોધની મંજૂરી આપો"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> કલાક</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> કલાક</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> મિનિટ</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> મિનિટ</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> સેકંડ</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> સેકંડ</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> રાહ જુઓ"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"કમ્પ્યુટર"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"હેડસેટ"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"ફોન"</string>
@@ -3101,4 +3149,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"હેડફોન"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"ઇનપુટ પેરિફેરલ"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"સ્ટોરેજ સ્થાન ખાલી કરવામાં સહાય માટે, સ્ટોરેજ સંંચાલક તમારા ઉપકરણમાંથી બેક અપ લીધેલા ફોટા અને વિડિઓઝને દૂર કરો."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ફોટા અને વિડિઓઝ દૂર કરો"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"સ્ટોરેજ સંચાલક"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"સ્વચાલિત"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"મેન્યુઅલ"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"હાવભાવ"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"કૅમેરા પર જાઓ"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"ઝડપથી કૅમેરો ખોલવા માટે, બસ પાવર બટનને બે વાર ટૅપ કરો. કોઈપણ સ્ક્રીન પરથી કામ કરે છે."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"કૅમેરો ફ્લિપ કરો"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"આગળ અને પાછળના કૅમેરા વચ્ચે સ્વિચ કરવા માટે, બે-વખત ટ્વિસ્ટ કરો."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"ઝડપી સ્ક્રીન તપાસ"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"તમારા ફોનને પૂર્ણપણે સક્રિય કર્યા વિના તેને તપાસવા માટે, તેને નજ કરો અથવા ઉઠાવો."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"સૂચનાઓ માટે સ્વાઇપ કરો"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"કોઈપણ સ્ક્રીનથી તમારી સૂચનાઓ તપાસવા માટે, ફિંગરપ્રિન્ટ સેન્સર પર નીચે સ્વાઇપ કરો."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"ચાલુ"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"બંધ"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"બૂટલોડર પહેલાંથી અનલૉક કરેલ છે"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"પહેલા ઇન્ટરનેટથી કનેક્ટ કરો"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"કૅરિઅર દ્વારા લૉક કરેલ ઉપકરણો પર અનુપલબ્ધ"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 529f6c8..693be56 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"गुलाबी"</item>
     <item msgid="6131821495505931173">"लाल"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"30 दिन से अधिक पुराने"</item>
+    <item msgid="2900554746706302178">"60 दिन से अधिक पुराने"</item>
+    <item msgid="5692284879054004388">"90 दिन से अधिक पुराने"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-hi/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-hi/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-hi/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 67e6569..9ff9491 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"डेटा कनेक्शन सक्षम करें"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"डेटा कनेक्शन अक्षम करें"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE प्रावधान किया गया"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"वीडियो कॉल का प्रावधान किया गया"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"वाई-फ़ाई कॉल का प्रावधान किया गया"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"सेल्युलर रेडियो पावर"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"सिम पता पुस्तिका देखें"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"फ़िक्‍स्‍ड डायलिंग नंबर देखें"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"फ़िंगरप्रिंट से अनलॉक"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"अपने फ़ोन को अनलॉक करने, खरीदारियों को प्राधिकृत करने या ऐप्लिकेशन में प्रवेश करने के लिए बस फ़िंगरप्रिंट सेंसर स्पर्श करें. इसमें सावधानी रखें कि आप किस व्यक्ति के फ़िंगरप्रिंट जोड़ रहे हैं. यहां तक कि जोड़े गए एक भी प्रिंट से भी इनमें से कोई चीज़ हो सकती है.\n\nध्यान दें: हो सकता है कि आपका फ़िंगरप्रिंट किसी सशक्त पैटर्न या पिन से कम सुरक्षित हो. "<annotation id="url">"अधिक जानें"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"अपना फ़ोन अनलॉक करने, खरीदारियां अधिकृत करने या ऐप्लिकेशन में प्रवेश करने के लिए बस फ़िंगरप्रिंट सेंसर स्पर्श करें. इस बारे में सावधानी रखें कि आप किसके फ़िंगरप्रिंट जोड रहे हैं. यहां तक एक जोड़ा गया प्रिंट भी इनमें से कोई भी कार्य कर सकता है.\n\nनोट: आपका फ़िंगरप्रिंट किसी सशक्त पैटर्न या पिन से कम सुरक्षित हो सकता है."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"अभी नहीं"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"जारी रखें"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"अभी नहीं"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"हटाएं"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"आइए प्रारंभ करें!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"अपनी अंगुली संवेदक पर रखें और कंपन का अनुभव होने पर उठा लें"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"बहुत अच्छा! अब दोहराएं"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"जारी रखें"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"अपने फ़िंगरप्रिंट के सभी भिन्न भागों को जोड़ने के लिए अपनी अंगुली को धीरे से हिलाएं"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"अंगुली की छाप जोड़ा है!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"जब भी आपको यह आइकन दिखाई दे, आप पहचान के लिए या खरीदारी को अधिकृत करने के लिए अपने फ़िंगरप्रिंट का उपयोग कर सकते हैं."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"अपने डिवाइस को सक्रिय और अनलॉक करने के लिए बस फ़िंगरप्रिंट सेंसर स्पर्श करें."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"जब आपको यह आइकन दिखाई दे, तो आप अपने फ़िंगरप्रिंट का उपयोग कर सकते हैं."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"यह आइकन दिखाई देने पर, आप खरीदारियां प्राधिकृत कर सकते हैं या ऐप्लिकेशन में प्रवेश भी कर सकते हैं."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"फ़िंगरप्रिंट सेटअप छोड़ें?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"आपने अपने फ़ोन को अनलॉक करने के एक तरीके के रूप में अपने फ़िंगरप्रिंट का उपयोग करने का चयन किया है. यदि आप इसे अभी छोड़ते हैं, तो आपको इसे बाद में सेट करना होगा. सेटअप में लगभग एक मिनट लगता है."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"स्‍क्रीन लॉक सेट करें"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"वाई-फ़ाई कॉलिंग चालू होने पर, आपका फ़ोन आपकी प्राथमिकता और अधिक सशक्त सिग्‍नल के आधार पर वाई-फ़ाई नेटवर्क या आपके वाहक के नेटवर्क के द्वारा कॉल को रूट कर सकता है. इस सुविधा को चालू करने से पहले, शुल्‍क और अन्‍य विवरणों के बारे में अपने वाहक से बात करें."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"आपातकालीन पता अपडेट करें"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"जब आप वाई-फ़ाई का उपयोग करके 911 पर कॉल करते है तब आपातकालीन सेवाओं द्वारा आपके स्थान के रूप में उपयोग किया जाने वाला पता"</string>
     <string name="home_settings" msgid="212375129455718176">"होम"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"स्क्रीन सेटिंग देखें"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ध्वनि"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"भूल जाएं"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"सेट करें"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"एक्सप्लोर करें"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"स्थान खाली करें"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"मेमोरी प्रबंधित करें"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB कंप्‍यूटर कनेक्‍शन"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"इस रूप में कनेक्ट करें"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"मीडिया डिवाइस (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"ऑडियो"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"संग्रहीत डेटा"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"अन्य"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"सिस्टम"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> एक्‍सप्‍लोर करें"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"अन्य में ऐप्स द्वारा सहेजी गईं साझा फ़ाइलें, इंटरनेट या ब्लूटूथ से डाउनलोड की गईं फ़ाइलें, Android फ़ाइलें आदि शामिल हैं. \n\nइस <xliff:g id="NAME">^1</xliff:g> की संपूर्ण सामग्री देखने के लिए, एक्सप्लोर करें पर टैप करें."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"सिस्टम में Android ऑपरेटिंग सिस्टम द्वारा आंतरिक रूप से उपयोग की जाने वाली फ़ाइलें शामिल हैं. \n\nइन फ़ाइलों को अलग-अलग नहीं देखा जा सकता."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> में सहेजी गई फ़ोटो, संगीत, फ़िल्‍में, ऐप्‍स या अन्‍य डेटा हो सकता है जो <xliff:g id="SIZE">^2</xliff:g> संग्रहण का उपयोग कर रहा है. \n\nविवरण देखने के लिए, <xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"कानूनी जानकारी"</string>
     <string name="contributors_title" msgid="5917703088825286504">"योगदानकर्ता"</string>
     <string name="manual" msgid="3025943393642974445">"मैन्युअल"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"विनियामक जानकारी"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"नियामक लेबल"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"सुरक्षा और नियामक जानकारी"</string>
     <string name="copyright_title" msgid="865906688917260647">"कॉपीराइट"</string>
     <string name="license_title" msgid="1990487604356037871">"लाइसेंस"</string>
     <string name="terms_title" msgid="7697580845616764642">"नियम और शर्तें"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"हमेशा-चालू VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"कोई VPN नहीं जोड़ा गया."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"हमेशा चालू डिवाइस"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"यह ऐप्लिकेशन समर्थन नहीं करता है"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"वह VPN प्रोफ़ाइल चुनें जिससे हमेशा कनेक्ट रहना है. नेटवर्क ट्रैफ़िक की अनुमति केवल इस VPN से कनेक्ट रहने पर ही दी जाएगी."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"कोई नहीं"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"हमेशा-चालू VPN के लिए, सर्वर और DNS दोनों के लिए IP पता होना आवश्यक है."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"अनलॉक करने के लिए स्लाइड करें, पासवर्ड, पैटर्न, पिन"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"कार्य चुनौती, कार्य, प्रोफ़ाइल"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"कार्य प्रोफ़ाइल, प्रबंधित प्रोफ़ाइल, एक करना, एकीकरण, कार्य, प्रोफ़ाइल"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"हावभाव"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"वाई-फ़ाई  NFC टैग सेट करें"</string>
     <string name="write_tag" msgid="8571858602896222537">"लिखें"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"लिखने के लिए टैग टैप करें..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"बैकग्राउंड डेटा केवल वाई-फ़ाई के द्वारा उपलब्ध है. इससे वाई-फ़ाई के उपलब्ध नहीं रहने पर कुछ ऐप्स या सेवाएं प्रभावित हो सकती हैं."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"कार्य प्रोफ़ाइल बंद है"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"आपकी कार्य प्रोफ़ाइल से संबंधित ऐप्स, पृष्ठभूमि समन्वयन और अन्य सुविधाएं बंद हैं."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"सुझाव (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"सुझाव"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"निकालें"</string>
     <string name="color_temperature" msgid="2070126836910615605">"शीतल रंग तापमान"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"अधिक शीतल प्रदर्शन रंगों का उपयोग करें"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager दर सीमित करने वाले काउंटर रीसेट करें?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"लॉक स्क्रीन नोटिफ़िकेशन नियंत्रित करें"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"नोटिफ़िकेशन की सामग्री दिखाएं या छिपाएं"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"सभी"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"सहायता"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"न्यूनतम चौड़ाई"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"इंस्टॉल किए गए किसी भी ऐप्लिकेशन द्वारा प्रीमियम SMS एक्सेस का अनुरोध नहीं किया गया"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"प्रीमियम SMS एक्सेस"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"अक्षम किया गया"</string>
     <string name="demo_mode" msgid="2655748420527206870">"डेमो मोड"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"सहायता के लिए हम यहां हैं"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"हम आपके लिए पूरे सप्ताह, हर समय यहां उपलब्ध हैं"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"किसी भी समस्या का समाधान करने के लिए हमारी सहायता टीम यहां उपलब्ध है"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"हमारी सहायता टीम हर दिन, हर समय उपलब्ध रहती है"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"फ़ोन सहायता चालू रहने का समय (स्थानीय समय)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"सहायता खोजें या टिप्स और सुझाव एक्सप्लोर करें"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"इसके लिए समर्थन:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"विदेश यात्रा कर रहे हैं?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"अंतर्राष्‍ट्रीय शुल्क लागू हो सकते हैं"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"फ़ोन"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"चैट करें"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"टिप्स और सुझाव एक्सप्लोर करें"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"सहायता खोजें और फ़ीडबैक भेजें"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"सहायता के लिए प्रवेश करें"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"प्रवेश करें"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"अपना खाता एक्सेस नहीं कर सकते?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"सिस्टम जानकारी भेजें"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"आपकी समस्या तुरंत सुलझाने में सहायता हेतु, हमें निदान के लिए सिस्टम जानकारी की आवश्यकता होगी."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"दोबारा ना दिखाएं"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"कार्य प्रोफ़ाइल सेटिंग"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"संपर्क खोज"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"कॉलर और संपर्कों की पहचान करने के लिए अपने संगठन में संपर्क खोज करने दें"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> घंटे</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> घंटे</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> मिनट</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> मिनट</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> सेकंड</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> सेकंड</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> प्रतीक्षा करें"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"कंप्यूटर"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"हैडसेट"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"फ़ोन"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"हेडफ़ोन"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"इनपुट पेरिफ़ेरल"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"ब्लूटूथ"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"मेमोरी स्थान खाली करने में सहायता के लिए, मेमोरी प्रबंधक आपके डिवाइस से बैकअप ली गई फ़ोटो और वीडियो निकाल देता है."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"फ़ोटो और वीडियो निकालें"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"मेमोरी प्रबंधक"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"स्वचालित"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"मैन्युअल"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"हावभाव"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"सीधे कैमरे पर जाएं"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"कैमरा तुरंत खोलने के लिए, बस पावर बटन पर डबल-टैप करें. ऐसा किसी भी स्क्रीन से किया जा सकता है."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"कैमरा फ़्लिप करें"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"सामने और पीछे वाले कैमरे के बीच स्‍विच करने के लिए, डबल-ट्विस्ट करें"</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"स्क्रीन की त्वरित जांच"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"अपने फ़ोन को पूरी तरह सक्रिय किए बिना देखने के लिए, उसे नज करें या उठाएं."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"नोटिफ़िकेशन के लिए स्वाइप करें."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"किसी भी स्क्रीन से अपने नोटिफ़िकेशन देखने के लिए, फ़िंगरप्रिंट सेंसर पर नीचे स्वाइप करें."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"चालू"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"बंद"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"बूटलोडर पहले से ही अनलाॅक किया हुआ है"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"पहले इंटरनेट से कनेक्ट करें"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"वाहक द्वारा लॉक किए गए डिवाइस पर उपलब्ध नहीं है"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 96ecfa4..ec98fa5 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Ružičasta"</item>
     <item msgid="6131821495505931173">"Crvena"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Starije od 30 dana"</item>
+    <item msgid="2900554746706302178">"Starije od 60 dana"</item>
+    <item msgid="5692284879054004388">"Starije od 90 dana"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-hr/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-hr/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-hr/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 9611983..0666ece 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -40,6 +40,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Omogući podatkovnu vezu"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Onemogući podatkovnu vezu"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE omogućen"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Pružena usluga videopoziva"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Pružena usluga poziva putem Wi-Fi-ja"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Snaga radio ćelije"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Prikaži imenik SIM-a"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Prikaži brojeve za fiksno biranje"</string>
@@ -337,7 +339,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Otključavanje otiskom"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Jednostavno dodirnite senzor otiska prsta da biste otključali telefon, autorizirali kupnje ili se prijavili na aplikacije. Pazite čije otiske dodajete. Svaki otisak koji dodate može se upotrijebiti za sve te radnje.\n\nNapomena: otisak prsta nije toliko siguran kao snažan uzorak ili PIN. "<annotation id="url">"Saznajte više"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Jednostavno dodirnite senzor otiska prsta da biste otključali telefon, autorizirali kupnje ili se prijavili na aplikacije. Pazite čije otiske dodajete. Svaki otisak koji dodate može se upotrijebiti za sve te radnje.\n\nNapomena: otisak prsta nije toliko siguran kao snažan uzorak ili PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Otkaži"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Nastavi"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Preskoči"</string>
@@ -358,12 +360,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Izbriši"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Počnimo!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Stavite prst na senzor i podignite ga kada osjetite vibraciju"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Sjajno! Sada ponovite."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Nastavite"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Lagano pomaknite prst da biste ostavili potpuni otisak prsta"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Otisak prsta je dodan!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kada se prikaže ta ikona, možete se identificirati ili autorizirati kupnju otiskom prsta."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Jednostavno dodirnite senzor otiska prsta da biste aktivirali i otključali uređaj."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Kada vidite ovu ikonu, možete upotrijebiti otisak prsta."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Kada vidite ovu ikonu, možete autorizirati kupnje ili se prijaviti u aplikacije."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Preskočiti postavljanje otiska prsta?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Odlučili ste se za otisak prsta kao jedan od načina za otključavanje telefona. Ako sad preskočite, morat ćete ga postaviti kasnije. Postavljanje traje samo otprilike jednu minutu."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Postavi zaključavanje zaslona"</string>
@@ -844,6 +846,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Ažuriranje adrese za hitne slučajeve"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Adresa koju će hitne službe koristiti kao vašu lokaciju ako nazovete 112 putem Wi-Fi-ja"</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>
@@ -1065,6 +1069,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Zaboravi"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Postavi"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Istraži"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Oslobodi prostor"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Upravljaj pohranom"</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>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Uređaj za medije (MTP)"</string>
@@ -1101,8 +1107,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audiozapisi"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Podaci iz predmemorije"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Ostalo"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sustav"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Istraži <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Ostalo uključuje dijeljene datoteke koje su spremile aplikacije, datoteke preuzete s interneta ili Bluetoothom, Android datoteke i tako dalje. \n\nDa biste vidjeli sve što <xliff:g id="NAME">^1</xliff:g> sadrži, dodirnite Istraži."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Sustav uključuje datoteke koje se interno upotrebljavaju u operativnom sustavu Android. \n\nTe se datoteke ne mogu prikazati pojedinačno."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Korisnik <xliff:g id="USER_0">^1</xliff:g> možda ima spremljene fotografije, glazbu, filmove, aplikacije ili druge podatke koji zauzimaju <xliff:g id="SIZE">^2</xliff:g> prostora za pohranu. \n\nZa prikaz pojedinosti prijeđite na korisnika <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1293,7 +1301,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Pravne informacije"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Suradnici"</string>
     <string name="manual" msgid="3025943393642974445">"Priručnik"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Informacije o propisima"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Regulatorne oznake"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Informacije o sigurnosti i propisima"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autorska prava"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenca"</string>
     <string name="terms_title" msgid="7697580845616764642">"Uvjeti i odredbe"</string>
@@ -2247,6 +2256,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Uvijek uključena VPN mreža"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Nije dodan nijedan VPN."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Značajka Uvijek uključeno aktivna"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Ova aplikacija ne podržava tu opciju"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Odaberite VPN profil s kojim ćete uvijek biti povezani. Mrežni promet bit će dopušten samo kada ste povezani s tom VPN mrežom."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Ništa"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Uvijek uključena VPN mreža zahtijeva IP adresu za poslužitelj i za DNS."</string>
@@ -2519,6 +2529,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"kliziti prstom za otključavanje, zaporka, uzorak, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"radni izazov, radni, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"radni profil, upravljani profil, objediniti, objedinjavanje, radni, profil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"pokret"</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>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Dodirnite oznaku da biste zapisali podatke..."</string>
@@ -3020,7 +3031,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Pozadinski podaci dostupni su samo putem Wi-Fi-ja. To može utjecati na neke aplikacije ili usluge kada Wi-Fi nije dostupan."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Radni je profil isključen"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Isključene su aplikacije, sinkronizacija u pozadini i ostale značajke povezane s vašim radnim profilom."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Prijedlozi (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Prijedlozi"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"Više od <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Ukloni"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Hladna temperatura boje"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Upotrebljavaj hladnije boje prikaza"</string>
@@ -3114,6 +3126,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Želite li poništiti brojače ograničenja brzine ShortcutManagera?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrola obavijesti zaključanog zaslona"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Prikazivanje ili sakrivanje sadržaja obavijesti"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Sve"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Podrška"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Najmanja širina"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nijedna instalirana aplikacija nije zatražila pristup premium SMS-ovima"</string>
@@ -3121,9 +3135,46 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Pristup premium SMS-ovima"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Onemogućeno"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Demo način"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Rado ćemo vam pomoći"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Uvijek smo tu za vas"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Obratite se našem timu za podršku u vezi s bilo kojom poteškoćom. Zato je tu."</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Naš tim za podršku uvijek je dostupan."</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Radno vrijeme telefonske podrške (lokalno vrijeme)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Potražite pomoć ili istražite savjete i trikove"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Podrška za:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> – <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Putujete u inozemstvo?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Mogu se primjenjivati međunarodne naknade"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Istraži savjete i trikove"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Pretraži pomoć i pošalji povratne informacije"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Prijavite se da biste kontaktirali s podrškom"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Prijava"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Ne možete pristupiti računu?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Slanje informacija o sustavu"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Radi bržeg rješavanja poteškoće potrebne su nam informacije o sustavu za dijagnozu."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Ne prikazuj ponovo"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Postavke radnog profila"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Pretraživanje kontakata"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Omogućuje pretraživanjima kontakata vaše organizacije da identificiraju pozivatelje i kontakte"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> sat</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> sata</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sati</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minuta</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuta</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> sekunda</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> sekunde</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekundi</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> čekanja"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Računalo"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Slušalice s mikrofonom"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telefon"</string>
@@ -3131,4 +3182,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Slušalice"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Periferni uređaj za unos"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Upravitelj pohrane uklanja fotografije i videozapise s uređaja za koje je napravljena sigurnosna kopija kako bi oslobodio prostor za pohranu."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Ukloni fotografije i videozapise"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Upravitelj pohrane"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatski"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Priručnik"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Pokreti"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Otvaranje fotoaparata"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Za brzo otvaranje fotoaparata dovoljno je da samo dvaput dodirnete tipku za uključivanje/isključivanje. To funkcionira na svim zaslonima."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Prebacivanje fotoaparata"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Za prebacivanje između prednjeg i stražnjeg fotoaparata dvaput obrnite telefon."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Brza provjera zaslona"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Pogurnite ili podignite telefon da biste ga provjerili, ali ne i potpuno aktivirali."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Prijelaz prstom za obavijesti"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Za provjeru obavijesti s bilo kojeg zaslona prijeđite prstom prema dolje po senzoru otiska prsta."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Uključeno"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Isključeno"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Početni program za pokretanje već je otključan"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Najprije se povežite s internetom"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Nije dostupno na uređajima koje je zaključao mob. operater"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index f25b9f6..b012555 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Rózsaszín"</item>
     <item msgid="6131821495505931173">"Piros"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Több mint 30 napos"</item>
+    <item msgid="2900554746706302178">"Több mint 60 napos"</item>
+    <item msgid="5692284879054004388">"Több mint 90 napos"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-hu/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-hu/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-hu/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 03891fe..7f88676 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Adatkapcsolat engedélyezése"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Adatkapcsolat letiltása"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE-jelző"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videohívás beütemezve"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi-hívás beütemezve"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Mobilos rádió hatótávolsága"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM-kártya telefonkönyvének megtekintése"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Fix hívószámok megtekintése"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Feloldás ujjlenyomattal"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Csak érintse meg az ujjlenyomat-érzékelőt a telefon zárolásának feloldásához, a vásárlások jóváhagyásához, illetve az alkalmazásokba történő bejelentkezéshez. Akár egyetlen hozzáadott ujjlenyomat képes mindezek végrehajtására, ezért fontolja meg, hogy kinek az ujjlenyomatát adja hozzá.\n\nMegjegyzés: Az ujjlenyomat kevésbé biztonságos, mint egy bonyolult minta vagy PIN-kód. "<annotation id="url">"További információ"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Egyszerűen érintse meg az ujjlenyomat-érzékelőt telefonja feloldásához, a vásárlások engedélyezéséhez vagy az alkalmazásokba való bejelentkezéshez. Akár egyetlen hozzáadott ujjlenyomat képes mindezek végrehajtására, ezért fontolja meg, hogy kinek az ujjlenyomatát adja hozzá.\n\nMegjegyzés: Előfordulhat, hogy az ujjlenyomat kevésbé biztonságos, mint egy bonyolult minta vagy PIN-kód."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Mégse"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Tovább"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Kihagyás"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Törlés"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Lássunk neki!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Helyezze az ujját az érzékelőre, és emelje fel a rezgést követően"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Sikerült! Most ismételje meg"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Folytassa"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Óvatosan mozgassa ujját a teljes ujjlenyomat levételéhez"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Ujjlenyomat hozzáadva!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Ha ezt az ikont látja, akkor lehetősége van arra, hogy ujjlenyomatával azonosítsa magát, vagy engedélyezze a vásárlást."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Csak érintse meg az ujjlenyomat-érzékelőt az eszköz felébresztéséhez és feloldásához."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Ha ezt az ikont látja, használhatja ujjlenyomatát."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Ha ezt az ikont látja, akkor vásárlásokat hagyhat jóvá, és alkalmazásokba is bejelentkezhet."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Átugorja az ujjllenyomat-beállítást?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Kiválasztotta, hogy ujjlenyomattal is feloldhassa telefonját. Ha most kihagyja a lépéseket, később kell majd beállítania a funkciót. Ez hozzávetőlegesen 1 percet vesz igénybe."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Képernyőzár beállítása"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Segélyhívási cím frissítése"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"A készenléti szervek számára megadott tartózkodási hely Wi-Fi-hálózatról kezdeményezett segélyhívás esetén"</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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Elfelejtés"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Beállítás"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Felfedezés"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Tárhely felszabadítása"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Tárhely kezelése"</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>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Médiaeszköz (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Hang"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Gyorsítótárazott adatok"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Egyéb"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Rendszer"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> felfedezése"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Az Egyéb kategóriába tartoznak az alkalmazások által mentett megosztott fájlok, az internetről, illetve Bluetooth-kapcsolaton keresztül letöltött fájlok, az androidos fájlok stb. \n\nAz adathordozó (<xliff:g id="NAME">^1</xliff:g>) teljes tartalmának megtekintéséhez érintse meg a Felfedezés lehetőséget."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"A rendszer az Android operációs rendszer által belsőleg használt fájlokat is tartalmaz. \n\nEzeket a fájlokat nem lehet önmagukban megtekinteni."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"A(z) <xliff:g id="USER_0">^1</xliff:g> által esetlegesen mentett fotók, zenék, filmek, alkalmazások és más adatok <xliff:g id="SIZE">^2</xliff:g> tárhelyet foglalnak. \n\nA részletek megtekintéséhez váltson át <xliff:g id="USER_1">^1</xliff:g> felhasználóra."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> – beállítás"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Használat hordozható tárolóként"</string>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Jogi információk"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Közreműködők"</string>
     <string name="manual" msgid="3025943393642974445">"Útmutató"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Szabályozási információk"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Szabályozási címkék"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Biztonsági és szabályozási információk"</string>
     <string name="copyright_title" msgid="865906688917260647">"Szerzői jog"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenc"</string>
     <string name="terms_title" msgid="7697580845616764642">"Általános Szerződési Feltételek"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Mindig bekapcsolt VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Nincs VPN megadva."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"A mindig bekapcsolt VPN aktív"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Ez az alkalmazás nem támogatja"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Válasszon ki egy VPN-profilt, amelyhez mindig csatlakozni szeretne. A hálózati forgalom csak akkor lesz engedélyezve, ha ehhez a VPN-hez csatlakozik."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Nincs"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"A mindig bekapcsolt VPN-hez a szerver és a DNS IP-címe is szükséges."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"feloldás csúsztatással, jelszó, minta, pin-kód"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"munkahelyi kihívás, munka, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"munkaprofil, felügyelt profil, egyesít, egyesítés, munka, profil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"kézmozdulat"</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>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Az íráshoz érintsen meg egy címkét…"</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"A háttéradatok kizárólag Wi-Fi-n keresztül állnak rendelkezésre. Ez hatással lehet bizonyos alkalmazásokra és szolgáltatásokra, amikor nincs rendelkezésre álló Wi-Fi-kapcsolat."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"A munkaprofil mód ki van kapcsolva"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Az alkalmazások, a háttérben való szinkronizálás és a munkaprofilhoz kapcsolódó egyéb funkciók kikapcsolva."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Javaslatok (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Javaslatok"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"több mint <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Eltávolítás"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Hideg színhőmérséklet"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Hidegebb színhőmérséklet használata a kijelzőn"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Visszaállítja a ShortcutManager gyakoriságkorlát-számlálóit?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Lezárási képernyő értesítéseinek kezelése"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Értesítéstartalom megjelenítése vagy elrejtése"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Összes"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Támogatás"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Legkeskenyebb szélesség"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Egy telepített alkalmazás sem kért hozzáférést a Prémium sms-ekhez"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Prémium sms-hozzáférés"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Kikapcsolva"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Demó mód"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Szívesen segítünk"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"A hét minden napján, 24 órában a rendelkezésére állunk"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Ügyfélszolgálati csapatunk bármilyen problémát orvosol"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Ügyfélszolgálati csapatunk bármikor az Ön rendelkezésére áll"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Telefonos ügyfélfogadási idő (helyi idő)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Nyissa meg a súgót, vagy nézzen szét a tippek és trükkök között"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Támogatás a következőhöz:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> – <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Külföldre utazik?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Előfordulhat, hogy nemzetközi hívás díját kell fizetni"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Csevegés"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Tippek és trükkök felfedezése"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Keresés a súgóban, valamint visszajelzés küldése"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Az ügyfélszolgálati támogatás igényebvételéhez jelentkezzen be."</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Bejelentkezés"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Nem fér hozzá fiókjához?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Rendszeradatok elküldése"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"A probléma gyors megoldásához diagnosztikai célból szükségünk van a rendszeradatokra."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Ne jelenjen meg újra"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Munkaprofil beállításai"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Névjegykeresés"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Névjegykeresés engedélyezése a szervezet számára a hívó felek és ismerősök azonosítása érdekében"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> óra</item>
+      <item quantity="one">1 óra</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> perc</item>
+      <item quantity="one">1 perc</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> másodperc</item>
+      <item quantity="one">1 másodperc</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Várakozási idő: kb. <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Számítógép"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Headset"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telefon"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Fejhallgató"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Beviteli periféria"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"A tárhelykezelő tárhely felszabadítása érdekében eltávolítja az eszközről azokat a fotókat és videókat, amelyekről már készült biztonsági másolat."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Fotók és videók eltávolítása"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Tárhelykezelő"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatikus"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Kézi"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Kézmozdulatok"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Kamera megnyitása"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"A kamera gyors megnyitásához koppintson duplán a bekapcsológombra. Bármelyik képernyőn működik."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Kameraváltás"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Az elülső és hátulsó kamerák közötti váltáshoz fordítsa oda-vissza a telefont."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"A képernyő gyors megtekintése"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Ha a teljes felébresztés nélkül szeretné megnézni telefonja képernyőjét, egyszerűen mozdítsa meg, vagy vegye a kezébe."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Az értesítések megtekintéséhez gyorsan csúsztassa az ujjait"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Bármelyik képernyőn megtekintheti értesítéseit, ha ujját lefelé húzza az ujjlenyomat-érzékelőn."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Bekapcsolva"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Kikapcsolva"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"A rendszerbetöltő már fel van oldva"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Előbb csatlakozzon az internethez"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"A nem kártyafüggetlen eszközökön nem áll rendelkezésre"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-hy-rAM/arrays.xml b/res/values-hy-rAM/arrays.xml
index dc72fc6..b724a85 100644
--- a/res/values-hy-rAM/arrays.xml
+++ b/res/values-hy-rAM/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Վարդագույն"</item>
     <item msgid="6131821495505931173">"Կարմիր"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"30 օրից հին"</item>
+    <item msgid="2900554746706302178">"60 օրից հին"</item>
+    <item msgid="5692284879054004388">"90 օրից հին"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-hy-rAM/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-hy-rAM/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-hy-rAM/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index edc2640..9f37e87 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Միացնել տվյալների կապը"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Անջատել տվյալների կապը"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE-ի տրամադրում"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Տեսազանգերի նախապատրաստում"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi զանգերի նախապատրաստում"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Բջջի ռադիոճառագայթման հզորությունը"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Դիտել SIM քարտի հասցեագիրքը"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Տեսնել ամրակցված հեռախոսահամարները"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Մատնահետքով ապակողպում"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Հեռախոսն ապակողպելու, գնումները թույլատրելու կամ հավելվածներ մուտք գործելու համար պարզապես մատը հպեք մատնահետքի սենսորին: Այդ գործողությունները հնարավոր է անել հեռախոսում ավելացված ցանկացած մատնահետքի միջոցով, այնպես որ մտածված ավելացրեք նոր մարդկանց մատնահետքերը:\n\nՆշում. ապակողպման հուսալի նախշը կամ PIN կոդը կարող է մատնահետքից ավելի ապահով լինել: "<annotation id="url">"Իմանալ ավելին"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Հեռախոսն ապակողպելու, գնումները թույլատրելու կամ հավելվածներ մուտք գործելու համար պարզապես մատը հպեք մատնահետքի սենսորին: Այդ գործողությունները հնարավոր է անել հեռախոսում ավելացված ցանկացած մատնահետքի միջոցով, այնպես որ մտածված ավելացրեք նոր մարդկանց մատնահետքերը:\n\nՆշում. ապակողպման հուսալի նախշը կամ PIN կոդը կարող է մատնահետքից ավելի ապահով լինել:"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Չեղարկել"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Շարունակել"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Բաց թողնել"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Ջնջել"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Սկսե՛նք:"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Դրեք ձեր մատը սենսորի վրա և բարձրացրեք թրթռոց զգալուց հետո"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Հիանալի է: Այժմ կրկնեք"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Շարունակեք"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Մի փոքր շարժեք ձեր մատը՝ մատնահետքի բոլոր մասերը հավելելու համար"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Մատնահետքն ավելացվեց:"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Եթե տեսնում եք այս պատկերակը, դա նշանակում է, որ կարող եք օգտագործել ձեր մատնահետքը՝ նույնականացում կատարելու կամ գնումը թույլատրելու համար:"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Սարքը քնի ռեժիմից հանելու և ապակողպելու համար պարզապես հպեք մատնահետքի սենսորին:"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Մատնահետքը կարող եք օգտագործել ամեն անգամ, երբ ցուցադրվում է այս պատկերակը:"</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Այս պատկերակը տեսնելու դեպքում կարող եք նաև թույլատրել գնումները կամ մուտք գործել հավելվածներ:"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Բաց թողնե՞լ մատնահետքի կարգավորումը:"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Դուք ընտրել եք մատնահետքի օգտագործումը որպես հեռախոսն ապակողպելու եղանակներից մեկը: Եթե բաց թողնեք հիմա, ապա ձեզ անհրաժեշտ կլինի կատարել կարգավորումն ավելի ուշ: Կարգավորումը տևում է ընդամենը մոտ մեկ րոպե:"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Էկրանի կողպման կարգավորում"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Երբ Wi-Fi-ի միջոցով զանգերը միացված են, հեռախոսը կարող է ուղարկել զանգերը Wi-Fi ցանցերի կամ ձեր օպերատորի ցանցի միջոցով՝ կախված ձեր նախընտրություններից և ազդանշանի ուժգնությունից: Մինչ այս գործառույթը միացնելը՝ տեղեկացեք վճարների և այլ մանրամասների մասին ձեր օպերատորից:"</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"Թարմացնել արտակարգ իրավիճակների հասցեն"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"WiFi-ի միջոցով 911 զանգ կատարելու դեպքում արտակարգ իրավիճակների ծառայությունները այս հասցեն դիտարկում են որպես ձեր տեղադրությունը"</string>
     <string name="home_settings" msgid="212375129455718176">"Հիմնական"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Էկրան"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ձայն"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Հեռացնել"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Կարգավորել"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Ուսումնասիրել"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Ազատել տարածք"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Կառավարել հիշողությունը"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB համակարգչային կապ"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Կապակցել որպես"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Մեդիա սարք (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Ձայն"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Քեշավորված տվյալներ"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Այլ"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Համակարգ"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Ուսումնասիրել <xliff:g id="NAME">^1</xliff:g>-ը"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Այլ ֆայլերը ներառում են հավելվածների կողմից պահված ընդհանուր օգտագործման ֆայլերը, համացանցից կամ Bluetooth-ի միջոցով ներբեռնված ֆայլերը, Android ֆայլերը և այլն: \n\nԱյս <xliff:g id="NAME">^1</xliff:g>-ի ողջ բովանդակությունը դիտելու համար հպեք Ուսումնասիրել կոճակին:"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Համակարգը ներառում է Android օպերացիոն համակարգի կողմից ներսում օգտագործվող ֆայլերը: \n\nԱյդ ֆայլերն առանձին հնարավոր չէ տեսնել:"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g>-ը կարող է պարունակել լուսանկարներ, երաժշտություն, հավելվածներ կամ այլ տվյալներ, որոնք զբաղեցնում են հիշողության <xliff:g id="SIZE">^2</xliff:g>: \n\nՄանրամասները տեսնելու համար փոխարկեք <xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Իրավական տեղեկատվություն"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Աջակցողներ"</string>
     <string name="manual" msgid="3025943393642974445">"Ձեռքով"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Կանոնակարգման տեղեկատվություն"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Կանոնակարգող պիտակներ"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Անվտանգության և կանոնակարգման տվյալներ"</string>
     <string name="copyright_title" msgid="865906688917260647">"Հեղինակային իրավունք"</string>
     <string name="license_title" msgid="1990487604356037871">"Արտոնագիր"</string>
     <string name="terms_title" msgid="7697580845616764642">"Կանոններն ու պայմանները"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN-ը միշտ ակտիվ"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"VPN-ներ չեն ավելացվել:"</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Միշտ միացված ընտրանքն ակտիվ է"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Չի աջակցվում այս հավելվածում"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Ընտրել VPN պրոֆիլ` այդ պրոֆիլին միշտ միացված լինելու համար: Ցանցային շրջանառությունը թույլատրված կլինի միայն VPN-ին միացված ժամանակ:"</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Ոչ մեկը"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Միշտ միացված VPN-ը պահանջում է IP հասցե սերվերի և DNS-ի համար:"</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"սահեցնելով ապակողպում, գաղտնաբառ, նախշ, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"աշխատանքային մարտահրավեր, աշխատանք, պրոֆիլ"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"աշխատանքային պրոֆիլ, կառավարվող պրոֆիլ, միավորել, միավորում, աշխատանք, պրոֆիլ"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"ժեստ"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Կարգավորել Wi-Fi NFC պիտակը"</string>
     <string name="write_tag" msgid="8571858602896222537">"Գրել"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Հպեք պիտակի վրա՝ գրելու համար..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Ֆոնային տվյալները հասանելի են միայն Wi-Fi-ի միջոցով: Wi-Fi ցանցերի բացակայության դեպքում դա կարող է ազդել որոշ հավելվածների կամ ծառայությունների աշխատանքի վրա:"</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Աշխատանքային պրոֆիլն անջատած է"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Ձեր աշխատանքային պրոֆիլի հետ առնչվող հավելվածները, ֆոնային համաժամեցումը և մյուս գործառույթներն անջատած են:"</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Առաջարկություններ (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Առաջարկներ"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Հեռացնել"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Գույնի սառը ջերմաստիճան"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Օգտագործել էկրանի ավելի սառը գույներ"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Վերակայե՞լ ShortcutManager-ի արագության սահմանափակման հաշվիչները:"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Վերահսկել կողպէկրանի ծանուցումները"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Ցույց տալ կամ թաքցնել ծանուցման բովանդակությունը"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Բոլորը"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Աջակցություն"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Ամենափոքր լայնությունը"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Տեղադրված հավելվածներից ոչ մեկը Պրեմիում SMS-ների օգտագործման հարցում չի կատարել"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Պրեմիում SMS-ների օգտագործում"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Անջատված է"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Ցուցադրական ռեժիմ"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Մեր նպատակն է օգնել ձեզ"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Մենք աշխատում ենք շուրջօրյա"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Մեր աջակցման թիմը կօգնի լուծել ձեր բոլոր խնդիրները"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Մեր աջակցման թիմն աշխատում է ամեն օր, շուրջօրյա"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Հեռախոսով աջակցում տրամադրելու ժամերը (տեղային ժամանակով)՝&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Փնտրեք օգնություն կամ ուսումնասիրեք խորհուրդներն ու հնարքները"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Աջակցություն հետևյալ երկրի համար՝"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> – <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Ճանապարհորդում եք երկրից դո՞ւրս:"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Միջազգային կապի համար կարող են վճարներ գանձվել"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Հեռախոս"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Զրուցել"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Ուսումնասիրել խորհուրդներն ու հնարքները"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Փնտրել օգնություն և տրամադրել հետադարձ կապ"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Մուտք գործել՝ աջակցություն ստանալու համար"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Մուտք գործել"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Չե՞ք կարողանում մուտք գործել ձեր հաշիվ:"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Ուղարկել համակարգի մասին տեղեկատվություն"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Ձեր խնդիրն արագ լուծելու համար մեզ անհրաժեշտ է համակարգի մասին տեղեկատվություն՝ ախտորոշում անցկացնելու նպատակով:"</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Այլևս ցույց չտալ"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Աշխատանքային պրոֆիլի կարգավորումներ"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Կոնտակտների որոնում"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Թույլատրել ձեր կազմակերպությանը որոնել կոնտակտներ՝ զանգողներին և կոնտակտները նույնականացնելու համար:"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ժամ</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ժամ</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> րոպե</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> րոպե</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> վայրկյան</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> վայրկյան</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> սպասում"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Համակարգիչ"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Ականջակալ"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Հեռախոս"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Ականջակալ"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Մուտքի արտաքին սարքեր"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Տարածք ազատելու նպատակով հիշողության կառավարիչը ձեր սարքից հեռացնում է պահուստավորած լուսանկարները և տեսանյութերը:"</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Հեռացնել լուսանկարները և տեսանյութերը"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Հիշողության կառավարիչ"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Ավտոմատ"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Ձեռքով"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Ժեստեր"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Անցնել տեսախցիկին"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Տեսախցիկն արագ գործարկելու համար պարզապես կրկնակի սեղմեք սնուցման կոճակը: Գործում է ցանկացած էկրանին:"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Շրջել տեսախցիկը"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Կրկնակի պտտեք՝ առջևի ու հետևի տեսախցիկների միջև փոխարկելու համար:"</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Էկրանի արագ ստուգում"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Թեթև շարժեք կամ բարձրացրեք հեռախոսը և ստուգեք այն՝ առանց քնի ռեժիմից ամբողջությամբ հանելու:"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Մատը սահեցրեք՝ ծանուցումներ տեսնելու համար"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Ծանուցումները ցանկացած էկրանից ստուգելու համար մատնահետքերի սկաների վրա մատը ներքև սահեցրեք:"</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Միացված է"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Անջատված է"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Համակարգի բեռնիչն արդեն ապակողպված է"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Նախ միացեք համացանցին"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Անհասանելի է օպերատորի կողմից կողպված սարքերում"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index ebb6844..dce8434 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Merah Muda"</item>
     <item msgid="6131821495505931173">"Merah"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Lebih dari 30 hari"</item>
+    <item msgid="2900554746706302178">"Lebih dari 60 hari"</item>
+    <item msgid="5692284879054004388">"Lebih dari 90 hari"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-in/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-in/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-in/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 4940305..0cdf064 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Aktifkan Sambungan Data"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Nonaktifkan Sambungan Data"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE Disediakan"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Video Call Disediakan"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Panggilan Wi-Fi Disediakan"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Daya Radio Seluler"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Lihat Buku Alamat SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Lihat Nomor Panggilan Tetap"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Membuka kunci dengan sidik jari"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Cukup sentuh sensor sidik jari untuk membuka kunci ponsel, mengotorisasi pembelian, atau masuk ke aplikasi. Berhati-hatilah dengan sidik jari yang ditambahkan. Sidik jari yang ditambahkan dapat melakukan semua hal ini.\n\nCatatan: Sidik jari mungkin kurang aman dibanding pola atau PIN yang rumit. "<annotation id="url">"Pelajari lebih lanjut"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Cukup sentuh sensor sidik jari untuk membuka kunci perangkat, mengotorisasi pembelian, atau masuk ke aplikasi. Berhati-hatilah dengan sidik jari yang ditambahkan. Sidik jari yang ditambahkan dapat melakukan semua hal ini.\n\nCatatan: Sidik jari mungkin kurang aman dibanding pola atau PIN yang rumit."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Batal"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Lanjutkan"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Lewati"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Hapus"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Ayo mulai!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Letakkan jari Anda di sensor dan angkat setelah merasakan getaran"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Bagus! Sekarang ulangi"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Teruskan"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Gerakkan jari Anda sedikit untuk menambahkan semua bagian lain dari sidik jari Anda"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Sidik jari ditambahkan!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Setiap kali melihat ikon ini, Anda dapat menggunakan sidik jari untuk identifikasi atau mengotorisasi pembelian."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Cukup sentuh sensor sidik jari untuk membangunkan dan membuka kunci perangkat."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Jika melihat ikon ini, Anda dapat menggunakan sidik jari."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Jika melihat ikon ini, Anda juga dapat mengotorisasi pembelian atau masuk ke aplikasi."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Lewati penyiapan sidik jari?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Anda telah memilih untuk menggunakan sidik jari sebagai satu cara untuk membuka kunci perangkat. Jika dilewati sekarang, Anda harus menyiapkannya nanti. Penyiapan hanya memerlukan waktu sekitar satu menit."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Siapkan kunci layar"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Perbarui Alamat Darurat"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Alamat yang digunakan oleh layanan darurat sebagai lokasi Anda jika Anda melakukan panggilan 911 menggunakan Wi-Fi"</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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Lupakan"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Siapkan"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Jelajahi"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Kosongkan ruang"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Kelola penyimpanan"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Koneksi komputer USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Sambungkan sebagai"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Perangkat media (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Data dalam cache"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Lainnya"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Jelajahi <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Lainnya mencakup file bersama yang disimpan oleh aplikasi, file yang diunduh dari internet atau Bluetooth, file Android, dan sebagainya. \n\nUntuk melihat seluruh konten <xliff:g id="NAME">^1</xliff:g> ini, ketuk Jelajahi."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Sistem mencakup file yang digunakan secara internal oleh sistem operasi Android. \n\nFile ini tidak dapat dilihat satu persatu."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> mungkin telah menyimpan foto, musik, film, aplikasi atau data lain yang menghabiskan <xliff:g id="SIZE">^2</xliff:g> penyimpanan. \n\nUntuk melihat detailnya, beralihlah ke <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Informasi hukum"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Kontributor"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Informasi pengaturan"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Label peraturan"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Informasi peraturan &amp; keselamatan"</string>
     <string name="copyright_title" msgid="865906688917260647">"Hak cipta"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisensi"</string>
     <string name="terms_title" msgid="7697580845616764642">"Persyaratan dan ketentuan"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN selalu aktif"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Tidak ada VPN yang ditambahkan."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Mode selalu aktif, diaktifkan"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Tidak didukung oleh aplikasi ini"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Pilih profil VPN untuk tetap tersambung. Lalu lintas jaringan hanya akan diperbolehkan jika tersambung ke VPN ini."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Tidak ada"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"VPN selalu aktif membutuhkan alamat IP baik untuk server serta DNS."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"geser untuk membuka kunci, sandi, pola, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"tantangan kerja, kerja, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"profil kerja, profil yang dikelola, menyatukan, penyatuan, kerja, profil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"isyarat"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Siapkan Tag NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Tulis"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Ketuk tag untuk menulis..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Data latar belakang hanya tersedia melalui Wi-Fi. Hal ini dapat memengaruhi beberapa aplikasi atau layanan saat Wi-Fi tidak tersedia."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Profil kerja nonaktif"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Aplikasi, sinkronisasi latar belakang, dan fitur lainnya yang terkait dengan profil kerja Anda dinonaktifkan."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Saran (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Saran"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"Lebih dari +<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Hapus"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Suhu foto sejuk"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gunakan suhu tampilan yang lebih sejuk"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Setel ulang penghitung pembatasan kecepatan PengelolaPintasan?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Mengontrol notifikasi layar kunci"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Menampilkan atau menyembunyikan konten notifikasi"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Semua"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Dukungan"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Lebar terkecil"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Tidak ada aplikasi yang terpasang yang meminta akses SMS Premium"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Akses SMS Premium"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Dinonaktifkan"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Mode demo"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Kami siap membantu"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Kami siap sedia di sini untuk Anda 7 x 24 jam"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Tim dukungan kami siap membantu mengatasi masalah"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Tim dukungan kami siap sedia sepanjang hari, setiap hari."</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Jam dukungan telepon (waktu lokal)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Telusuri bantuan atau jelajahi kiat &amp; trik"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Dukungan untuk:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Bepergian ke luar negeri?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Mungkin dikenakan biaya internasional"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telepon"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Jelajahi kiat &amp; trik"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Telusuri bantuan &amp; kirim masukan"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Masuk untuk mendapatkan dukungan"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Masuk"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Tidak dapat mengakses akun Anda?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Kirim informasi sistem"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Untuk membantu mengatasi masalah Anda dengan cepat, kami memerlukan informasi sistem untuk melakukan diagnosis."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Jangan tampilkan lagi"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Setelan profil kerja"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Penelusuran kontak"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Izinkan penelusuran kontak oleh organisasi untuk mengidentifikasi penelepon dan kontak"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> jam</item>
+      <item quantity="one">1 jam</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> menit</item>
+      <item quantity="one">1 menit</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> detik</item>
+      <item quantity="one">1 detik</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Tim ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Komputer"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Headset"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telepon"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Headphone"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Periferal Masukan"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Untuk membantu mengosongkan ruang penyimpanan, pengelola penyimpanan menghapus foto dan video cadangan dari perangkat Anda."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Hapus foto &amp; video"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Pengelola penyimpanan"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Otomatis"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Isyarat"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Beralih ke Kamera"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Untuk membuka kamera dengan cepat, ketuk dua kali tombol daya. Berfungsi di layar mana pun."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Balikkan kamera"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Untuk beralih antara kamera depan dan belakang, putar ponsel dua kali."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Pemeriksaan layar cepat"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Untuk memeriksa tanpa sepenuhnya membangunkan ponsel, geser atau angkat ponsel."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Sentuh-geser untuk melihat notifikasi"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Untuk memeriksa notifikasi dari layar mana pun, sentuh-geser ke bawah pada sensor sidik jari."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Aktif"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Nonaktif"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader telah dibuka kuncinya"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Terlebih dahulu sambungkan ke internet"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Tidak tersedia pada perangkat yang dikunci oleh operator"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-is-rIS/arrays.xml b/res/values-is-rIS/arrays.xml
index c89097b..d5bda57 100644
--- a/res/values-is-rIS/arrays.xml
+++ b/res/values-is-rIS/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Bleikur"</item>
     <item msgid="6131821495505931173">"Rauður"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Eldri en 30 daga"</item>
+    <item msgid="2900554746706302178">"Eldri en 60 daga"</item>
+    <item msgid="5692284879054004388">"Eldri en 90 daga"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-is-rIS/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-is-rIS/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-is-rIS/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 160bfb2..0439d4d 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Kveikja á gagnatengingu"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Slökkva á gagnatengingu"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE-úthlutun"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Myndsímtali úthlutað"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi símtali úthlutað"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Sendistyrkur"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Skoða símaskrá SIM-korts"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Skoða læst númeraval"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Opna með fingrafari"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Þú þarft bara að snerta fingrafaraskynjarann til að taka símann úr lás, heimila greiðslur eða skrá þig inn á forrit. Öll fingraför sem bætt er við símann virka til að gera allt þetta svo gættu vel að því hverjum þú bætir við.\n\nAthugaðu: Fingrafar kann að vera ótraustari aðferð en sterkt mynstur eða PIN-númer. "<annotation id="url">"Frekari upplýsingar"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Snertu fingrafaralesarann til að opna símann, heimila kaup eða skrá þig inn á forrit. Hafðu gát á því hverjum þú leyfir að bæta við fingraförum. Hvert fingrafar sem bætt er við nægir til að gera allt það sem upp var talið.\n\nAthugið: Minna öryggi gæti verið með því að nota fingrafar heldur en ef notast er við sterkt mynstur eða PIN-númer."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Hætta við"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Halda áfram"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Sleppa"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Eyða"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Við skulum byrja!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Settu fingurinn á skynjarann og lyftu honum þegar þú finnur titring"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Gott! Gerðu þetta nú aftur"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Haltu áfram"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Færðu fingurinn svolítið til að bæta við mismunandi hlutum fingrafarsins"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Fingrafari bætt við!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Alltaf þegar þú sérð þetta tákn geturðu notað fingrafarið þitt til að auðkenna þig eða til að heimila kaup."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Snertu einfaldlega fingrafaraskynjarann til að taka tækið úr biðstöðu og lás."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Þegar þú sérð þetta tákn geturðu notað fingrafarið."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Þegar þú sérð þetta tákn geturðu heimilað kaup eða skráð þig inn í forrit."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Viltu sleppa uppsetningu fingrafars?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Þú hefur valið að nota fingrafar þitt sem leið til að opna símann þinn. Ef þú sleppir þessu núna þarftu að setja þetta upp seinna. Uppsetningin tekur einungis um eina mínútu."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Setja upp skjálás"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Þ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="emergency_address_title" msgid="3571902448699714454">"Uppfæra neyðarheimilisfang"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Heimilisfang sem neyðarþjónustur nota sem staðsetningu þína ef þú hringir í neyðarlínuna gegnum Wi-Fi"</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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Gleyma"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Setja upp"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Kanna"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Losa geymslupláss"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Hafa umsjón með geymslurými"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-tenging tölvu"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Tengja sem"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Margmiðlunartæki (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Hljóð"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Gögn í skyndiminni"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Annað"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Kerfi"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Kanna <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"„Annað“ inniheldur skrár sem hefur verið deilt og skrár sem forrit vista, skrár sóttar af netinu eða með Bluetooth, Android skrár o.s.frv. \n\nTil að sjá allt innihald á <xliff:g id="NAME">^1</xliff:g> skaltu ýta á „Kanna“."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Kerfi inniheldur skrár sem Android stýrikerfið notar. \n\nEkki er hægt að skoða hverja skrá fyrir sig."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> kann að hafa vistað myndir, tónlist, kvikmyndir, forrit eða önnur gögn sem nota <xliff:g id="SIZE">^2</xliff:g> af geymslurými. \n\nTil að sjá nánari upplýsingar skaltu skipta yfir á <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Lagalegar upplýsingar"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Meðhöfundar"</string>
     <string name="manual" msgid="3025943393642974445">"Handbók"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Lögbundnar upplýsingar"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Lögbundnir flokkar"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Öryggis- og lögbundnar upplýsingar"</string>
     <string name="copyright_title" msgid="865906688917260647">"Höfundarréttur"</string>
     <string name="license_title" msgid="1990487604356037871">"Leyfi"</string>
     <string name="terms_title" msgid="7697580845616764642">"Skilmálar"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN alltaf virkt"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Engum VPN-netum bætt við."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Alltaf virkt"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Ekki stutt af þessu forriti"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Veldu VPN-snið sem alltaf á að vera tengt. Netumferð er aðeins leyfð þegar tenging við þetta VPN er virk."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Ekkert"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"VPN sem er alltaf virkt krefst IP-tölu þjóns og nafnaþjóns (DNS)."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"renna til að opna, aðgangsorð, mynstur, PIN-númer"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"verkefni í vinnu, vinna, snið"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"vinnusnið, stýrt snið, sameina, sameining, vinna, snið"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"bendingar"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Setja upp Wi-Fi NFC-merki"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skrifa"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Snertu merki til að skrifa..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Bakgrunnsgögn eru aðeins í boði yfir Wi-Fi. Þetta getur haft áhrif á sum forrit eða þjónustu þegar Wi-Fi er ekki í boði."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Slökkt á vinnusniði"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Slökkt er á forritum, samstillingu í bakgrunni og öðrum eiginleikum sem tengjast vinnusniðinu."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Tillögur (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Tillögur"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Fjarlægja"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Svalur litblær skjás"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Nota svalari skjáliti"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Endurstilla ShortcutManager teljara með hraðatakmörkun?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Stjórna skjálásstilkynningum"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Sýna eða fela efni tilkynninga"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Allar"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Aðstoð"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Minnsta breidd"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Engin uppsett forrit hafa óskað eftir sérstökum SMS-aðgangi"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Sérstakur SMS-aðgangur"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Slökkt"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Prufustilling"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Við erum hér til að hjálpa þér"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Við erum til staðar allan sólarhringinn"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Þjónustudeild okkar er reiðubúin að bregðast við öllum málum"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Þjónustudeildin okkar er til staðar allan sólarhringinn, alla daga"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Afgreiðslutími símaaðstoðar (staðartími)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Leita í aðstoð eða skoða ábendingar og ráð"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Stuðningur við:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> – <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Ertu í útlöndum?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Alþjóðleg gjöld kunna að eiga við"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Sími"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Spjall"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Skoða ábendingar og ráð"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Leita í hjálp og senda ábendingar"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Skráðu þig inn til að fá aðstoð"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Innskráning"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Kemstu ekki inn á reikninginn þinn?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Senda kerfisupplýsingar"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Til þess að geta leyst fljótlega úr vandamálinu þurfum við að fá kerfisupplýsingar til að greina."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Ekki birta aftur"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Stillingar vinnusniðs"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Tengiliðaleit"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Leyfa fyrirtækinu þínu að leita í tengiliðum til að bera kennsl á þá sem hringja og tengiliði"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> klukkustund</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> klukkustundir</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> mínúta</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> mínútur</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> sekúnda</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekúndur</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Bið í ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Tölva"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Höfuðtól"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Sími"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Heyrnartól"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Jaðartæki með inntak"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Geymslustjórnun fjarlægir afritaðar myndir og myndskeið úr tækinu þínu til að losa um geymslupláss."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Fjarlægja myndir og myndskeið"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Geymslustjórnun"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Sjálfvirkt"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Handbók"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Bendingar"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Opna myndavél"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Til að opna myndavélina snögglega skaltu ýta tvisvar á aflrofann. Þetta virkar á hvaða skjá sem er."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Skipt milli myndavéla"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Snúðu úlnliðnum tvisvar til að skipta á milli fremri og aftari myndavélar."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Fljótlegt skjáyfirlit"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Ýttu við símanum eða taktu hann upp til að skoða hann án þess að þurfa að taka hann úr lás."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Strjúktu til að sjá tilkynningar"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Strjúktu fingri yfir fingrafaralesarann niður á við til að skoða tilkynningar á hvaða skjá sem er."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Kveikt"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Slökkt"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Ræsiforrit er þegar opið"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Komdu fyrst á internettengingu"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Ófáanlegt á tækjum læstum af símafyrirtækjum"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index c6a5023..5b14b32 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Rosa"</item>
     <item msgid="6131821495505931173">"Rosso"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Oltre 30 giorni"</item>
+    <item msgid="2900554746706302178">"Oltre 60 giorni"</item>
+    <item msgid="5692284879054004388">"Oltre 90 giorni"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-it/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-it/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-it/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 5f6089f..5b3d0af 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Attiva connessione dati"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Disattiva connessione dati"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Provisioning VoLTE"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videochiamate fornite"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Chiamate tramite Wi-Fi fornite"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Potenza del segnale radio cellulare"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Visualizza rubrica SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Visualizza numeri selezione fissa"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Sblocca con l\'impronta"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Tocca il sensore delle impronte digitali per sbloccare il telefono, autorizzare gli acquisti o accedere alle app desiderate. Scegli con attenzione chi aggiungere: le operazioni sopra elencate possono essere svolte con qualsiasi impronta digitale aggiunta.\n\nNota. La tua impronta digitale potrebbe essere meno sicura di una sequenza o un PIN complesso. "<annotation id="url">"Ulteriori informazioni"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Tocca il sensore delle impronte digitali per sbloccare il telefono, autorizzare gli acquisti o accedere alle app desiderate. Scegli con attenzione chi aggiungere: le operazioni sopra elencate possono essere svolte con qualsiasi impronta digitale aggiunta.\n\nNota. La tua impronta digitale potrebbe essere meno sicura di una sequenza o un PIN complesso."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Annulla"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continua"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Ignora"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Elimina"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Inizia"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Appoggia il dito sul sensore e sollevalo quando sentirai una vibrazione"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Bene, ora ripeti"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Continua a toccare"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Muovi leggermente il dito per aggiungere tutte le diverse parti della tua impronta digitale"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Impronta aggiunta"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Quando viene visualizzata questa icona, puoi utilizzare la tua impronta digitale per l\'identificazione o per autorizzare un acquisto."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Tocca il sensore delle impronte digitali per riattivare e sbloccare il dispositivo."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Quando vedi questa icona, significa che puoi utilizzare l\'impronta digitale."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Quando vedi questa icona, puoi anche autorizzare acquisti o accedere alle app."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Saltare configurazione impronta digitale?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Hai scelto anche l\'utilizzo dell\'impronta digitale tra i vari metodi per sbloccare il telefono. Se salti la configurazione ora, dovrai eseguirla in un secondo momento. Basta un minuto."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Imposta blocco schermo"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"aggiorna indirizzo di emergenza"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Indirizzo utilizzato dai servizi di emergenza per fornire la tua posizione se effettui una chiamata al 911 tramite Wi-Fi."</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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Elimina"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Configura"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Esplora"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Libera spazio"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Gestisci memoria"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Connessione computer USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Connetti come"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Dispositivo multimediale (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Dati memorizzati nella cache"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Altro"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Esplora <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Gli altri sono file condivisi salvati da app, file scaricati da Internet o tramite Bluetooth, file Android e così via. \n\nPer vedere tutti i contenuti di <xliff:g id="NAME">^1</xliff:g>, tocca Esplora."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Il sistema include file utilizzati internamente dal sistema operativo Android. \n\nQuesti file non possono essere visualizzati singolarmente."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> potrebbe aver salvato foto, musica, film, app o altri dati che occupano <xliff:g id="SIZE">^2</xliff:g> di memoria. \n\nPer i dettagli, passa a <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Informazioni legali"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Collaboratori"</string>
     <string name="manual" msgid="3025943393642974445">"Manuale"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Normative"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Etichette normative"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Sicurezza e normative"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenza"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termini e condizioni"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN sempre attiva"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Nessuna VPN aggiunta."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Always-on attiva"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Non supportata da questa app"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Seleziona un profilo VPN a cui rimanere sempre connesso. Il traffico di rete sarà consentito solo quando sei connesso a questa VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Nessuna"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"La VPN sempre attiva richiede un indirizzo IP per server e DNS."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"scorrimento per sbloccare, password, sequenza, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"sfida lavoro, lavoro, profilo"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"profilo di lavoro, profilo gestito, unificare, unificazione, lavoro, profilo"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configura tag NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Modifica"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tocca un tag per impostarlo..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"I dati in background sono disponibili solo tramite Wi-Fi. Ciò può condizionare qualche app o alcuni servizi quando la rete Wi-Fi non è disponibile."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Profilo di lavoro non attivo"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"App, sincronizzazione in background e altre funzioni relative al tuo profilo di lavoro sono disattivate."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Suggerimenti (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Suggerimenti"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Rimuovi"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura di colore fredda"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilizza colori del display più freddi"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Reimpostare i contatori del limite di frequenza in ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlla notifiche in schermata blocco"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostra o nascondi i contenuti delle notifiche"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Tutte"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Assistenza"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Larghezza minima"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nessuna app installata ha richiesto l\'accesso a SMS premium"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Accesso a SMS premium"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Disattivato"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Modalità demo"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Siamo qui per aiutarti"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Siamo a tua disposizione 24 ore su 24, 7 giorni su 7"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Il nostro team di assistenza è a disposizione per risolvere qualsiasi problema"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Il nostro team di assistenza è disponibile tutto il giorno, tutti i giorni"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Orari d\'ufficio per l\'assistenza telefonica (ora locale)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Cerca nella guida o leggi i suggerimenti"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Supporto per:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"In viaggio all\'estero?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Potrebbero essere applicate tariffe internazionali"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefono"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Leggi i suggerimenti"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Cerca nella guida e invia feedback"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Accedi per ricevere assistenza"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Accedi"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Non riesci ad accedere al tuo account?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Invia informazioni sul sistema"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Per risolvere il problema il più rapidamente possibile, devi fornire informazioni sul sistema."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Non mostrare più"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Impostazioni profilo di lavoro"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Ricerca di contatti"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Consenti ricerche di contatti in base all\'organizzazione per identificare chiamanti e contatti"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ore</item>
+      <item quantity="one">1 ora</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuti</item>
+      <item quantity="one">1 minuto</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> secondi</item>
+      <item quantity="one">1 secondo</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Tempo di attesa: <xliff:g id="ESTIMATE">%1$s</xliff:g> circa"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Computer"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Auricolare"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telefono"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Cuffie"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Periferica di immissione"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Per liberare spazio, la gestione memoria rimuove foto e video dal dispositivo dopo averne eseguito il backup."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Rimuovi foto e video"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Gestione memoria"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatiche"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuali"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Gesti"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Apri la fotocamera"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Per aprire velocemente la fotocamera, premi due volte il tasto di accensione. Funziona da qualsiasi schermata."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Cambia fotocamera"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Ruota due volte il polso per passare dalla fotocamera frontale a quella posteriore e viceversa."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Controllo rapido dello schermo"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Sposta o solleva il telefono per controllarlo senza riattivarlo completamente."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Fai scorrere per controllare le notifiche"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Scorri verso il basso sul sensore di impronte digitali per controllare le notifiche da qualsiasi schermata."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Attivati"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Disattivati"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Il bootloader è già sbloccato"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Devi prima connetterti a Internet"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Non disponibile sui dispositivi bloccati dall\'operatore"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 6a954eb..bea70fd 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"ורוד"</item>
     <item msgid="6131821495505931173">"אדום"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"בני למעלה מ-30 יום"</item>
+    <item msgid="2900554746706302178">"בני למעלה מ-60 יום"</item>
+    <item msgid="5692284879054004388">"בני למעלה מ-90 יום"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-iw/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-iw/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-iw/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index c59720a..36ae77a 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -41,6 +41,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"הפעל חיבור נתונים"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"השבת חיבור נתונים"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"‏ניהול התצורה של VoLTE"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"ניהול תצורה של שיחות וידאו"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"‏ניהול תצורה של שיחות Wifi"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"הפעלת רדיו סלולרי"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"‏הצג פנקס כתובות של SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"הצג מספרי חיוג קבועים"</string>
@@ -340,7 +342,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"פתח עם טביעת אצבע"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"גע בחיישן טביעת האצבע כדי לבטל את נעילת הטלפון, לאשר רכישות או להיכנס אל אפליקציות. היזהר בעת הוספת טביעות אצבע של משתמשים - הבעלים של כל טביעת אצבע שתצורף יוכל לבצע את כל הפעולות האלה.\n\nשים לב: ייתכן ששימוש בטביעת אצבע יספק אבטחה פחות טובה מאשר קו ביטול נעילה חזק או קוד גישה חזק. "<annotation id="url">"למידע נוסף"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"גע בחיישן טביעות אצבע כדי לבטל את נעילת הטלפון, לאשר רכישות או להיכנס אל אפליקציות. בחר בקפידה את טביעות האצבע שתוסיף. אפילו הבעלים של טביעת אצבע אחת שתוסיף יוכל לבצע את הפעולות האלה.\n\nשים לב: ייתכן ששימוש בטביעת אצבע יעניק פחות אבטחה מקו ביטול נעילה או מקוד גישה חזקים."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"בטל"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"המשך"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"דלג"</string>
@@ -361,12 +363,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"מחק"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"אפשר להתחיל!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"הנח את האצבע על החיישן והרם אותה לאחר שתרגיש רטט"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"מצוין. כעת חזור על הפעולה"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"המשך"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"הזז מעט את האצבע כדי להוסיף את כל החלקים של טביעת האצבע"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"טביעת האצבע נוספה!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"כשתראה את הסמל הזה, תוכל להשתמש בטביעת האצבע שלך לצורך זיהוי או אישור רכישה."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"גע בחיישן טביעת האצבע כדי להוציא את המכשיר ממצב שינה ולבטל את הנעילה שלו."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"כשתראה את הסמל הזה, תוכל להשתמש בטביעת האצבע שלך."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"כשהסמל הזה מוצג לך, פירוש הדבר הוא שאתה יכול גם לאשר רכישות או להיכנס לאפליקציות."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"האם לדלג על הגדרת טביעת אצבע?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"בחרת להשתמש בטביעת האצבע שלך כאחת מהדרכים שבהן תוכל לבטל את הנעילה בטלפון. אם תדלג על שלב זה עכשיו, תצטרך לבצע את ההגדרה בהמשך. ההגדרה לוקחת רק דקה או שתיים."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"הגדר נעילת מסך"</string>
@@ -853,6 +855,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"‏כשהתקשרות Wi-Fi פועלת, הטלפון יכול לנתב שיחות ברשתות Wi-Fi או ברשת של הספק, בהתאם להעדפה שלך ולאות שחזק יותר. לפני הפעלת תכונה זו, בדוק עם הספק פרטים הקשורים לעמלות ופרטים אחרים."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"עדכן כתובת למקרה חירום"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"‏כתובת שתשמש כמיקום שלך לטובת שירותי החירום, אם תתקשר למוקד החירום באמצעות רשת 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>
@@ -1075,6 +1079,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"שכח"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"הגדר"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"עיין"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"פנה שטח אחסון"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"נהל אחסון"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"‏חיבור USB למחשב"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"חבר בתור"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"‏מכשיר מדיה (MTP)"</string>
@@ -1111,8 +1117,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"אודיו"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"נתונים בקובץ שמור"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"אחר"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"מערכת"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"עיין ב-<xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"‏אפשרויות אחרות כוללות, בין השאר, קבצים משותפים שנשמרו על ידי אפליקציות, קבצים שהורדו מהאינטרנט או מ-Bluetooth, קובצי  Android וכו\'. \n\nכדי לראות את כל התוכן ב-<xliff:g id="NAME">^1</xliff:g> זה, הקש על \'גלה\'."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"‏המערכת כוללת קבצים שנעשה בהם שימוש פנימי על ידי מערכת ההפעלה של Android. \n\nלא ניתן להציג קבצים אלה בנפרד."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"ייתכן של-<xliff:g id="USER_0">^1</xliff:g> יש תמונות, מוזיקה, סרטים, אפליקציות או נתונים אחרים שתופסים <xliff:g id="SIZE">^2</xliff:g> מנפח האחסון. \n\nעבור אל <xliff:g id="USER_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>
@@ -1303,7 +1311,8 @@
     <string name="legal_information" msgid="5769301644270604095">"מידע משפטי"</string>
     <string name="contributors_title" msgid="5917703088825286504">"תורמים"</string>
     <string name="manual" msgid="3025943393642974445">"ידני"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"מידע על תקנות"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"תוויות תקינה"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"מידע בנושא בטיחות ותקינה"</string>
     <string name="copyright_title" msgid="865906688917260647">"זכויות יוצרים"</string>
     <string name="license_title" msgid="1990487604356037871">"רישיון"</string>
     <string name="terms_title" msgid="7697580845616764642">"תנאים והגבלות"</string>
@@ -2264,6 +2273,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"‏VPN מופעל תמיד"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"‏לא נוספו רשתות VPN."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"התכונה \'מופעל תמיד\' פעילה"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"לא נתמך על ידי אפליקציה זו"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"‏בחר פרופיל VPN שתישאר מחובר אליו תמיד. תנועת רשת תהיה מותרת רק כאשר תהיה מחובר ל-VPN זה."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"ללא"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"‏VPN מופעל תמיד מחייב כתובת IP לשרת ול-DNS."</string>
@@ -2542,6 +2552,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"‏החלק כדי לבטל נעילה, סיסמה, דפוס, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"אתגר בעבודה, עבודה, פרופיל"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"פרופיל עבודה, פרופיל מנוהל, לאחד, איחוד, עבודה, פרופיל"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"תנועה"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏הגדר תג NFC של Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"כתוב"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"הקש על תג כדי לכתוב..."</string>
@@ -3053,7 +3064,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"‏נתוני הרקע זמינים רק באמצעות Wi-Fi. פעולה זו עשויה להשפיע על חלק מהאפליקציות והשירותים אם אין רשת ‏Wi-Fi‏‏‏‏ זמינה."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"פרופיל העבודה כבוי"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"אפליקציות, סנכרון ברקע ותכונות אחרות הקשורות לפרופיל העבודה שלך מכובים."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"הצעות (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"הצעות"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"הסר"</string>
     <string name="color_temperature" msgid="2070126836910615605">"טמפרטורת צבעים קרים"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"השתמש בצבעי תצוגה קרירים יותר"</string>
@@ -3148,6 +3160,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"‏האם לאפס מונים להגבלת דירוג ב-ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"שליטה בהודעות של מסך הנעילה"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"הצג או הסתר תוכן הודעה"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"הכול"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"תמיכה"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"dp <xliff:g id="ID_1">%d</xliff:g>"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"הרוחב הקטן ביותר"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"‏אף אפליקציה מותקנת לא ביקשה גישה לפרימיום SMS"</string>
@@ -3155,9 +3169,49 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"‏גישה לפרימיום SMS"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"מושבת"</string>
     <string name="demo_mode" msgid="2655748420527206870">"מצב הדגמה"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"אנחנו כאן לשירותך"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"אנחנו כאן בשבילך, 24 שעות ביממה"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"צוות התמיכה שלנו נמצא כאן כדי לטפל בכל בעיה"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"צוות התמיכה שלנו זמין כל היום, בכל יום"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"‏שעות הפעילות של התמיכה הטלפונית (זמן מקומי)‏&lt;br&gt;&lt;b&gt;‏<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"חפש עזרה או גלה תחבולות וטיפים מועילים"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"תמיכה עבור:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"נוסע לחו\"ל?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"ייתכנו חיובים בינלאומיים"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"טלפון"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"צ\'אט"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"גלה טיפים וטריקים מועילים"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"חפש בנושאי העזרה ושלח משוב"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"כניסה לצורך קבלת תמיכה"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"כניסה"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"לא מצליח לקבל גישה לחשבונך?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"שליחת פרטי מערכת"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"כדי לעזור בטיפול מהיר בבעיה שלך, אנו זקוקים לפרטי מערכת לשם אבחון."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"אל תציג שוב"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"הגדרות של פרופיל עבודה"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"חיפוש אנשי קשר"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"אפשר לחיפושי אנשי קשר שמבצע הארגון לזהות מתקשרים ואנשי קשר"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="two"><xliff:g id="NUMBER">%s</xliff:g> שעות</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> שעות</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> שעות</item>
+      <item quantity="one">שעה אחת</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="two"><xliff:g id="NUMBER">%s</xliff:g> דקות</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> דקות</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> דקות</item>
+      <item quantity="one">דקה אחת</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="two"><xliff:g id="NUMBER">%s</xliff:g> שניות</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> שניות</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> שניות</item>
+      <item quantity="one">שנייה אחת</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"המתנה של ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"מחשב"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"אוזניות"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"טלפון"</string>
@@ -3165,4 +3219,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"אוזנייה"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"ציוד קלט היקפי"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"כדי לעזור בפינוי שטח אחסון, מנהל האחסון מסיר מהמכשיר שלך תמונות וסרטונים מגובים."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"הסרת תמונות וסרטונים"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"מנהל אחסון"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"באופן אוטומטי"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"ידני"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"תנועות"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"הפעלה מיידית של המצלמה"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"כדי לפתוח את המצלמה במהירות, הקש פעמיים על לחצן ההפעלה. זה פועל בכל מסך."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"מעבר בין מצלמות"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"כדי לעבור בין המצלמה הקדמית והאחורית, אחוז במכשיר והפוך אותו פעמיים מצד לצד בתנועות סיבוביות קצרות של פרק כף היד."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"בדיקת מסך מהירה"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"כדי לבדוק את הטלפון בלי להוציא אותו ממצב שינה באופן מלא, הזז אותו קלות או הרם אותו."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"החלקה לקריאת הודעות"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"כדי לבדוק את ההודעות מכל מסך, החלק מטה על חיישן טביעות האצבע."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"פועל"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"כבוי"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"הנעילה של מנהל האתחול כבר בוטלה"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"תחילה עליך להתחבר לאינטרנט"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"לא זמין במכשירים הנעולים לספק"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 413f061..57f3e6f 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"ピンク"</item>
     <item msgid="6131821495505931173">"レッド"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"30 日間"</item>
+    <item msgid="2900554746706302178">"60 日間"</item>
+    <item msgid="5692284879054004388">"90 日間"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-ja/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-ja/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-ja/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 2a1a388..c5147b7 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"データ接続を有効にする"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"データ接続を無効にする"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE プロビジョニング"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"ビデオ ハングアウト対応"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi 通話対応"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"セル無線電力"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM のアドレス帳を表示"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"発信番号制限を表示"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"指紋によるロック解除"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"指紋認証センサーに触れるだけで、スマートフォンのロック解除、購入の許可、アプリへのログインを行うことができます。こうした操作は、登録したどの指紋でも行えるため、誰の指紋を登録するかについては十分にご注意ください。\n\n注: 指紋は複雑なパターンや PIN よりも安全面で劣る可能性があります。"<annotation id="url">"詳細"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"指紋認証センサーに触れるだけで、スマートフォンのロック解除、購入の許可、アプリへのログインを行うことができます。こうした操作は、登録したどの指紋でも行えるため、誰の指紋を登録するかについては十分にご注意ください\n\n注: 指紋は複雑なパターンや PIN よりも安全面で劣る可能性があります。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"キャンセル"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"次へ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"スキップ"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"削除"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"登録の開始"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"指をセンサーに当て、振動したら離します。"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"引き続き登録を行います"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"もう一度触れてください"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"指を少しずつ動かして、指紋全体を登録します。"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"指紋の登録完了"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"このアイコンが表示されているときは、本人確認や購入の承認に指紋認証を使用できます。"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"指紋認証センサーに触れるだけで端末を復帰させてロックを解除できます。"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"このアイコンが表示されている場合は指紋を利用できます。"</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"このアイコンが表示されている場合は、購入の許可やアプリへのログインも行えます。"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"指紋の設定をスキップしますか？"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"スマートフォンのロック解除方法として指紋を選択しています。スキップした場合は、後でセットアップする必要があります。セットアップの所要時間は1分程度です。"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"画面ロックを設定"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi発信をONにすると、ユーザーの設定と信号の強度に応じて、スマートフォンからWi-Fiネットワークか携帯通信会社ネットワークのいずれかを経由して通話をルーティングできるようになります。この機能をONにする場合は、事前に料金などの条件について携帯通信会社にご確認ください。"</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"緊急対応の住所の更新"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Wi-Fi を使用して 110 に電話した場合に、緊急サービスが現在地として使用する住所"</string>
     <string name="home_settings" msgid="212375129455718176">"ホーム"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"表示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"削除"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"セットアップ"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"外部メディア"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"空き容量を増やす"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"ストレージを管理"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USBでパソコンに接続"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"次で接続:"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"メディアデバイス（MTP）"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"音声"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"キャッシュデータ"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"その他"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"システム"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g>の内容を見る"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"その他のファイルには、アプリが保存した共有ファイル、インターネットや Bluetooth 経由でダウンロードしたファイル、Android ファイルなどが含まれます。\n\nこの「<xliff:g id="NAME">^1</xliff:g>」の全内容を確認するには、[外部メディア] をタップします。"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"システムには、Android オペレーティング システムで内部的に使用されているファイルが含まれます。\n\nこのようなファイルは個別に表示することができません。"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g>が保存した写真、音楽、動画、アプリなどのデータはストレージの<xliff:g id="SIZE">^2</xliff:g>を使用しています。\n\n詳細を表示するには、<xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"法的情報"</string>
     <string name="contributors_title" msgid="5917703088825286504">"アライアンスパートナー"</string>
     <string name="manual" msgid="3025943393642974445">"マニュアル"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"規制情報"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"規制ラベル"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"安全と規制に関する情報"</string>
     <string name="copyright_title" msgid="865906688917260647">"著作権"</string>
     <string name="license_title" msgid="1990487604356037871">"ライセンス"</string>
     <string name="terms_title" msgid="7697580845616764642">"利用規約"</string>
@@ -2234,6 +2243,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"常時接続VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"VPN は追加されていません。"</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"常時接続が有効です"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"このアプリは対応していません"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"常時接続するVPNプロファイルを選択します。このVPNに接続しているときのみネットワークにアクセスできます。"</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"なし"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"VPNへの常時接続にはサーバーとDNSの両方のIPアドレスが必要です。"</string>
@@ -2502,6 +2512,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"スライドでロック解除、パスワード、パターン、PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"ワーク チャレンジ, 仕事用, プロファイル"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"仕事用プロファイル, 管理対象プロファイル, 統合する, 統合, 仕事, プロファイル"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"操作"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFCタグのセットアップ"</string>
     <string name="write_tag" msgid="8571858602896222537">"書き込む"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"書き込むにはタグをタップしてください..."</string>
@@ -2993,7 +3004,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"バックグラウンド  データは Wi-Fi 接続時のみ利用できます。Wi-Fi に接続できない場合、一部のアプリやサービスに影響する可能性があります。"</string>
     <string name="condition_work_title" msgid="7293722361184366648">"仕事用プロファイルが OFF"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"仕事用プロファイルに関連するアプリ、バックグラウンド同期などの機能が OFF になっています。"</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"候補（<xliff:g id="ID_1">%1$d</xliff:g>）"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"候補"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"他 <xliff:g id="ID_1">%1$d</xliff:g> 件"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"削除"</string>
     <string name="color_temperature" msgid="2070126836910615605">"寒色の色温度"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"寒色の表示色を使用します"</string>
@@ -3086,6 +3098,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Reset ShortcutManager のレート制限カウンタをリセットしますか？"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"ロック画面の通知を管理"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"通知内容の表示と非表示を切り替える"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"すべて"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"サポート"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"最小幅"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"プレミアム SMS へのアクセスをリクエストしたインストール済みアプリはありません"</string>
@@ -3093,9 +3107,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"プレミアム SMS へのアクセス"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"無効"</string>
     <string name="demo_mode" msgid="2655748420527206870">"デモモード"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"サポートのご案内"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"サポートのご案内（年中無休 24 時間体制）"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"サポートチームがどんな問題にも対応いたします"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"サポートチームが年中無休 24 時間体制で対応いたします"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"電話サポートの対応時間（現地時間）&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"ヘルプを検索するか、使い方のヒントをご覧ください"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"サポート:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g>（<xliff:g id="PHONE">%s</xliff:g>）"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"海外に滞在している場合"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"国際通話料金が発生する可能性があります"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"電話"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"チャット"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"使い方のヒントを検索"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"ヘルプの検索とフィードバックの送信"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"サポートを利用するにはログイン"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"ログイン"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"アカウントにアクセスできない場合"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"システム情報の送信"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"すぐに問題に対処するには、診断用のシステム情報が必要となります。"</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"今後表示しない"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"仕事用プロファイルの設定"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"連絡先の検索"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"発信者や連絡先を特定するために組織による連絡先の検索を許可します"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g>時間</item>
+      <item quantity="one">1時間</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g>分</item>
+      <item quantity="one">1分</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g>秒</item>
+      <item quantity="one">1秒</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"～<xliff:g id="ESTIMATE">%1$s</xliff:g>（予想待ち時間）"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"コンピュータ"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"ヘッドセット"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"スマートフォン"</string>
@@ -3103,4 +3151,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"ヘッドフォン"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"入力用周辺機器"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"ストレージの空き容量を増やすため、ストレージ マネージャはバックアップした写真や動画をお使いの端末から削除します。"</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"写真と動画を削除"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"ストレージ マネージャ"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"自動"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"手動"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"操作"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"カメラの起動"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"カメラをすばやく起動するには、電源ボタンをダブルタップします。どの画面からでも操作できます。"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"カメラの切り替え"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"前面と背面のカメラを切り替えるには、2 回ひねる動作を行います。"</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"画面のクイック チェック"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"スマートフォンの画面を完全に ON にせずに確認するには、スマートフォンに軽く触れるか、スマートフォンを持ち上げます。"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"スワイプで通知確認"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"通知を確認するには、指紋認証センサー部分を下にスワイプします。どの画面からでも操作できます。"</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"ON"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"OFF"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"ブートローダーは既にロック解除されています"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"最初にインターネットに接続してください"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"携帯通信会社によってロックされている端末では利用できません"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-ka-rGE/arrays.xml b/res/values-ka-rGE/arrays.xml
index 96b290e..29d802d 100644
--- a/res/values-ka-rGE/arrays.xml
+++ b/res/values-ka-rGE/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"ვარდისფერი"</item>
     <item msgid="6131821495505931173">"წითელი"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"30 დღეზე ძველი"</item>
+    <item msgid="2900554746706302178">"60 დღეზე ძველი"</item>
+    <item msgid="5692284879054004388">"90 დღეზე ძველი"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-ka-rGE/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-ka-rGE/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-ka-rGE/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index c84a4e3..d66f9fb 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"მობილური ინტერნეტის ჩართვა"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"მობილური ინტერნეტის გათიშვა"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE უზრუნველყოფილია"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"ვიდეოზარი უზრუნველყოფილია"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi დარეკვა უზრუნველყოფილია"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"ფიჭური რადიოკავშირის ელკვება"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM-ის მისამართების წიგნის ნახვა"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ფიქსირებული დარეკილი ნომრების ნახვა"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"თითის ანაბეჭდით განბლოკვა"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"თქვენი ტელეფონის განსაბლოკად, შენაძენების ავტორიზაციისთვის ან აპებში შესასვლელად, უბრალოდ შეეხეთ თითის ანაბეჭდის სენსორს. ყურადღება მიაქციეთ იმას, თუ ვის თითის ანაბეჭდებს დაამატებთ, რადგან ამ მოქმედებების შესრულება ერთ დამატებულ ანაბეჭდსაც კი შეუძლია.\n\nშენიშვნა: თითის ანაბეჭდის გამოყენება შეიძლება ძლიერ ნიმუშზე ან PIN-კოდზე ნაკლებად საიმედო იყოს. "<annotation id="url">"შეიტყვეთ მეტი"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"თქვენი ტელეფონის განსაბლოკად, შენაძენების ავტორიზაციისთვის ან აპებში შესასვლელად, უბრალოდ შეეხეთ თითის ანაბეჭდის სენსორს. ყურადღება მიაქციეთ იმას, თუ ვის თითის ანაბეჭდებს დაამატებთ, რადგან ამ მოქმედებების შესრულება ერთ დამატებულ ანაბეჭდსაც კი შეუძლია.\n\nშენიშვნა: თითის ანაბეჭდის გამოყენება შეიძლება ძლიერ ნიმუშზე ან PIN-კოდზე ნაკლებად საიმედო იყოს."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"გაუქმება"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"გაგრძელება"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"გამოტოვება"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"წაშლა"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"დავიწყოთ!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"დაადეთ თითი სენსორს და ვიბრაციის შეგრძნების შემდეგ აიღეთ"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"მშვენიერია! ახლა გაიმეორეთ"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"გააგრძელეთ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"თქვენი თითის ანაბეჭდის სხვადასხვა ნაწილის დასამატებლად თითი ოდნავ გადააადგილეთ"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"ანაბეჭდი დამატებულია!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"როდესად ამ ხატულას დაინახავთ, იდენტიფიცირების ან თქვენი შესყიდვის ავტორიზებისათვის შეგიძლიათ გამოიყენოთ თქვენი თითის ანაბეჭდი."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"უბრალოდ, შეეხეთ თითის ანაბეჭდის სენსორს თქვენი მოწყობილობის გამოსაღვიძებლად და განსაბლოკად."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"როდესაც ამ ხატულას დაინახავთ, შეგიძლიათ გამოიყენოთ თქვენი თითის ანაბეჭდი."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"როცა ამ ხატულას დაინახავთ, შენაძენების ავტორიზაცია ან აპებში შესვლაც შეგეძლებათ."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"გსურთ თითის ანაბეჭდის დაყენ. გამოტოვება?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"თქვენ აირჩიეთ თქვენი თითის ანაბეჭდის გამოყენება თქვენი ტელეფონის განბლოკვის ერთ-ერთ მეთოდად. თუ ამას ახლა გამოტოვებთ, მისი დაყენება მოგვიანებით მოგიწევთ. დაყენებას მხოლოდ ერთი წუთი სჭირდება."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ეკრანის დაბლოკვის დაყენება"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"როდესაც Wi-Fi ზარი ჩართულია, თქვენს ტელეფონს შეუძლია გადაამისამართოს ზარი Wi-Fi ან თქვენს ოპერატორ ქსელზე, თქვენი პრეფერენციებისა და სიგნალის სიძლიერის მიხედვით. ამ ფუნქციის ჩართვამდე, დააზუსტეთ თქვენს ოპერატორთან შესაძლო თანხები და სხვა დეტალები."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"საგანგებო ვითარებისას საკონტაქტო მისამართის განახლება"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"მისამართი, რომელსაც 911-ზე 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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"დავიწყება"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"დაყენება"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"მიმოხილვა"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"მეხსიერების გამოთავისუფლება"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"მეხსიერების მართვა"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB კავშირი კომპიუტერთან"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"დაკავშირება როგორც"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"მედია-მოწყობილობა (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"აუდიო"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"ქეშირებული მონაცემები"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"სხვა"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"სისტემა"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g>-ის მიმოხილვა"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"სხვა მოიცავს აპების მიერ შენახულ გაზიარებულ ფაილებს, ინტერნეტიდან ან Bluetooth-ის მეშვეობით ჩამოტვირთულ ფაილებს, Android ფაილებს და ა.შ. \n\n<xliff:g id="NAME">^1</xliff:g>-ის მთლიანი კონტენტის სანახავად, შეეხეთ მიმოხილვას."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"სისტემა მოიცავს ფაილებს, რომლებიც Android ოპერაციული სისტემის შიგნით გამოიყენება. \n\nამ ფაილების ცალ-ცალკე ნახვა ვერ მოხერხდება."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g>-მა შეიძლება შეინახა ფოტოები, მუსიკა, ფილმები, აპები და სხვა მონაცემები, რომლებიც იკავებს მეხსიერების <xliff:g id="SIZE">^2</xliff:g>-ს. \n\nდეტალების სანახავად გადართეთ <xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"იურიდიული ინფორმაცია"</string>
     <string name="contributors_title" msgid="5917703088825286504">"მონაწილეები"</string>
     <string name="manual" msgid="3025943393642974445">"სახელმძღვანელო"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"ნორმატიული ინფორმაცია"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"ნორმატიული ლეიბლები"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"უსაფრთხოება და ნორმატიული ინფორმაცია"</string>
     <string name="copyright_title" msgid="865906688917260647">"საავტორო უფლებები"</string>
     <string name="license_title" msgid="1990487604356037871">"ლიცენზია"</string>
     <string name="terms_title" msgid="7697580845616764642">"წესები და პირობები"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"მუდამ VPN-ზე"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"VPN-ები დამატებული არ არის."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"ყოველთვის ჩართული რეჟიმი გააქტიურებულია"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"მხარდაუჭერელია ამ აპის მიერ"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"მუდმივი კავშირისათვის აირჩიეთ VPN პროფილი. ქსელის ტრაფიკი დაიშვება მხოლოდ ამ VPN-თან კავშირის დროს."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"არც ერთი"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"ყოველთვის ჩართული VPN ითხოვს IP მისამართს როგორც სერვერისთვის, ისე DNS-თვის."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"განსაბლოკად გასრიალება, პაროლი, ნიმუში, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"სამსახურის გამოწვევა, სამსახური, პროფილი"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"სამსახურის პროფილი, მართული პროფილი, გაერთიანება, უნიფიკაცია, სამსახური, პროფილი"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"ჟესტი"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC თეგის დაყენება"</string>
     <string name="write_tag" msgid="8571858602896222537">"ჩაწერა"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"შეეხეთ თეგს დასაწერად..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"უკანა ფონის მონაცემები ხელმისაწვდომია მხოლოდ Wi-Fi-ს მეშვეობით. ამან შეიძლება გავლენა იქონიოს ზოგიერთი აპის ან სერვისის მუშაობაზე, როცა Wi-Fi მიუწვდომელი იქნება."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"სამსახურის პროფილი გამორთულია"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"აპები, ფონური სინქრონიზაცია და თქვენს სამსახურის პროფილთან დაკავშირებული სხვა ფუნქციები გამორთულია."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"შეთავაზებები (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"შემოთავაზებები"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"ამოშლა"</string>
     <string name="color_temperature" msgid="2070126836910615605">"ცივი ფერები"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ეკრანზე ცივი ფერების გამოყენება"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"გსურთ ShortcutManager-ის სიხშირის შემზღუდველი მთვლელების გადაყენება?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"მართეთ შეტყობინებები ჩაკეტილ ეკრანზე"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"შეტყობინების კონტენტის ჩვენება ან დამალვა"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"ყველა"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"მხარდაჭერა"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"უმცირესი სიგანე"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"პრემიუმ SMS შეტყობინებების გაგზავნაზე წვდომა არცერთ ინსტალირებულ აპს არ მოუთხოვია"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"პრემიუმ SMS შეტყობინებების გაგზავნაზე წვდომა"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"გათიშულია"</string>
     <string name="demo_mode" msgid="2655748420527206870">"დემო-რეჟიმი"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"ჩვენ მზად ვართ, დაგეხმაროთ"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"ჩვენ დაგეხმარებით 24 საათის განმავლობაში, 7 დღე კვირაში"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"ჩვენი მხარდაჭერის გუნდი თქვენი პრობლემების მოგვარებაში დაგეხმარებათ"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"ჩვენი მხარდაჭერის გუნდი ხელმისაწვდომია ყოველდღე, დღის ნებისმიერ მონაკვეთში"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"სატელეფონო მხარდაჭერის გუნდის სამუშაო საათები (ადგილობრივი დრო)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"დაათვალიერეთ დახმარების ან რჩევებისა და მითითებების სექცია"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"მხარდაჭერა შემდეგი ქვეყნისთვის:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> — <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"მოგზაურობთ?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"შეიძლება საერთაშორისო ზარის საფასურის გადახდა მოგიწიოთ"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"ტელეფონი"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"ჩეთი"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"რჩევებისა და მითითებების დათვალიერება"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"დახმარების სექციაში ძიება და გამოხმაურება"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"მხარდაჭერის მისაღებად, შედით სისტემაში"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"შესვლა"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"ვერ შედიხართ თქვენს ანგარიშში?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"სისტემის ინფორმაციის გაგზავნა"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"იმისთვის, რომ თქვენი პრობლემის მოგვარებაში უფრო სწრაფად დაგეხმაროთ, დიაგნოსტიკური მიზნით, თქვენი სისტემის ინფორმაცია გვჭირდება."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"აღარ გამოჩნდეს"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"სამსახურის პროფილის პარამეტრები"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"კონტაქტების ძიება"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"აბონენტებისა და კონტაქტების ამოცნობის მიზნით, თქვენი ორგანიზაციისთვის კონტაქტების ძიების დაშვება"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> საათი</item>
+      <item quantity="one">1 საათი</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> წუთი</item>
+      <item quantity="one">1 წუთი</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> წამი</item>
+      <item quantity="one">1 წამი</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"მოცდის დრო: ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"კომპიუტერი"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"ყურსაცვამი"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"ტელეფონი"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"ყურსასმენი"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"შეყვანის პერიფერიული მოწყობილობა"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"მეხსიერების გამოთავისუფლების ხელშეწყობის მიზნით, მეხსიერების მენეჯერი თქვენი მოწყობილობიდან იმ ფოტოებსა და ვიდეოებს ამოშლის, რომელთა სარეზერვო ასლებიც უკვე შექმნილია."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ფოტოებისა და ვიდეოების ამოშლა"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"მეხსიერების მენეჯერი"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"ავტომატური"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"მექანიკური"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"ჟესტები"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"კამერაზე გადასვლა"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"კამერის სწრაფად გასახსნელად, უბრალოდ შეეხეთ ორმაგად ელკვების ღილაკს. მუშაობს ნებისმიერი ეკრანიდან."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"კამერის გადართვა"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"წინა და უკანა კამერებს შორის გადასართველად, შეასრულეთ ორმაგი მოტრიალება."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"ეკრანის სწრაფი შემოწმება"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"თქვენი ტელეფონის სრულად გამოღვიძების გარეშე, მასზე ნაჩვენები ინფორმაციის ნახვა მისი მსუბუქი ბიძგებით ან ხელში აღებით შეგიძლიათ."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"გადაფურცვლა შეტყობინებების შესამოწმებლად"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"თქვენი შეტყობინებების ნებისმიერი ეკრანიდან შესამოწმებლად, ჩამოუსვით თითი თითის ანაბეჭდის სენსორს."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"ჩართული"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"გამორთული"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"სისტემის ჩამტვირთველი უკვე განბლოკილია"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"პირველ რიგში, დაუკავშირდით ინტერნეტს"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"მიუწვდომელია ოპერატორზე დაბლოკილ მოწყობილობებზე"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-kk-rKZ/arrays.xml b/res/values-kk-rKZ/arrays.xml
index 8ae8512..c398609 100644
--- a/res/values-kk-rKZ/arrays.xml
+++ b/res/values-kk-rKZ/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Қызғылт"</item>
     <item msgid="6131821495505931173">"Қызыл"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"30 күн бұрын"</item>
+    <item msgid="2900554746706302178">"60 күн бұрын"</item>
+    <item msgid="5692284879054004388">"90 күн бұрын"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-kk-rKZ/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-kk-rKZ/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-kk-rKZ/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 5c80181..356d68a 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Деректер байланысын қосу"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Деректер байланысын өшіру"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE қамтамасыз ету"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Бейне қоңырау шалу қарастырылған"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi арқылы қоңырау шалу қарастырылған"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Ұялы радио қуаты"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM мекенжай кітапшасын қарау"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Бекітілген теру нөмірлерін қарау"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Саусақ ізімен құлыпты ашу"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Телефон құлпын ашу, сатып алуларды авторизациялау немесе қолданбаларға кіру үшін саусақ ізін оқу сканерін түртсеңіз болды. Басқа саусақ іздерін қосқанда сақ болыңыз. Олар осы әрекеттердің кез келгенін орындай алады.\n\nЕскертпе: саусақ ізінің қауіпсіздігі күшті өрнектен немесе PIN кодынан азырақ болуы мүмкін. "<annotation id="url">"Толығырақ"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Телефон құлпын ашу, сатып алуларды авторизациялау немесе қолданбаларға кіру үшін саусақ ізін оқу сканерін түртсеңіз болды. Басқа саусақ іздерін қосқанда сақ болыңыз. Олар осы әрекеттердің кез келгенін орындай алады.\n\nЕскертпе: саусақ ізінің қауіпсіздігі күшті өрнектен немесе PIN кодынан азырақ болуы мүмкін."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Бас тарту"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Жалғастыру"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Өткізіп жіберу"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Жою"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Бастайық!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Саусақты сенсорға қойып, дірілді сезгеннен кейін көтеріңіз"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Тамаша! Енді қайталаңыз."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Тағы бір рет түртіңіз"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Саусақ ізінің әр түрлі бөліктерінің барлығын қосу үшін саусақты азғантай жылжытыңыз"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Саусақ ізі қосылды!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Осы белгішені көргенде идентификациялау немесе сатып алуды авторизациялау үшін саусақ ізін пайдалануға болады."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Құрылғыны ояту және құлпын ашу үшін жай саусақ ізі сенсорын түртіңіз."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Осы белгішені көргенде саусақ ізін пайдалануға болады."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Осы белгішені көрген кезде сатып алуларды авторизациялауға немесе қолданбаларға кіруге болады."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Саусақ ізін орнатуды өткізіп жіберу керек пе?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Саусақ ізін пайдалануды телефон құлпын ашудың бір жолы ретінде таңдадыңыз. Қазір өткізіп жіберсеңіз, мұны кейінірек орнату керек. Орнату бір минутқа жақын уақыт алады."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Экран құлпын орнату"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi қоңырау шалу қосулы кезде қалауыңызға және қайсы сигнал күштілігіне байланысты телефоныңыз қоңырауларды Wi-Fi желілері не жабдықтаушы желісі арқылы бағыттауы мүмкін. Бұл мүмкіндікті қосудан бұрын жабдықтаушыңыздың қатысты алымдары мен басқа мәліметтерді тексеріңіз."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"Төтенше жағдайда пайдаланылатын мекенжайды жаңарту"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"WiFi көмегімен 911 нөміріне қоңырау шалсаңыз, төтенше жағдай қызметтері орныңыз ретінде пайдаланатын мекенжай"</string>
     <string name="home_settings" msgid="212375129455718176">"Негізгі"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Дыбыс"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Ұмыту"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Реттеу"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Ашу"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Орын босату"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Жадты басқару"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB компьютер байланысы"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Жалғау"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Meдиа құрылғысы (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Aудио"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Кэштелген деректер"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Басқа"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Жүйе"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> ашу"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Басқалары қолданбалар сақтаған бөлісілген файлдарды, интернет немесе Bluetooth арқылы жүктелген файлдарды, Android файлдарын және т.б. қамтиды. \n\nОсы <xliff:g id="NAME">^1</xliff:g> ішіндегі бүкіл мазмұнды көру үшін \"Ашу\" түймесін түртіңіз."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Жүйе Android операциялық жүйесінің ішінде пайдаланылатын файлдарды қамтиды. \n\nФайлдарды жеке көру мүмкін емес."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> ішінде сақталған фотосуреттер, музыка, фильмдер, қолданбалар немесе жадтың <xliff:g id="SIZE">^2</xliff:g> көлемін алып тұрған басқа деректер болуы мүмкін. \n\nМәліметтерін көру үшін, <xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Заңнамалық ақпараттар"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Үлес қосушылар"</string>
     <string name="manual" msgid="3025943393642974445">"Қолмен"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Нұсқаулықтар ақпараты"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Нормативтік белгілер"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Қауіпсіздік және нормативтік ақпарат"</string>
     <string name="copyright_title" msgid="865906688917260647">"Авторлық құқықтар"</string>
     <string name="license_title" msgid="1990487604356037871">"Лицензия"</string>
     <string name="terms_title" msgid="7697580845616764642">"Шарттары"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Әрқашан қосулы VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"VPN желілері қосылмады."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"\"Әрқашан қосулы\" режимінде"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Бұл қолданбада қолдау көрсетілмейді"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Әрқашан жалғанып тұратын VPN профилін таңдаңыз. Желі трафигі осы VPN жалғанып тұрғанда ғана жүреді."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Ешқандай"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Әрқашан қосулы ВЖЖ сервер және домен атауы жүйесінің IP мекенжайын қажет етеді."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"құлпын ашу үшін сырғыту, кілтсөз, өрнек, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"жұмыс профилін қорғау, жұмыс, профиль"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"жұмыс профилі, басқарылатын профиль, бірыңғайлау, жұмыс, профиль"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"қимыл"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC белгісін реттеу"</string>
     <string name="write_tag" msgid="8571858602896222537">"Жазу"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Жазу үшін белгіні түртіңіз…"</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Фондық деректер тек Wi-Fi арқылы қол жетімді. Бұл Wi-Fi қол жетімді емес кезде кейбір қолданбаларға немесе қызметтерге әсер етуі мүмкін."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Жұмыс профилі өшірулі"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Қолданбалар, фондық синхрондау және жұмыс профиліңізге қатысты басқа мүмкіндіктер өшіріледі."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Ұсыныстар (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Ұсыныстар"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Жою"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Суық түс температурасы"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Суығырақ дисплей түстерін пайдалану"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager жылдамдықты шектеу есептегіштерін бастапқы күйіне қайтару керек пе?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Құлыпталған экран хабарландыруларын бақылау"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Хабарландыру мазмұнын көрсету немесе жасыру"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Барлығы"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Қолдау"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> нүкте/дюйм"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Ең кішкентай ен"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Орнатылған қолданбалардың ешбірі Premium SMS мүмкіндігін пайдалануға рұқсат сұрамады."</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium SMS пайдалану"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Өшірілген"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Демо режимі"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Көмектесуге әрқашан дайынбыз"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Біз сізге аптасына 7 күн 24 сағат бойы көмек көрсетуге дайынбыз"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Біздің қолдау көрсету ұжымы кез келген мәселені шешуге дайын"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Біздің қолдау көрсету ұжымы кез келген күні тәулік бойы қызмет көрсетуге дайын"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Телефонға қолдау көрсету сағаттары (жергілікті уақыт)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Іздеу анықтамасы немесе зерттеу кеңестері және тәсілдері"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Қолдау:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Шетелде саяхаттап жүрсіз бе?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Халықаралық төлем алынуы мүмкін"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Телефон"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Чат"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Зерттеу кеңестері және тәсілдері"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Анықтама іздеу және пікір жіберу"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Қолдау көрсетілу үшін жүйеге кіріңіз"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Кіру"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Есептік жазбаңызға кіре алмай тұрсыз ба?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Жүйе туралы ақпаратты жіберу"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Мәселеңізді тезірек қарастыру үшін бізге диагностика жүргізуге жүйе туралы ақпарат керек."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Енді көрсетпеу"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Жұмыс профилінің параметрлері"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Контакт іздеу"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Қоңырау шалушылар мен контактілерді анықтау үшін ұйым бойынша контакт іздеуге рұқсат беру"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> сағат</item>
+      <item quantity="one">1 сағат</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> минут</item>
+      <item quantity="one">1 минут</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> секунд</item>
+      <item quantity="one">1 секунд</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Шамамен <xliff:g id="ESTIMATE">%1$s</xliff:g> күту керек"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Компьютер"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Құлақаспап жинағы"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Телефон"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Құлақаспап"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Кіріс құралы"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Жад кеңістігін босату үшін жад реттегіші құрылғыдағы сақтық көшірмесі жасалған фотосуреттер мен бейнелерді өшіреді."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Фотосуреттер мен бейнелерді жою"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Жад реттегіші"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Aвтоматты"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Қолмен"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Қимылдар"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Камераға өту"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Камераны жылдам ашу үшін қуат түймесін екі рет түртіңіз. Кез келген экраннан жұмыс істейді."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Камераны аудару"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Алдыңғы және артқы камераны ауыстыру үшін екі рет айналдырыңыз."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Экранды жылдам тексеру"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Телефонды толығымен оятпай тексеру үшін оны түртіңіз немесе қолыңызға алыңыз."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Хабарландыруларға қарай сырғыту"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Экран хабарландыруларын тексеру үшін саусақ ізін оқу сканерінде саусағыңызды төмен қарай сырғытыңыз."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Қосулы"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Өшірулі"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Операциялық жүйені жүктеу құралының құлпы ашылған"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Алдымен Интернетке қосылыңыз"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Оператор тарапынан құлыпталған құрылғыларда қолжетімсіз"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-km-rKH/arrays.xml b/res/values-km-rKH/arrays.xml
index eabb62d..0958547 100644
--- a/res/values-km-rKH/arrays.xml
+++ b/res/values-km-rKH/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"ផ្កាឈូក"</item>
     <item msgid="6131821495505931173">"ពណ៌ក្រហម"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"លើសពី 30 ថ្ងៃ"</item>
+    <item msgid="2900554746706302178">"លើសពី 60 ថ្ងៃ"</item>
+    <item msgid="5692284879054004388">"លើសពី 90 ថ្ងៃ"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-km-rKH/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-km-rKH/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-km-rKH/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 3ae6554..d348137 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"បើកដំណើរការតភ្ជាប់ទិន្នន័យ"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"បិទដំណើរការតភ្ជាប់ទិន្នន័យ"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"បានផ្តល់ VoLTE"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"បានផ្តល់នូវការហៅជាវីដេអូ"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"បានផ្តល់នូវការហៅតាមរយៈ Wifi"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"ថាមពលវិទ្យុចល័ត"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"មើលសៀវភៅអាសយដ្ឋានក្នុងស៊ីមកាត"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"មើល​លេខ​ហៅ​ថេរ"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"ដោះសោដោយប្រើស្នាមម្រាមដៃ"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"គ្រាន់តែប៉ះឧបករណ៍ចាប់ស្នាមម្រាមដៃ នោះអ្នកអាចដោះសោទូរស័ព្ទរបស់អ្នក ផ្តល់សិទ្ធិក្នុងការទិញ ឬចូលកម្មវិធី។ សូមប្រុងប្រយ័ត្នចំពោះស្នាមម្រាមដៃដែលអ្នកបន្ថែម។ ផ្តិតតែងម្តងប៉ុណ្ណោះ តែអ្នកអាចធ្វើសកម្មភាពទាំងអស់នេះបាន។\n\nចំណាំ៖ ស្នាមម្រាមដៃរបស់អ្នកមិនសូវមានសុវត្ថិភាពដូចការប្រើលំនាំ ឬកូដ PIN ដែលខ្លាំងនោះទេ។ "<annotation id="url">"ស្វែងយល់បន្ថែម"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"គ្រាន់តែប៉ះលើឧបករណ៍ចាប់ស្នាមម្រាមដៃប៉ុណ្ណោះដើម្បីដោះសោទូរស័ព្ទរបស់អ្នក អនុញ្ញាតលើការទិញ ឬចូលកម្មវិធី។ សូមប្រុងប្រយ័ត្នចំពោះស្នាមម្រាមដៃដែលអ្នកបន្ថែម។ ទោះបីជាបន្ថែមស្នាមម្រាមដៃតែមួយក៏ដោយ ក៏វាអាចធ្វើសកម្មភាពទាំងអស់នេះបានដែរ។\n\nចំណាំ៖ ស្នាមម្រាមដៃរបស់អ្នកមិនសូវមានសុវត្ថិភាពដូចការប្រើលំនាំ ឬកូដ PIN ដែលខ្លាំងនោះទេ។"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"បោះបង់"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"បន្ត"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"រំលង"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"លុប"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"តោះចាប់ផ្តើម!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ដាក់ម្រាមដៃរបស់អ្នកនៅលើឧបករណ៍ចាប់សញ្ញា ហើយលើកវាឡើងបន្ទាប់ពីអ្នកមានអារម្មណ៍ថាវាញ័រហើយ"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"ល្អណាស់! ឥឡូវនេះធ្វើម្តងទៀត"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"បន្តធ្វើ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"ផ្លាស់ទីម្រាមដៃរបស់អ្នកបន្តិចដើម្បីបន្ថែមផ្នែកផ្សេងទៀតទាំងអស់នៃម្រាមដៃរបស់អ្នក"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"បានបញ្ចូល​ស្នាមម្រាមដៃ​រួចហើយ!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"នៅពេលដែលអ្នកឃើញរូបតំណាងនេះ អ្នកអាចប្រើស្នាមម្រាមដៃដើម្បីសម្គាល់​អត្តសញ្ញាណ ឬដើម្បីអនុញ្ញាតការទិញ។"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"គ្រាន់តែប៉ះឧបករណ៍ចាប់ស្នាមម្រាមដៃដើម្បីដាស់ និងដោះសោឧបករណ៍របស់អ្នក។"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"នៅពេលដែលអ្នកឃើញរូបតំណាងនេះ អ្នកអាចប្រើស្នាមម្រាមដៃរបស់អ្នក។"</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"នៅពេលដែលអ្នកឃើញរូបតំណាងនេះ អ្នកក៏អាចផ្តល់សិទ្ធិក្នុងការទិញ ឬចូលកម្មវិធីផងដែរ។"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"រំលងការដំឡើងស្នាមម្រាមដៃឬទេ?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"អ្នកបានជ្រើសរើសប្រើស្នាមម្រាមដៃរបស់អ្នកជាវិធីមួយក្នុងការដោះសោទូរស័ព្ទរបស់អ្នក។ ប្រសិនបើអ្នករំលងឥឡូវនេះ អ្នកត្រូវដំឡើងវានៅពេលក្រោយ។ ការដំឡើងចំណាយពេលបន្តិចប៉ុណ្ណោះ។"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"កំណត់ការចាក់សោអេក្រង់"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"នៅពេលការហៅតាម Wi-Fi បានបើក ទូរស័ព្ទរបស់អ្នកអាចធ្វើការហៅចេញតាមរយៈបណ្តាញ Wi-Fi ឬបណ្តាញរបស់ក្រុមហ៊ុនរបស់អ្នក ដោយផ្អែកលើចំណូលចិត្តរបស់អ្នក និងថាតើ signal ណាមួយខ្លាំងជាង។ មុនពេលបើកលក្ខណៈពិសេសនេះ សូមត្រួតពិនិត្យជាមួយក្រុមហ៊ុនរបស់អ្នកពាក់ព័ន្ធនឹងតម្លៃ និងព័ត៌មានលម្អិតផ្សេងទៀត។"</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"អាប់ដេតអាសយដ្ឋានសង្គ្រោះបន្ទាន់"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"ប្រសិនបើអ្នកធ្វើការហៅទៅ 911 ដោយប្រើ WiFi នោះអាសយដ្ឋានដែលប្រើដោយសេវាកម្មសង្គ្រោះបន្ទាន់នឹងយកធ្វើជាទីតាំងរបស់អ្នក"</string>
     <string name="home_settings" msgid="212375129455718176">"ដើម"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"បង្ហាញ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"សំឡេង"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"បំភ្លេច"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"ដំឡើង"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"រុករក"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"បង្កើតទំហំផ្ទុក"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"គ្រប់គ្រងទំហំផ្ទុក"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"ការ​តភ្ជាប់​កុំព្យូទ័រ​តាម​យូអេសប៊ី"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"តភ្ជាប់​ជា"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"ឧបករណ៍​មេឌៀ (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"សំឡេង"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"ទិន្នន័យក្នុងឃ្លាំងសម្ងាត់"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"ផ្សេងៗ"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"ប្រព័ន្ធ"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"រុករក <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"ឯកសារផ្សេងៗរាប់បញ្ចូលទាំងឯកសារដែលបានចែករំលែកដោយកម្មវិធី ឯកសារដែលបានដោនឡូតពីអ៊ីនធឺណិត ឬប៊្លូធូស និងឯកសារ Android ជាដើម។ \n\nដើម្បីមើលមាតិកាទាំងស្រុងរបស់ <xliff:g id="NAME">^1</xliff:g> សូមប៉ះរុករក។"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"ប្រព័ន្ធរាប់បញ្ចូលទាំងឯកសារដែលបានប្រើផ្ទៃខាងក្នុងដោយប្រព័ន្ធប្រតិបត្តិការ Android។ \n\nឯកសារទាំងនេះមិនអាចមើលមួយៗបានទេ។"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> ប្រហែលជាបានរក្សារូបភាព តន្ត្រី ភាពយន្ត កម្មវិធី ឬទិន្នន័យផ្សេងទៀតដែលមានទំហំ <xliff:g id="SIZE">^2</xliff:g> នៃឧបករណ៍ផ្ទុក។ \n\nដើម្បីមើលព័ត៌មានលម្អិត សូមប្តូរទៅ <xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"ព័ត៌មាន​ផ្លូវ​ច្បាប់"</string>
     <string name="contributors_title" msgid="5917703088825286504">"អ្នក​ចូលរួម"</string>
     <string name="manual" msgid="3025943393642974445">"ឯកសារណែនាំ"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"ព័ត៌មាន​គ្រប់គ្រង"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"ស្លាកបទបញ្ជា"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"ព័ត៌មានសុវត្ថិភាព និងបទបញ្ជា"</string>
     <string name="copyright_title" msgid="865906688917260647">"រក្សាសិទ្ធិ"</string>
     <string name="license_title" msgid="1990487604356037871">"អាជ្ញាប័ណ្ណ"</string>
     <string name="terms_title" msgid="7697580845616764642">"លក្ខខណ្ឌ​ប្រើប្រាស់"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"បើក VPN ជា​និច្ច"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"គ្មានការបន្ថែម VPN ទេ"</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"បើកជានិច្ចសកម្ម"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"មិនគាំទ្រដោយកម្មវិធីនេះទេ"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"ជ្រើស​ប្រវត្តិរូប VPN តភ្ជាប់​ជា​និច្ច។ ចរាចរណ៍​បណ្ដាញ​នឹង​ត្រូវ​បាន​អនុញ្ញាត​ ពេល​តភ្ជាប់​ទៅ VPN នេះ។"</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"គ្មាន"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"បើក​ជា​និច្ច VPN ទាមទារ​អាសយដ្ឋាន IP សម្រាប់​ទាំង​ម៉ាស៊ីន​មេ និង​ DNS ។"</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"អូសដើម្បីដោះសោ, ពាក្យសម្ងាត់, លំនាំ, កូដ PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"បញ្ហាប្រឈមក្នុងការងារ ការងារ ប្រវត្តិរូប"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"ប្រវត្តិរូបការងារ ប្រវត្តិរូបដែលត្រូវបានគ្រប់គ្រង រួមបញ្ចូល ការរួមបញ្ចូល ការងារ ប្រវត្តិរូប"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"កាយវិការ"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"រៀបចំ​ស្លាក​អិនអេហ្វ​ស៊ី​វ៉ាយហ្វាយ"</string>
     <string name="write_tag" msgid="8571858602896222537">"សរសេរ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ប៉ះ​ស្លាក​ដើម្បី​សរសេរ..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"ទិន្នន័យផ្ទៃខាងក្រោយប្រើបានតាមរយៈ Wi-Fi ប៉ុណ្ណោះ។ វាអាចប៉ះពាល់កម្មវិធី ឬសេវាកម្មមួយចំនួន នៅពេលដែលមិនមាន Wi-Fi។"</string>
     <string name="condition_work_title" msgid="7293722361184366648">"ប្រវត្តិរូបការងារត្រូវបានបិទ"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"កម្មវិធី ការធ្វើសមកាលកម្មផ្ទៃខាងក្រោយ និងលក្ខណៈពិសេសផ្សេងទៀតដែលពាក់ព័ន្ធនឹងប្រវត្តិរូបការងាររបស់អ្នកត្រូវបានបិទ។"</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"ការណែនាំ (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"ការណែនាំ"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"យកចេញ"</string>
     <string name="color_temperature" msgid="2070126836910615605">"សីតុណ្ហភាពពណ៌ត្រជាក់"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ប្រើពណ៌បង្ហាញត្រជាក់ជាងមុន"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"កំណត់កម្មវិធីរាប់ការកំណត់អត្រា ShortcutManager ឡើងវិញឬ?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"គ្រប់គ្រងការជូនដំណឹងអេក្រង់ចាក់សោ"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"បង្ហាញ ឬលាក់មាតិកាជូនដំណឹង"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"ទាំងអស់"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"គាំទ្រ"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"ទទឹងតូចបំផុត"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"មិនមានកម្មវិធីដែលដំឡើងហើយបានស្នើសុំការចូលដំណើរការសេវាកម្ម SMS ពិសេសទេ"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"ការចូលដំណើរការសេវាកម្ម SMS ពិសេស"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"បានបិទដំណើរការ"</string>
     <string name="demo_mode" msgid="2655748420527206870">"របៀបសាកល្បង"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"យើងនៅទីនេះដើម្បីផ្តល់ជំនួយ"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"យើងនៅទីនេះ 24/7"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"ក្រុមការងារផ្នែកគាំទ្ររបស់យើងនៅទីនេះដើម្បីជួយដោះស្រាយបញ្ហានានា"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"ក្រុមការងារផ្នែកគាំទ្ររបស់យើងនៅទីនេះគ្រប់ពេល ជារៀងរាល់ថ្ងៃ។"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"ទូរស័ព្ទគាំទ្រម៉ោង (ម៉ោងក្នុងស្រុក)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"ស្វែងរកជំនួយ ឬរុករកគន្លឹះ និងល្បិចប្រើ"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"គាំទ្រ៖"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"ធ្វើដំណើរទៅក្រៅប្រទេសឬ?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"ការគិតប្រាក់កម្រិតអន្តរជាតិអាចនឹងត្រូវអនុវត្ត"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"ទូរស័ព្ទ"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"ជជែក"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"រុករកគន្លឹះ និងល្បិច"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"ស្វែងរកជំនួយ និងផ្ញើមតិ"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"ចូលសម្រាប់ការគាំទ្រ"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"ចូល"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"មិនអាចចូលដំណើរការគណនីរបស់អ្នកបានឬ?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"ផ្ញើព័ត៌មានប្រព័ន្ធ"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"ដើម្បីជួយដោះស្រាយបញ្ហារបស់អ្នកឲ្យបានឆាប់រហ័ស យើងត្រូវការព័ត៌មានប្រព័ន្ធសម្រាប់ការវិភាគ។"</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"កុំបង្ហាញម្តងទៀត"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"ការកំណត់ប្រវត្តិរូបការងារ"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"ការស្វែងរកទំនាក់ទំនង"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"អនុញ្ញាតការស្វែងរកទំនាក់ទំនងដោយស្ថាប័នរបស់អ្នកដើម្បីកំណត់អត្តសញ្ញាណអ្នកហៅ និងលេខទំនាក់ទំនង"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ម៉ោង</item>
+      <item quantity="one">1 ម៉ោង</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> នាទី</item>
+      <item quantity="one">1 នាទី</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> វិនាទី</item>
+      <item quantity="one">1 វិនាទី</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> រង់ចាំ"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"កុំព្យូទ័រ"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"កាស"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"ទូរស័ព្ទ"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"កាស"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"ធាតុបញ្ចូលបន្ថែម"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"ប៊្លូធូស"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"ដើម្បីបង្កើនទំហំផ្ទុក កម្មវិធីគ្រប់គ្រងទំហំផ្ទុកយករូបថត និងវីដេអូដែលបានបម្រុងទុកចេញពីឧបករណ៍របស់អ្នក។"</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"យករូបថត និងវីដេអូចេញ"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"កម្មវិធីគ្រប់គ្រងទំហំផ្ទុក"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"ស្វ័យប្រវត្តិ"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"ឯកសារណែនាំ"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"កាយវិការ"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"លោតទៅកាមេរ៉ា"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"គ្រាន់តែប៉ះប៊ូតុងថាមពលពីរដង ដើម្បីបើកកាមេរ៉ាឲ្យបានរហ័ស។ ដំណើរការចំពោះអេក្រង់ទាំងអស់។"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ត្រឡប់កាមេរ៉ា"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"បង្វិលពីរដង ដើម្បីឆ្លាស់គ្នារវាងកាមេរ៉ាមុខ និងក្រោយ។"</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"ពិនិត្យអេក្រង់រហ័ស"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"ប៉ះថើៗ ឬលើកវាឡើង ដើម្បីពិនិត្យទូរស័ព្ទរបស់អ្នកដោយមិនចាំបាច់ដាស់វាទាំងស្រុង។"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"អូសដើម្បីមើលការជូនដំណឹង"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"អូសចុះក្រោមនៅលើឧបករណ៍ចាប់ស្នាមម្រាមដៃ ដើម្បីពិនិត្យការជូនដំណឹងរបស់អ្នកនៅលើអេក្រង់ណាមួយ។"</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"បើក"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"បិទ"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader ត្រូវបានដោះសោរួចហើយ"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"ភ្ជាប់ទៅអ៊ីនធឺណិតជាមុនសិន"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"មិនអាចប្រើបានលើឧបករណ៍ចាក់សោដោយក្រុមហ៊ុនផ្តល់សេវាទូរស័ព្ទទេ"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-kn-rIN/arrays.xml b/res/values-kn-rIN/arrays.xml
index 1db7c2b..59b0225 100644
--- a/res/values-kn-rIN/arrays.xml
+++ b/res/values-kn-rIN/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"ಗುಲಾಬಿ ಬಣ್ಣ"</item>
     <item msgid="6131821495505931173">"ಕೆಂಪು"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"30 ದಿನಗಳಿಗಿಂತಲೂ ಹಳೆಯದು"</item>
+    <item msgid="2900554746706302178">"60 ದಿನಗಳಿಗಿಂತಲೂ ಹಳೆಯದು"</item>
+    <item msgid="5692284879054004388">"90 ದಿನಗಳಿಗಿಂತಲೂ ಹಳೆಯದು"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-kn-rIN/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-kn-rIN/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-kn-rIN/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index f2d7857..cd5fd79 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"ಡೇಟಾ ಸಂಪರ್ಕ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ಡೇಟಾ ಸಂಪರ್ಕ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE ಪೂರೈಸಲಾಗಿದೆ"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"ವೀಡಿಯೊ ಕರೆ ಸೌಲಭ್ಯ ಕಲ್ಪಿಸಲಾಗಿದೆ"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"ವೈಫೈ ಕರೆ ಸೌಲಭ್ಯ ಕಲ್ಪಿಸಲಾಗಿದೆ"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"ಸೆಲ್ಯುಲಾರ್ ರೇಡಿಯೋ ಪವರ್"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"ಸಿಮ್ ವಿಳಾಸ ಪುಸ್ತಕವನ್ನು ವೀಕ್ಷಿಸಿ"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ಸ್ಥಿರ ಡಯಲಿಂಗ್ ಸಂಖ್ಯೆಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"ಬೆರಳಚ್ಚು‌ ಮೂಲಕ ಅನ್‌ಲಾಕ್‌ ಮಾಡಿ"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ಕೇವಲ ಬೆರಳಚ್ಚು ಸೆನ್ಸರ್ ಸ್ಪರ್ಶಿಸಿ‌. ನೀವು ಸೇರಿಸುವ ಬೆರಳಚ್ಚು‌ಗಳ ಬಗ್ಗೆ ಜಾಗರೂಕರಾಗಿರಿ. ಒಂದು ಹೆಚ್ಚಿನ ಬೆರಳಚ್ಚು ಸಹ ಇವುಗಳಲ್ಲಿ ಯಾವುದನ್ನಾದರೂ ಮಾಡಬಹುದು.\n\nಗಮನಿಸಿ: ನಿಮ್ಮ ಬೆರಳಚ್ಚು ಬಲವಾದ ಪ್ಯಾಟರ್ನ್ ಅಥವಾ ‌ಪಿನ್‌ಗಿಂತ ಕಡಿಮೆ ಸುರಕ್ಷಿತವಾಗಿರಬಹುದು. "<annotation id="url">"ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ಕೇವಲ ಬೆರಳಚ್ಚು ಸೆನ್ಸರ್ ಸ್ಪರ್ಶಿಸಿ‌. ನೀವು ಸೇರಿಸುವ ಬೆರಳಚ್ಚು‌ಗಳ ಬಗ್ಗೆ ಜಾಗರೂಕರಾಗಿರಿ. ಒಂದು ಹೆಚ್ಚಿನ ಬೆರಳಚ್ಚು ಸಹ ಇವುಗಳಲ್ಲಿ ಯಾವುದನ್ನಾದರೂ ಮಾಡಬಹುದು.\n\nಗಮನಿಸಿ: ನಿಮ್ಮ ಬೆರಳಚ್ಚು ಬಲವಾದ ಪ್ಯಾಟರ್ನ್ ಅಥವಾ ‌ಪಿನ್‌ಗಿಂತ ಕಡಿಮೆ ಸುರಕ್ಷಿತವಾಗಿರಬಹುದು."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"ರದ್ದುಮಾಡು"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ಮುಂದುವರಿಸು"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"ಸ್ಕಿಪ್‌"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"ಅಳಿಸಿ"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"ಇದೀಗ ಪ್ರಾರಂಭಿಸೋಣ!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ಸೆನ್ಸರ್ ಮೇಲೆ ನಿಮ್ಮ ಬೆರಳಿರಿಸಿ ಮತ್ತು ನಿಮಗೆ ವೈಬ್ರೇಷನ್ ಅನುಭವ ಆದ ನಂತರ ತೆಗೆಯಿರಿ"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"ಅದ್ಭುತ! ಈಗ ಪುನರಾವರ್ತಿಸಿ"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"ಮುಂದುವರಿಸಿ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ನ ಎಲ್ಲಾ ವಿವಿಧ ಭಾಗಗಳನ್ನು ಸೇರಿಸಲು ನಿಮ್ಮ ಬೆರಳನ್ನು ಸ್ವಲ್ಪಮಟ್ಟಿಗೆ ಸರಿಸಿ"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"ಬೆರಳಚ್ಚು ಸೇರಿಸಲಾಗಿದೆ!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ನೀವು ಈ ಐಕಾನ್ ವೀಕ್ಷಿಸಿದಾಗ, ನಿಮ್ಮ ಬೆರಳಚ್ಚು ಅನ್ನು ನೀವು ಗುರುತಿಸುವಿಕೆಗೆ ಅಥವಾ ಖರೀದಿಯನ್ನು ಪ್ರಮಾಣೀಕರಿಸಲು ಬಳಸಬಹುದು."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಎಚ್ಚರಗೊಳಿಸಲು ಮತ್ತು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಕೇವಲ ಬೆರಳಚ್ಚು ಸೆನ್ಸಾರ್ ಅನ್ನು ಸ್ಪರ್ಶಿಸಿ."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"ಈ ಐಕಾನ್ ಅನ್ನು ನೀವು ವೀಕ್ಷಿಸಿದಾಗ, ನಿಮ್ಮ ಬೆರಳಚ್ಚು ಅನ್ನು ನೀವು ಬಳಸಬಹುದು."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"ನೀವು ಈ ಐಕಾನ್ ಅನ್ನು ವೀಕ್ಷಿಸಿದಾಗ, ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ಗಳಲ್ಲಿ ಖರೀದಿಗಳಿಗೆ ದೃಢೀಕರಣ ನೀಡಬಹುದು ಅಥವಾ ಸೈನ್‌ ಇನ್‌ ಮಾಡಬಹುದು."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ಬೆರಳಚ್ಚು ಸೆಟಪ್ ಸ್ಕಿಪ್ ಮಾಡುವುದೇ?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಒಂದು ಮಾರ್ಗವಾಗಿ ನಿಮ್ಮ ಬೆರಳಚ್ಚು ಅನ್ನು ಬಳಸಲು ನೀವು ಆಯ್ಕೆಮಾಡಿರುವಿರಿ. ನೀವು ಇದೀಗ ಸ್ಕಿಪ್ ಮಾಡಿದರೆ, ನೀವು ಇದನ್ನು ನಂತರ ಹೊಂದಿಸುವ ಅಗತ್ಯವಿರುತ್ತದೆ. ಸೆಟಪ್ ಕೇವಲ ನಿಮಿಷದಷ್ಟು ಸಮಯವನ್ನು ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಹೊಂದಿಸಿ"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆ ಆನ್‌ ಆದಾಗ, ನಿಮ್ಮ ಫೋನ್‌ ನಿಮ್ಮ ಆದ್ಯತೆ ಮತ್ತು ಯಾವ ಸಿಗ್ನಲ್ ಬಲವಾಗಿದೆ ಎಂಬುದರ ಅನುಗುಣವಾಗಿ, ಕರೆಗಳನ್ನು ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ಗಳು ಅಥವಾ ನಿಮ್ಮ ವಾಹಕದ ನೆಟ್‌ವರ್ಕ್ ಮೂಲಕ ರವಾನಿಸುತ್ತದೆ. ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಆನ್‌ ಮಾಡವ ಮೊದಲು, ಶುಲ್ಕಗಳು  ಮತ್ತು ಇತರ ವಿವರಗಳಿಗೆ ಸಂಬಂಧಿಸಿದಂತೆ ನಿಮ್ಮ ವಾಹಕವನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"ತುರ್ತು ವಿಳಾಸವನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಿ"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"ವೈ-ಫೈ ಬಳಸಿಕೊಂಡು ನೀವು 911 ಕರೆ ಮಾಡಿದಾಗ ನಿಮ್ಮ ಸ್ಥಳದ ವಿಳಾಸವನ್ನು ತುರ್ತು ಸೇವೆಗಳಿಗೆ ಬಳಸಲಾಗುತ್ತದೆ"</string>
     <string name="home_settings" msgid="212375129455718176">"ಮುಖಪುಟ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ಪ್ರದರ್ಶನ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ಧ್ವನಿ"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"ಮರೆತುಬಿಡು"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"ಹೊಂದಿಸು"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"ಎಕ್ಸ್‌ಪ್ಲೋರ್‌‌ ಮಾಡಿ"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"ಸ್ಪೇಸ್ ಅನ್ನು ಮುಕ್ತಗೊಳಿಸಿ"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"ಸಂಗ್ರಹಣೆಯನ್ನು ನಿರ್ವಹಿಸಿ"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB ಕಂಪ್ಯೂಟರ್ ಸಂಪರ್ಕ"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"ಇದರಂತೆ ಸಂಪರ್ಕಪಡಿಸು"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"ಮಾಧ್ಯಮ ಸಾಧನ (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"ಆಡಿಯೊ"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"ಸಂಗ್ರಹಿಸಿದ ಡೇಟಾ"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"ಇತರೆ"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"ಸಿಸ್ಟಂ"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> ಅನ್ನು ಎಕ್ಸ್‌ಪ್ಲೋರ್ ಮಾಡಿ"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಉಳಿಸಿರುವ ಹಂಚಿದ ಫೈಲ್‌ಗಳು, ಇಂಟರ್ನೆಟ್ ಅಥವಾ ಬ್ಲೂಟೂತ್ ಮೂಲಕ ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಫೈಲ್‌ಗಳು, Android ಫೈಲ್‌ಗಳು ಹಾಗೂ ಇನ್ನಷ್ಟನ್ನು ಇತರವುಗಳು ಒಳಗೊಂಡಿರುತ್ತವೆ. \n\nಈ <xliff:g id="NAME">^1</xliff:g> ನ ಸಂಪೂರ್ಣ ವಿಷಯಗಳನ್ನು ನೋಡಲು, ಎಕ್ಸ್‌ಪ್ಲೋರ್ ಮಾಡು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Android ಆಪರೇಟಿಂಗ್ ಸಿಸ್ಟಂ ಮೂಲಕ ಆಂತರಿಕವಾಗಿ ಬಳಸಲಾದ ಫೈಲ್‌ಗಳನ್ನು ಸಿಸ್ಟಂ ಒಳಗೊಂಡಿದೆ. \n\nಈ ಫೈಲ್‌ಗಳನ್ನು ಪ್ರತ್ಯೇಕವಾಗಿ ವೀಕ್ಷಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> ಅವರು ಫೋಟೋಗಳು, ಸಂಗೀತ, ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅಥವಾ <xliff:g id="SIZE">^2</xliff:g> ರ ಸಂಗ್ರಹಣೆಯನ್ನು ತೆಗೆದುಕೊಳ್ಳುತ್ತಿರುವ ಇತರ ಡೇಟಾವನ್ನು ಉಳಿಸಿರಬಹುದು. \n\nವಿವರಗಳನ್ನು ವೀಕ್ಷಿಸಲು, <xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"ಕಾನೂನು ಮಾಹಿತಿ"</string>
     <string name="contributors_title" msgid="5917703088825286504">"ಕೊಡುಗೆದಾರರು"</string>
     <string name="manual" msgid="3025943393642974445">"ಹಸ್ತಚಾಲಿತ"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"ನಿಯಂತ್ರಣ ಮಾಹಿತಿ"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"ನಿಯಂತ್ರಣ ಲೇಬಲ್‌ಗಳು"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"ಸುರಕ್ಷತೆ ಮತ್ತು ನಿಯಂತ್ರಣ ಮಾಹಿತಿ"</string>
     <string name="copyright_title" msgid="865906688917260647">"ಹಕ್ಕುಸ್ವಾಮ್ಯ"</string>
     <string name="license_title" msgid="1990487604356037871">"ಪರವಾನಗಿ"</string>
     <string name="terms_title" msgid="7697580845616764642">"ನಿಯಮಗಳು ಮತ್ತು ಷರತ್ತುಗಳು"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN ನಲ್ಲಿ ಆನ್‌ ಆಗಿರಿಸಿ"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"ಯಾವುದೇ VPN ಗಳನ್ನು ಸೇರಿಸಲಾಗಿಲ್ಲ."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"ಯಾವಾಗಲೂ ಸಕ್ರಿಯ"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"ಈ ಅಪ್ಲಿಕೇಶನ್‌ ಮೂಲಕ ಬೆಂಬಲಿಸುತ್ತಿಲ್ಲ"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"ಯಾವಾಗಲೂ ಸಂಪರ್ಕದಿಂದಿರಲು VPN ಪ್ರೊಫೈಲ್‌ ಆಯ್ಕೆಮಾಡಿ. ಈ VPN ಗೆ ಸಂಪರ್ಕಗೊಳಿಸಿದಾಗ ಮಾತ್ರ ನೆಟ್‌ವರ್ಕ್‌ ದಟ್ಟಣೆಯನ್ನು ಅನುಮತಿಸಲಾಗುವುದು."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"ಯಾವುದೂ ಇಲ್ಲ"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"ಎರಡೂ ಸರ್ವರ್‌ ಮತ್ತು DNS ಗಾಗಿ VPN ನಲ್ಲಿ ಯಾವಾಗಲೂ IP ವಿಳಾಸದ ಅಗತ್ಯವಿರುತ್ತದೆ."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಪಾಸ್‌ವರ್ಡ್‌, ಪ್ಯಾಟರ್ನ್‌, ಪಿನ್ ಗೆ ಸ್ಲೈಡ್‌ ಮಾಡಿ"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"ಕೆಲಸದ ಸವಾಲು, ಕೆಲಸ, ಪ್ರೊಫೈಲ್"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್, ನಿರ್ವಹಿಸಿದ ಪ್ರೊಫೈಲ್, ಒಗ್ಗೂಡಿಸಿ, ಏಕೀಕರಣ, ಕೆಲಸ, ಪ್ರೊಫೈಲ್"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"ಗೆಸ್ಚರ್"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ವೈ-ಫೈ NFC ಟ್ಯಾಗ್‌ ಹೊಂದಿಸಿ"</string>
     <string name="write_tag" msgid="8571858602896222537">"ಬರೆಯಿರಿ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ಬರೆಯಲು ಟ್ಯಾಗ್‌ ಅನ್ನು ಟ್ಯಾಪ್‌ ಮಾಡಿ..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"ಹಿನ್ನೆಲೆ ಡೇಟಾವು ವೈ-ಫೈ ಮೂಲಕ ಮಾತ್ರ ಲಭ್ಯವಾಗುತ್ತದೆ. ವೈ-ಫೈ ಲಭ್ಯವಿಲ್ಲದೆ ಇರುವಾಗ ಇದು ಕೆಲವು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅಥವಾ ಸೇವೆಗಳಿಗೆ ಪರಿಣಾಮ ಬೀರಬಹುದು."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಆಫ್ ಆಗಿದೆ"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್‌‌ಗೆ ಸಂಬಂಧಿಸಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು, ಹಿನ್ನೆಲೆ ಸಿಂಕ್ ಮತ್ತು ಇತರ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಆಫ್ ಮಾಡಲಾಗಿದೆ."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"ಸಲಹೆಗಳು (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"ಸಲಹೆಗಳು"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"ತೆಗೆದುಹಾಕಿ"</string>
     <string name="color_temperature" msgid="2070126836910615605">"ತಂಪು ಬಣ್ಣದ ತಾಪಮಾನ"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ತಂಪಾದ ಪ್ರದರ್ಶನ ಬಣ್ಣಗಳನ್ನು ಬಳಸಿ"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager ನ ದರ-ಸೀಮಿತಗೊಳಿಸುವಿಕೆ ಕೌಂಟರ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸುವುದೇ?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"ಲಾಕ್‌ ಪರದೆಯ ಅಧಿಸೂಚನೆಗಳನ್ನು ನಿಯಂತ್ರಿಸಿ"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"ಅಧಿಸೂಚನೆಯ ವಿಷಯವನ್ನು ತೋರಿಸು ಅಥವಾ ಮರೆಮಾಡು"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"ಎಲ್ಲಾ"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"ಬೆಂಬಲ"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"ಚಿಕ್ಕದಾದ ಅಗಲ"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ಯಾವುದೇ ಸ್ಥಾಪಿಸಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಪ್ರೀಮಿಯಂ SMS ಪ್ರವೇಶವನ್ನು ವಿನಂತಿಸಿಲ್ಲ"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"ಪ್ರೀಮಿಯಂ SMS ಪ್ರವೇಶ"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="demo_mode" msgid="2655748420527206870">"ಡೆಮೊ ಮೋಡ್"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"ಸಹಾಯಕ್ಕೆ ನಾವು ಇಲ್ಲಿದ್ದೇವೆ"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"ನಿಮಗಾಗಿ ನಾವು 24/7 ಇಲ್ಲಿರುತ್ತೇವೆ"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"ಯಾವುದೇ ಸಮಸ್ಯೆಗಳನ್ನು ಇತ್ಯರ್ಥಗೊಳಿಸಲು ನಮ್ಮ ಸಹಾಯ ತಂಡವು ಇಲ್ಲಿದೆ"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"ನಮ್ಮ ಬೆಂಬಲ ತಂಡವು ದಿನದಾದ್ಯಂತ ಪ್ರತಿ ದಿನ ಲಭ್ಯವಿರುತ್ತದೆ"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"ಫೋನ್ ಬೆಂಬಲ ಸಮಯಗಳು (ಸ್ಥಳೀಯ ಸಮಯ)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"ಸಹಾಯಕ್ಕಾಗಿ ಹುಡುಕಿ ಅಥವಾ ಸುಳಿವುಗಳು &amp; ಕೈಚಳಕಗಳನ್ನು ಎಕ್ಸ್‌ಪ್ಲೋರ್ ಮಾಡಿ"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"ಬೆಂಬಲ:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"ವಿದೇಶಕ್ಕೆ ಪ್ರಯಾಣಿಸುತ್ತಿರುವಿರಾ?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"ಅಂತಾರಾಷ್ಟ್ರೀಯ ದರಗಳು ಅನ್ವಯವಾಗಬಹುದು"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"ಫೋನ್"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"ಚಾಟ್"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"ಸಲಹೆಗಳು ಮತ್ತು ತಂತ್ರಗಳನ್ನು ಎಕ್ಸ್‌ಪ್ಲೋರ್ ಮಾಡಿ"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"ಸಹಾಯ ಹುಡುಕಾಟ ಮತ್ತು ಪ್ರತಿಕ್ರಿಯೆ ಕಳುಹಿಸಿ"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"ಬೆಂಬಲಕ್ಕಾಗಿ ಸೈನ್‌ ಇನ್ ಮಾಡಿ"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"ಸೈನ್ ಇನ್ ಮಾಡು"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"ನಿಮ್ಮ ಖಾತೆಯನ್ನು ಪ್ರವೇಶಿಸಲಾಗುತ್ತಿಲ್ಲವೇ?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"ಸಿಸ್ಟಂ ಮಾಹಿತಿಯನ್ನು ಕಳುಹಿಸಿ"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"ನಿಮ್ಮ ಸಮಸ್ಯೆಯನ್ನು ತ್ವರಿತವಾಗಿ ಬಗೆಹರಿಸಲು ಸಹಾಯಕವಾಗಿ, ಡೈಗ್ನೋಸಿಸ್‌ಗಾಗಿ ನಮಗೆ ಸಿಸ್ಟಂ ಮಾಹಿತಿಯ ಅಗತ್ಯವಿದೆ."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"ಮತ್ತೆ ತೋರಿಸಬೇಡ"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"ಸಂಪರ್ಕ ಹುಡುಕಿ"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"ಕರೆದಾತರು ಮತ್ತು ಸಂಪರ್ಕಗಳನ್ನು ಗುರುತಿಸಲು ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ಮೂಲಕ ಸಂಪರ್ಕ ಹುಡುಕಾಟಗಳಿಗೆ ಅನುಮತಿಸಿ"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ಗಂಟೆಗಳು</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ಗಂಟೆಗಳು</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ನಿಮಿಷಗಳು</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ನಿಮಿಷಗಳು</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ಸೆಕೆಂಡುಗಳು</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ಸೆಕೆಂಡುಗಳು</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> ಕಾಯಿರಿ"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"ಕಂಪ್ಯೂಟರ್‌"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"ಹೆಡ್‌ಸೆಟ್"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"ಫೋನ್"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"ಹೆಡ್‌ಫೋನ್"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"ಪೆರಿಪೆರಲ್ ಇನ್‌ಪುಟ್‌‌"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"ಬ್ಲೂಟೂತ್"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"ಸಂಗ್ರಹಣೆ ಸ್ಥಳಾವಕಾಶ ಮುಕ್ತಗೊಳಿಸುವಲ್ಲಿ ಸಹಾಯ ಮಾಡಲು, ಸಂಗ್ರಹಣೆ ನಿರ್ವಾಹಕವು ಬ್ಯಾಕಪ್ ಮಾಡಲಾದ ಫೋಟೋಗಳು ಮತ್ತು ವೀಡಿಯೊಗಳನ್ನು ನಿಮ್ಮ ಸಾಧನದಿಂದ ತೆಗೆದುಹಾಕುತ್ತದೆ."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ಫೋಟೋಗಳು ಮತ್ತು ವೀಡಿಯೊಗಳನ್ನು ತೆಗೆದುಹಾಕಿ"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"ಸಂಗ್ರಹಣೆ ನಿರ್ವಾಹಕ"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"ಸ್ವಯಂಚಾಲಿತ"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"ಹಸ್ತಚಾಲಿತ"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"ಗೆಸ್ಚರ್‌ಗಳು"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"ಕ್ಯಾಮರಾಗೆ ಹೋಗಿ"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"ಕ್ಯಾಮರಾವನ್ನು ತ್ವರಿತವಾಗಿ ತೆರೆಯಲು, ಕೇವಲ ಪವರ್ ಬಟನ್ ಮೇಲೆ ಡಬಲ್-ಟ್ಯಾಪ್ ಮಾಡಿ. ಯಾವುದೇ ಪರದೆಯಿಂದ ಕೆಲಸ ಮಾಡುತ್ತದೆ."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ಫ್ಲಿಪ್ ಕ್ಯಾಮರಾ"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"ಮುಂದಿನ ಮತ್ತು ಹಿಂದಿನ ಕ್ಯಾಮರಾ‌ಗಳ ನಡುವೆ ಬದಲಾಯಿಸಲು, ಎರಡು ಬಾರಿ ತಿರುಗಿಸಿ."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"ತ್ವರಿತ ಪರದೆಯ ಪರಿಶೀಲನೆ"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಸಂಪೂರ್ಣವಾಗಿ ಎಚ್ಚರಗೊಳ್ಳದಂತೆ ಪರಿಶೀಲಿಸಲು, ತಳ್ಳಿರಿ ಅಥವಾ ತೆಗೆದುಕೊಳ್ಳಿ."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"ಅಧಿಸೂಚನೆಗಳಿಗೆ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"ನಿಮ್ಮ ಅಧಿಸೂಚನೆಗಳನ್ನು ಯಾವುದೇ ಪರದೆಯಿಂದ ಪರಿಶೀಲಿಸಲು, ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆನ್ಸರ್‌ನಲ್ಲಿ ಕೆಳಗೆ ಸ್ವೈಪ್ ಮಾಡಿ."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"ಆನ್"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"ಆಫ್"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"ಬೂಟ್‌ಲೋಡರ್ ಅನ್ನು ಈಗಾಗಲೇ ಅನ್‌ಲಾಕ್ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"ಮೊದಲು ಇಂಟರ್ನೆಟ್‌ಗೆ ಸಂಪರ್ಕಿಸಿ"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"ವಾಹಕ-ಲಾಕ್‌ಮಾಡಲಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿ ಲಭ್ಯವಿಲ್ಲ"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 34603c8..770e300 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"분홍색"</item>
     <item msgid="6131821495505931173">"빨간색"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"30일 이전"</item>
+    <item msgid="2900554746706302178">"60일 이전"</item>
+    <item msgid="5692284879054004388">"90일 이전"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-ko/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-ko/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-ko/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 020d2af..772f750 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"데이터 연결 사용"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"데이터 연결 사용 안함"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE 프로비저닝됨"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"화상 통화 프로비저닝됨"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi 통화 프로비저닝됨"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"모바일 데이터 무선 전력"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM 주소록 보기"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"발신 허용 번호 보기"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"지문으로 잠금 해제"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"휴대전화를 잠금 해제하거나, 구매를 승인하거나, 앱에 로그인하려면 지문 센서를 터치하기만 하면 됩니다. 휴대전화에 지문이 추가된 사용자 누구나 이러한 작업을 수행할 수 있으므로 누구의 지문을 추가할지 신중하게 선택하세요.\n\n참고: 지문은 강력한 패턴 또는 PIN보다 보안이 취약합니다. "<annotation id="url">"자세히 알아보기"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"지문 센서를 터치하기만 하면 휴대전화를 잠금 해제하거나 구매를 승인하거나 앱에 로그인할 수 있습니다. 휴대전화에 지문이 추가된 사용자 누구나 이러한 작업을 수행할 수 있으므로 누구의 지문을 추가할지 신중하게 선택하세요.\n\n참고: 지문은 강력한 패턴 또는 PIN보다 보안이 취약합니다."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"취소"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"계속"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"건너뛰기"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"삭제"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"시작"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"센서에 손가락을 올리고 진동이 느껴지면 떼세요."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"좋습니다. 계속하세요."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"계속"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"손가락을 살짝 움직여 지문의 다른 부분도 전부 추가하세요."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"지문이 추가되었습니다."</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"이 아이콘이 표시되면 지문을 사용하여 사용자 본인임을 증명하거나 구매를 승인할 수 있습니다."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"기기의 대기 모드 및 잠금을 해제하려면 지문 센서를 터치하기만 하면 됩니다."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"이 아이콘이 표시되면 지문을 사용할 수 있습니다."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"이 아이콘이 표시되는 경우 구매를 승인하거나 앱에 로그인할 수도 있습니다."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"지문 설정을 건너뛰시겠습니까?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"지문으로 휴대전화를 잠금 해제하도록 설정했습니다. 지금 건너뛰면 나중에 설정해야 하며 설정에는 약 1분 정도 소요됩니다."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"화면 잠금 설정"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi 통화가 켜져 있으면 휴대전화에서 환경설정과 신호 강도에 따라 Wi-Fi 네트워크나 데이터 네트워크를 통해 통화를 연결할 수 있습니다. 이 기능을 사용하기 전에 이동통신사에 문의하여 요금과 기타 세부정보를 알아보세요."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"긴급 주소 업데이트"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Wi-Fi를 통해 119에 전화를 걸 때 응급 서비스에서 내 위치로 사용한 주소"</string>
     <string name="home_settings" msgid="212375129455718176">"홈"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"디스플레이"</string>
     <string name="sound_settings" msgid="5534671337768745343">"소리"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"저장 안함"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"설정"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"탐색"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"기기 여유 공간 확보"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"저장용량 관리"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB 컴퓨터 연결"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"다음으로 연결"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"미디어 기기(MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"오디오"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"캐시된 데이터"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"기타"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"시스템"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> 탐색"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"앱에서 저장한 공유 파일, 인터넷으로 또는 블루투스로 다운로드한 파일, Android 파일 등이 기타에 포함됩니다. \n\n이 <xliff:g id="NAME">^1</xliff:g>의 전체 콘텐츠를 보려면 탐색을 탭하세요."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Android 운영체제에 의해 내부적으로 사용된 파일이 시스템에 포함되어 있습니다. \n\n이 파일을 개별적으로 볼 수 없습니다."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g>님이 <xliff:g id="SIZE">^2</xliff:g>의 저장용량을 차지하는 사진, 음악, 영화, 앱 또는 기타 데이터를 저장했을 수 있습니다. \n\n자세한 내용을 확인하려면 <xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"법률정보"</string>
     <string name="contributors_title" msgid="5917703088825286504">"도움을 주신 분들"</string>
     <string name="manual" msgid="3025943393642974445">"수동"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"규정 정보"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"규정 라벨"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"안전 및 규제 정보"</string>
     <string name="copyright_title" msgid="865906688917260647">"저작권"</string>
     <string name="license_title" msgid="1990487604356037871">"라이선스"</string>
     <string name="terms_title" msgid="7697580845616764642">"약관"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"연결 유지 VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"추가된 VPN 없음"</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"항상 사용 활성화"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"이 앱에서 지원되지 않음"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"VPN 프로필을 선택하여 연결된 상태를 유지하세요. 이 VPN에 연결된 상태에서만 네트워크 트래픽이 허용됩니다."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"없음"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"VPN을 연결 상태로 유지하려면 서버와 DNS의 IP 주소가 필요합니다."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"슬라이드하여 비밀번호, 패턴, PIN을 잠금 해제"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"직장 보안 확인, 직장, 프로필"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"직장 프로필, 관리된 프로필, 통합, 통합형, 직장, 프로필"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"동작"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC 태그 설정"</string>
     <string name="write_tag" msgid="8571858602896222537">"쓰기"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"태그를 탭하여 작성하세요..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"백그라운드 데이터는 Wi-Fi를 통해서만 사용할 수 있습니다. Wi-Fi를 사용할 수 없는 경우 일부 앱이나 서비스에 영향을 미칠 수 있습니다."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"직장 프로필이 사용 중지됨"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"앱, 백그라운드 동기화 및 기타 직장 프로필 관련 기능이 사용 중지되었습니다."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"추천(<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"추천"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"삭제"</string>
     <string name="color_temperature" msgid="2070126836910615605">"차가운 색상 온도"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"더 차가운 디스플레이 색상 사용"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager 대역 제한 카운터를 재설정하시겠습니까?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"잠금 화면 알림 제어"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"알림 내용 표시 또는 숨기기"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"전체"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"지원"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g>dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"최소 폭"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"설치된 앱 중에서 프리미엄 SMS 액세스를 요청한 앱이 없습니다."</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"프리미엄 SMS 액세스"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"사용 안함"</string>
     <string name="demo_mode" msgid="2655748420527206870">"데모 모드"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Google로부터 지원받기"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"하루 24시간 연중무휴 운영"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Google 지원팀에서 문제해결을 도와드립니다."</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Google 지원팀은 하루 24시간 연중무휴로 운영됩니다."</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"휴대전화 지원 시간(현지 시간)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"도움말 검색 또는 도움말 및 유용한 정보 탐색"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"지원 국가:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g>(<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"해외에 계신가요?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"국제 요금이 청구될 수 있습니다."</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"전화"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"채팅"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"도움말 및 유용한 정보 탐색"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"도움말 검색 및 의견 보내기"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"로그인하여 지원받기"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"로그인"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"계정에 액세스할 수 없으신가요?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"시스템 정보 보내기"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"문제를 신속하게 해결하기 위해 진단용 시스템 정보가 필요합니다."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"다시 표시 안 함"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"직장 프로필 설정"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"연락처 검색"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"조직에서 연락처를 검색하여 발신자 및 연락처를 확인할 수 있도록 허용합니다."</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g>시간</item>
+      <item quantity="one">1시간</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g>분</item>
+      <item quantity="one">1분</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g>초</item>
+      <item quantity="one">1초</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> 대기"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"컴퓨터"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"헤드셋"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"전화"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"헤드폰"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"입력 주변기기"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"블루투스"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"저장용량 관리자가 저장 공간을 확보하기 위해 백업된 사진과 동영상을 기기에서 삭제합니다."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"사진 및 동영상 삭제"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"저장용량 관리자"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"자동"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"수동"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"동작"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"카메라로 이동"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"카메라를 빨리 열려면 전원 버튼을 두 번 탭하기만 하면 됩니다. 어느 화면에서나 작동합니다."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"카메라 전환"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"전면 카메라와 후면 카메라를 전환하려면 두 번 돌립니다."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"빠른 화면 확인"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"대기 모드를 해제하지 않고 휴대전화를 확인하려면 살짝 밀거나 들어보세요."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"스와이프하여 알림 확인"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"어느 화면에서나 알림을 확인하려면 지문 센서에서 아래로 스와이프합니다."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"사용"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"사용 안함"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"부트로더가 이미 잠금해제되었습니다."</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"먼저 인터넷 연결"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"특정 이동통신사만 사용하도록 잠긴 기기에서 사용할 수 없음"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-ky-rKG/arrays.xml b/res/values-ky-rKG/arrays.xml
index d8b1110..217daf7 100644
--- a/res/values-ky-rKG/arrays.xml
+++ b/res/values-ky-rKG/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Кызгылтым"</item>
     <item msgid="6131821495505931173">"Кызыл"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"30 күндөн мурунку"</item>
+    <item msgid="2900554746706302178">"60 күндөн мурунку"</item>
+    <item msgid="5692284879054004388">"90 күндөн мурунку"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-ky-rKG/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-ky-rKG/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-ky-rKG/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 8f81dc5..86690f3 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Мобилдик туташууну иштетүү"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Мобилдик туташууну өчүрүү"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE шарттаган"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Видео чалуу камсыздалган"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi аркылуу чалуу камсыздалган"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Уюлдук радио кубаты"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM картадагы дарек китепчесин көрүү"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Туруктуу терүү номерлерин көрүү"</string>
@@ -333,7 +335,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Кулпну манж из менн ач"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Телефонуңуздун кулпусун ачып, кандайдыр бир нерсени сатып алып жатканыңызды ырастап же колдонмолорго кирүү үчүн жөн гана манжаңызды сенсорго тийгизип коюңуз. Кимдир-бирөөнүн манжа изин кошуп жатканыңызда этият болуңуз. Бир эле манжа изи кошулса да, ушул нерселердин бардыгын аткарууга болот.\n\nЭскертүү: Түзмөгүңүздү манжа изине караганда графикалык ачкыч же PIN код менен коргоо бир кыйла коопсуз. "<annotation id="url">"Көбүрөөк билүү"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Телефонуңуздун кулпусун ачып, кандайдыр бир нерсени сатып алып жатканыңызды ырастап же колдонмолорго кирүү үчүн жөн гана манжаңызды сенсорго тийгизип коюңуз. Кимдир-бирөөнүн манжа изин кошуп жатканыңызда этият болуңуз. Бир эле манжа изи кошулса да, ушул нерселердин бардыгын аткара алат.\n\nТүзмөгүңүздү манжа изи менен коргоого караганда графикалык ачкыч же PIN код менен коргоо бир кыйла коопсуз."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Жокко чыгаруу"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Улантуу"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Өткөрүп жиберүү"</string>
@@ -354,12 +356,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Жок кылуу"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Баштадык!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Манжаңызды сенсорго коюп, дирилдегенин сезгенден кийин көтөрүңүз"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Эң жакшы! Эми кайталаңыз"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Кайталоо"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Манжа изиңиздин ар кайсы бөлүгүн кошуу үчүн манжаңызды кичинеден жылдырыңыз"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Манжа изи кошулду!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Бул сөлөкөттү качан көрсөңүз да аныктоо же сатып алууга уруксат берүү үчүн манжа изиңизди пайдалана аласыз."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Түзмөгүңүздү ойготуп, кулпусун ачуу үчүн, жөн гана манжа изи сенсоруна тийип коюңуз."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Бул сөлөкөттү көргөнүңүздө манжа изиңизди колдонсоңуз болот."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Бул сөлөкөттү көргөнүңүздө, сатып алууларга уруксат берип же колдонмолорго кирсеңиз болот."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Манжа изин жөндөө өткөрүлсүнбү?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Телефонуңуздун кулпусун манжа изи менен ачуу ыкмасын тандадыңыз. Эгер азыр өткөрүп жиберсеңиз, аны кийинчерээк жөндөшүңүз керек болот. Жөндөөгө бир мүнөтчө эле убакыт кетет."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Экранды кулпулоо ыкмасын коюу"</string>
@@ -834,6 +836,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi чалуу күйгүзүлгөндө, телефонуңуз, жеке жөндөөлөрүңүзгө жана сигналдын күчтүүлүгүнө жараша, чалууларды Wi-Fi тармактары же операторуңуздун тармагы аркылуу багыттай алат. Бул өзгөчөлүктү күйгүзүүдөн мурун, акылары жана башка маалымат боюнча операторуңузга кайрылыңыз."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"Өзгөчө кырдаалда кайрыла турган даректи жаңыртуу"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"WiFi аркылуу 911 номерине чалганыңызда куткаруучуларга жайгашкан жериңиз катары көрсөтүлө турган дарек"</string>
     <string name="home_settings" msgid="212375129455718176">"Үйгө"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Үн"</string>
@@ -1054,6 +1058,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Унутулсун"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Жөндөө"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Изилдөө"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Орун бошотуу"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Сактагычты башкаруу"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB аркылуу компүтерге туташуу"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Катары туташуу"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Медиа түзмөк (MTP)"</string>
@@ -1090,8 +1096,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Аудио"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Кэштелген дайындар"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Башка"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Тутум"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> дегенди изилдөө"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Колдонмолордо сакталган жалпыга ачык документтер, Интернеттен же Bluetooth\'дан жүктөлүп алынган файлдар, Android файлдары жана башкалар. \n\nБул түзмөктүн <xliff:g id="NAME">^1</xliff:g> мазмунун толугу менен көрүү үчүн, Изилдөөнү таптап коюңуз."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Тутумда Android иш тутумунда колдонулуучу файлдар камтылган. \n\nАл файлдарды өз-өзүнчө көрүү мүмкүн эмес."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> сактагычта жалпы көлөмү <xliff:g id="SIZE">^2</xliff:g> болгон сүрөттөрдү, музыканы, тасмаларды, колдонмолорду же башка дайындарды сактап койгон окшойт. \n\nЧоо-жайын көрүү үчүн колдонуучунун каттоо эсебине кириңиз <xliff:g id="USER_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>
@@ -1282,7 +1290,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Юридикалык маалыматтар"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Салым кошуучулар"</string>
     <string name="manual" msgid="3025943393642974445">"Нускама"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Башкаруучу маалыматтар"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Башкаруучу энбелгилер"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Коопсуздук жана башкаруу тууралуу маалымат"</string>
     <string name="copyright_title" msgid="865906688917260647">"Автордук укук"</string>
     <string name="license_title" msgid="1990487604356037871">"Уруксаттама"</string>
     <string name="terms_title" msgid="7697580845616764642">"Шарттар жана жоболор"</string>
@@ -2229,6 +2238,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Дайым иштеген VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Эч VPN кошулган жок."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Иштеп турат"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Бул колдонмодо колдоого алынбайт"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Дайым туташып туруучу VPN профайл тандаңыз. Бул VPN\'ге кошулганда гана желе трафигине уруксат берилет."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Эч бир"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Дайым иштеген VPN, DNS\'ке жана серверге IP дарек сурап жатат."</string>
@@ -2497,6 +2507,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"кулпусун ачуу үчүн сыдыруу, сырсөз, үлгү, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"жумуш тапшырмасы, жумуш, профиль"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"жумуш профили, башкарылган профиль, бириктир, бириктирүү, жумуш, профиль"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"жаңсоо"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC тегин орнотуу"</string>
     <string name="write_tag" msgid="8571858602896222537">"Жазуу"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Жазуу үчүн тегди таптап коюңуз…"</string>
@@ -2988,7 +2999,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Дайындарды фондук режимде өткөрүү үчүн Wi-Fi тармагына туташуу керек. Wi-Fi жок болгондо, айрым кызматтар менен колдонмолор иштебей калат."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Жумуш профили өчүрүлгөн"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Жумуш профилиңизге байланыштуу колдонмолор, фондо шайкештирүү сыяктуу функциялар өчүрүлгөн."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Сунуштар (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Сунуштар"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Алып салуу"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Салкын температура түсү"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Салкыныраак дисплей түстөрүн колдонуңуз"</string>
@@ -3081,6 +3093,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager\'дин ылдамдыкты чектөөчү эсептегичтери баштапкы абалга келтирилсинби?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Кулпуланган экрндг эскртмнлрд көзөмөлдөө"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Эскертме мазмунун көрсөтүү же жашыруу"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Бардыгы"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Колдоо"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Эң кууш"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Орнотулган колдонмолордун эч бири артыкчылыктуу SMS жөнөтүүгө уруксат сураган жок"</string>
@@ -3088,9 +3102,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Артыкчылыктуу SMS жөнөтүүгө уруксат"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Өчүрүлгөн"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Демо режими"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Жардам берүүгө даярбыз"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Колдоо бөлүмү күнү-түнү иштейт"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Колдоо кызматыбыздын жамааты бардык маселелерди чечүүгө жардам берет"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Колдоо бөлүмүбүздүн жамааты күн сайын тынымсыз иштейт"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Телефон аркылуу колдоо көрсөтүү сааттары (жергиликтүү убакыт)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Издөө боюнча жардам берилип, издөө кеңештери менен ыкмалары көрсөтүлөт"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Колдоого алынган өлкө:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> – <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Чет өлкөдө саякаттап жүрөсүзбү?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Эл аралык байланыш акысын төлөп калышыңыз мүмкүн"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Телефон"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Маек"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Кеңештер жана ыкмаларды изилдөө"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Издөө боюнча жардам алуу жана жооп пикир жөнөтүү"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Колдоо бөлүмүнөн жардам алуу үчүн каттоо эсебине кириңиз"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Кирүү"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Каттоо эсебиңизге кире албай жатасызбы?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Тутум маалыматын жөнөтүү"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Көйгөйүңүздү тез чечип берүү үчүн мүчүлүштүктөрдү аныктоо максатында бизге тутум маалыматы керек."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Экинчи көрсөтүлбөсүн"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Жумуш профилинин жөндөөлөрү"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Байланыштарды издөө"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Чалуучуларды жана байланыштарды аныктоо үчүн ишканаңыз байланыштарды издешине уруксат бериңиз"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> саат</item>
+      <item quantity="one">1 саат</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> мүнөт</item>
+      <item quantity="one">1 мүнөт</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> секунд</item>
+      <item quantity="one">1 секунд</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> күтө туруңуз"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Компьютер"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Гарнитура"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Телефон"</string>
@@ -3098,4 +3146,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Кулакчын"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Дайындарды киргизүүчү сырткы түзмөк"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Орун бошотуу үчүн сактагычты көзөмөлдөгүч камдык көчүрмөсү сакталган сүрөттөр менен видеолорду жок кылат."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Сүрөттөрдү жана видеолорду алып салуу"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Сактагычты көзөмөлдөгүч"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Автоматтык"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Нускама"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Жаңсоолор"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Камерага өтүү"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Камераны тез ачуу үчүн кубат баскычын эки жолу таптап коюңуз. Бардык экрандарда иштейт."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Камераларды ыкчам которуштуруу"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Маңдайкы жана арткы камераларды которуштуруу үчүн билегиңизди айландырып коюңуз."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Экранды ыкчам текшерүү"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Телефон колго алынаары менен анын экранында убакыт жана эскертмелер көрүнөт (телефондун кулпусун ачып убара болбойсуз)."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Эскертмелерди көрүү үчүн экранды серпип коюңуз"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Эскертмелериңизди каалаган экрандан текшерүү үчүн манжа изинин сенсорун төмөн серпиңиз."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Күйүк"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Өчүк"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Иш тутумун жүктөгүчтүн кулпусу мурунтан эле ачылган"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Адегенде Интернетке туташыңыз"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Байланыш оператору кулпулаган түзмөктөрдө жеткиликтүү эмес"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-lo-rLA/arrays.xml b/res/values-lo-rLA/arrays.xml
index efc827a..4c8d1ff 100644
--- a/res/values-lo-rLA/arrays.xml
+++ b/res/values-lo-rLA/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"ບົວ"</item>
     <item msgid="6131821495505931173">"ແດງ"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"ເກີນ 30 ມື້ແລ້ວ"</item>
+    <item msgid="2900554746706302178">"ເກີນ 60 ມື້ແລ້ວ"</item>
+    <item msgid="5692284879054004388">"ເກີນ 90 ມື້ແລ້ວ"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-lo-rLA/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-lo-rLA/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-lo-rLA/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 9bda639..10f0d3f 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"ເປີດການເຊື່ອມຕໍ່ຂໍ້ມູນ"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ປິດການເຊື່ອມຕໍ່ຂໍ້ມູນ"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"ນຳໃຊ້ VoLTE ແລ້ວ"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"ຈັດຫາການໂທດ້ວຍວິດີໂອແລ້ວ"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"ຈັດຫາການໂທດ້ວຍ Wi-Fi ແລ້ວ"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"ພະລັງງານວິທະຍຸມືຖື"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"ເບິ່ງສະໝຸດທີ່ຢູ່ໃນ SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ເບິ່ງໝາຍເລກຈຳກັດການໂທອອກ"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"ປົດລັອກດ້ວຍລາຍນີ້ວມື"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"ພຽງແຕະທີ່ເຊັນເຊີລາຍນິ້ວມືເພື່ອປົດລັອກໂທລະສັບຂອງທ່ານ, ອະນຸຍາດການສັ່ງຊື້ ຫຼື ເຂົ້າສູ່ລະບົບຫາແອັບຕ່າງໆ. ໃຫ້ລະມັດລະວັງໃນການເພີ່ມລາຍນິ້ວມືເນື່ອງຈາກລາຍນິ້ວມືທີ່ເພີ່ມເຂົ້າໃນລະບົບແລ້ວ ຈະສາມາດດຳເນີນການຕ່າງໆ ເຫຼົ່ານີ້ໄດ້.\n\nໝາຍເຫດ: ລາຍນິ້ວມືຂອງທ່ານອາດມີຄວາມປອດໄພໜ້ອຍກວ່າລະຫັດຮູບແບບ ຫຼື ລະຫັດ PIN. "<annotation id="url">"ສຶກສາເພີ່ມເຕີມ"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"ພຽງແຕ່ເຊັນເຊີລາຍນິ້ວມືເພື່ອປົດລັອກໂທລະສັບຂອງທ່ານ.\n\nໝາຍເຫດ: ລາຍນິ້ວມືອາດມີຄວາມປອດໄພໜ້ອຍກວ່າຮູບແບບປົດລັອກ ຫຼື ລະຫັດ PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"​ຍົກ​ເລີກ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"​ສືບ​ຕໍ່"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"ຂ້າມ"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"​ລຶບ"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"ຈົ່ງ​ເລີ່ມ​ຕົ້ນ!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ວາງ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ລົງ​ເທິງ​ເຊັນ​ເຊີ ແລະ ຍົກ​ຂຶ້ນ​ຫຼັງ​ຈາກ​ທ່ານ​ຮູ້​ສຶກ​ມີ​ການ​ສັ່ນ"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"ດີ​ຫຼາຍ! ດຽວ​ນີ້​ເຮັດ​ຊ້ຳ​ຄືນ​ອີກ"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"ເຮັດຕໍ່ໄປ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"ຍ້າຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ໄປ​ເລັກ​ນ້ອຍ ເພື່ອ​ເພີ່ມ​ທຸກ​ສ່ວນ​ທີ່​ແຕກ​ຕ່າງ​ຂອງ​ລາຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"ເພີ່ມ​ລາຍ​ນີ້ວ​ມື​ແລ້ວ!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ທຸກ​ຄັ້ງ​ທີ່​ທ່ານ​ເຫັນ​ໄອ​ຄອນ​ນີ້, ທ່ານ​ສາ​ມາດ​ໃຊ້​ລາຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ສຳ​ລັບ​ການ​ລະ​ບຸ ຫຼື​ເພື່ອ​ໃຫ້​ສິດ​ການ​ຊື້."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"ພຽງ​ແຕ່​ສຳ​ຜັດ​ເຊັນ​ເຊີ​ລາຍ​ນີ້ວ​ມື ເພື່ອ​ກະ​ຕຸ້ນ ແລະ ປົດ​ລັອກ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"ເມື່ອ​ທ່ານ​ເຫັນ​ໄອ​ຄອນ​ນີ້, ທ່ານ​ສາ​ມາດ​ໃຊ້​ລາຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ໄດ້."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"ເມື່ອທ່ານເຫັນໄອຄອນນີ້, ທ່ານສາມາດອະນຸຍາດການສັ່ງຊື້ ຫຼື ເຂົ້າສູ່ລະບົບຫາແອັບໄດ້ນຳ."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ຂ້າມ​ການ​ຕັ້ງ​ລາຍ​ນີ້ວ​ມື​ບໍ?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"ທ່ານ​ເລືອກ​ໃຊ້​ລາຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ເປັນ​ວິ​ທີ​ໜຶ່ງໃນການ​ປົດ​ລັອກ​ໂທ​ລ​ະ​ສັບ​ຂອງ​ທ່ານ. ຖ້າ​ທ່ານ​ຂ້າມ​​ດຽວ​ນີ້, ທ່ານ​ຈະ​ຕ້ອງ​ໄດ້​ຕັ້ງ​ອັນ​ນີ້​ພາຍ​ຫຼັງ. ການ​ຕັ້ງ​ໃຊ້​ເວ​ລາ​ພຽງ​ໜຶ່ງ​ນາ​ທີ ຫຼື ປະ​ມານນັ້ນ."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ຕັ້ງຄ່າການລັອກໜ້າຈໍ"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"ເມື່ອ​ການ​ໂທ Wi-Fi ເປີດ, ໂທ​ລະ​ສັບ​ຂອງ​ທ່ານ​ສາ​ມາດ​ໃຫ້​ທິດ​ທາງ​ການ​ໂທ​ຜ່ານ​ເຄືອ​ຂ່າຍ Wi-Fi ຫຼື​ເຄືອ​ຂ່າຍ​ຂອງ​ຜູ້​ໃຫ້​ບໍ​ລິ​ການ​ຂອງ​ທ່ານ, ຂຶ້ນ​ກັບ​ຄວາມ​ມັກ​ຂອງ​ທ່ານ ແລະ​ສັນ​ຍານ​ໃດ​ແຮງ​ກ່ວາ. ກ່ອນ​ເປີດ​ຄຸນ​ສ​ົມ​ບັດ​ນີ້, ກວດ​ເບິ່ງ​ກັບ​ຜູ້​ໃຫ້​ບໍ​ລິ​ການ​ເຄືອ​ຂ່າຍ​ຂອງ​ທ່ານ​ໃນ​ເລື່ອງ​ຄ່າ​ບໍ​ລິ​ການ ແລະ​ລາຍ​ລະ​ອຽດ​ອື່ນໆ."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"ອັບເດດທີ່ຢູ່ສຸກເສີນ"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"ທີ່ຢູ່ທີ່ໃຊ້ໂດຍບໍລິການສຸກເສີນເປັນສະຖານທີ່ຢູ່ຂອງທ່ານຫາກທ່ານໂທຫາ 911 ຜ່ານ WiFi"</string>
     <string name="home_settings" msgid="212375129455718176">"ໜ້າຫຼັກ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ການສະແດງຜົນ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ສຽງ"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"ລືມ"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"ຕິດ​ຕັ້ງ"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"ຄົ້ນຫາ"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"ເພີ່ມພື້ນທີ່ຈັດເກັບຂໍ້ມູນ"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"ຈັດ​ການ​ບ່ອນ​ຈັດ​ເກັບຂໍ້ມູນ"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"ການເຊື່ອມຕໍ່ USB ຜ່ານຄອມພິວເຕີ"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"ເຊື່ອມຕໍ່ເປັນ"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"ອຸປະກອນສື່ (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"ສຽງ"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"ຂໍ້ມູນທີ່ເກັບໄວ້"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"ອື່ນໆ"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"ລະບົບ"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"ສຳຫຼວດ <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"ສິ່ງອື່ນຮວມມີໄຟລ໌ທີ່ໃຊ້ຮ່ວມກັນທີ່ບັນທຶກໄວ້ໂດຍແອັບ, ໄຟລ໌ທີ່ດາວໂຫຼດຈາກອິນເຕີເນັດ ຫຼື Bluetooth, ໄຟລ໌ Android, ແລະ ອື່ນໆ. \n\nເພື່ອເບິ່ງເນື້ອຫາທັງໝົດຂອງ <xliff:g id="NAME">^1</xliff:g> ນີ້, ໃຫ້ແຕະ ສຳຫຼວດ."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"ລະບົບຮວມມີໄຟລ໌ທີ່ຖືກໃຊ້ພາຍໃນໂດຍລະບົບປະຕິບັດການ Android. \n\nໄຟລ໌ເຫຼົ່ານີ້ບໍ່ສາມາດເບິ່ງແຍກກັນໄດ້."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> ອາດຈະມີຮູບຖ່າຍ, ເພງ, ຮູບເງົາ,​ ແອັບ ຫຼືຂໍ້ມູນອື່ນທີ່ບັນທຶກໄວ້ທີ່ກຳລັງໃຊ້ເນື້ອທີ່ <xliff:g id="SIZE">^2</xliff:g> ຂອງບ່ອນເກັບຂໍ້ມູນ. \n\nເພື່ອເບິ່ງລາຍລະອຽດ, ໃຫ້ປ່ຽນເປັນ <xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"ຂໍ້ມູນທາງກົດໝາຍ"</string>
     <string name="contributors_title" msgid="5917703088825286504">"ຜູ່ມີສ່ວນຮ່ວມ"</string>
     <string name="manual" msgid="3025943393642974445">"ຄູ່​ມື"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"ຂໍ້ມູນກົດລະບຽບ"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"ສະຫລາກລະບຸການຄວບຄຸມ"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"ຂໍ້ມູນຄວາມປອດໄພ ແລະ ການຄວບຄຸມ"</string>
     <string name="copyright_title" msgid="865906688917260647">"ສະຫງວນລິຂະສິດ"</string>
     <string name="license_title" msgid="1990487604356037871">"ລິຂະສິດ"</string>
     <string name="terms_title" msgid="7697580845616764642">"ຂໍ້ກຳນົດ ແລະເງື່ອນໄຂ"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN ແບບເປີດຕະຫຼອດເວລາ"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"ບໍ່ໄດ້ເພີ່ມ VPN."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"ເປີດໃຊ້ຕະຫຼອດ ເປີດຢູ່"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"ແອັບນີ້ບໍ່ຮອງຮັບ"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"ເລືອກໂປຣໄຟລ໌ VPN ເພື່ອໃຫ້ເຊື່ອມຕໍ່ຕະຫຼອດເວລາ. ການຈະລາຈອນໃນເຄືອຂ່າຍ ຈະໄດ້ຮັບອະນຸຍາດສະເພາະເມື່ອເຊື່ອມຕໍ່ຜ່ານ VPN ນີ້ເທົ່ານັ້ນ."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"ບໍ່ມີ"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"VPN ທີ່ເປີດໃຊ້ຕະຫຼອດເວລາຕ້ອງມີທີ່ຢູ່ IP ສຳລັບທັງເຊີບເວີ ແລະ DNS."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"ເລື່ອນເພື່ອປົດລັອກ, ລະຫັດຜ່ານ, ຮູບແບບ, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"ສິ່ງທ້າທາຍດ້ານວຽກເຮັດ, ວຽກ, ໂປຣໄຟລ໌"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ, ໂປຣໄຟລ໌ທີ່ມີການຈັດການ, ຮວມ, ການຮວມ, ວຽກ, ໂປຣໄຟລ໌"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"ທ່າທາງ"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ຕັ້ງ​ຄ່າ​ແທັກ Wi-Fi NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"ຂຽນ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"​ແ​ຕະ​ທີ່​ແທັກ​ເພື່ອ​ຂຽນ..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"ຂໍ້ມູນພື້ນຫຼັງແມ່ນສາມາດໃຊ້ໄດ້ຜ່ານ Wi-Fi ເທົ່ານັ້ນ. ນີ້ອາດມີຜົນຕໍ່ກັບບາງແອັບຯ ຫຼືການບໍລິການໃນເວລາທີ່ບໍ່ມາມາດໃຊ້ Wi-Fi ໄດ້."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກປິດຢູ່"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"ແອັບ, ການຊິ້ງຂໍ້ມູນໃນພື້ນຫຼັງ ແລະຄຸນສົມບັດອື່ນທີ່ກ່ຽວຂ້ອງກັບໂປຣໄຟລ໌ຂອງທ່ານຖືກປິດໄວ້ແລ້ວ."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"ຄໍາ​ແນະ​ນໍາ (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"ຄຳແນະນຳ"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"ລຶບ​ອອກ"</string>
     <string name="color_temperature" msgid="2070126836910615605">"ອຸນຫະພູມສີເຢັນ"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ໃຊ້ສີຈໍສະແດງຜົນທີ່ເຢັນກວ່າ"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ຣີເຊັດຕົວນັບການຈຳກັດອັດຕາ ShortcutManager ບໍ?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"ຄວບຄຸມການແຈ້ງເຕືອນໃນໜ້າຈໍລັອກ"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"ສະແດງ ຫຼື ເຊື່ອງເນື້ອຫາການແຈ້ງເຕືອນ"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"ທັງໝົດ"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"ການຊ່ວຍເຫຼືອ"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"ຄວາມກວ້າງນ້ອຍທີ່ສຸດ"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ບໍ່ມີແອັບທີ່ຕິດຕັ້ງຮ້ອງຂໍການເຂົ້າເຖິງ SMS ແບບພຣີມຽມ"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"ການເຂົ້າເຖິງ SMS ແບບພຣີມຽມ"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"ປິດການນຳໃຊ້ແລ້ວ"</string>
     <string name="demo_mode" msgid="2655748420527206870">"ໂໝດເດໂມ"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"ພວກເຮົາຢູ່ນີ້ເພື່ອຊ່ວຍເຫຼືອ"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"ພວກເຮົາພ້ອມຊ່ວຍເຫຼືອທ່ານຕະຫຼອດ 24 ຊົ່ວໂມງ"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"ທີມງານຂອງພວກເຮົາຢູ່ນີ້ເພື່ອແກ້ໄຂທຸກບັນຫາ"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"ທີມງານຊ່ວຍເຫຼືອຂອງພວກເຮົາຈະຢູ່ບ່ອນນີ້ຕະຫຼອດເວລາທຸກໆມື້"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"ເວລາຊ່ວຍເຫຼືອທາງໂທລະສັບ (ເວລາທ້ອງຖິ່ນ)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"ຊອກຫາຄວາມຊ່ວຍເຫຼືອ ຫຼື ສຳຫຼວດເບິ່ງເຄັດລັບ ແລະ ເທັກນິກຕ່າງໆ"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"ຮອງຮັບ:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"ກຳລັງເດີນທາງໄປຕ່າງປະເທດບໍ?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"ອາດມີການຮຽກເກັບຄ່າບໍລິການແບບລະຫວ່າງປະເທດ"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"ໂທລະສັບ"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"ການສົນທະນາ"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"ສຳຫຼວດເຄັດລັບ ແລະ ເທັກນິກຕ່າງໆ"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"ຊອກຫາການຊ່ວຍເຫຼືອ ແລະ ສົ່ງຄຳຕິຊົມ"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"ເຂົ້າສູ່ລະບົບເພື່ອຂໍຄວາມຊ່ວຍເຫຼືອ"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"ເຂົ້າສູ່ລະບົບ"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"ບໍ່ສາມາດເຂົ້າເຖິງບັນຊີຂອງທ່ານບໍ?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"ສົ່ງຂໍ້ມູນລະບົບ"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"ເພື່ອຊ່ວຍແກ້ໄຂບັນຫາຂອງທ່ານໃຫ້ໄວຂຶ້ນ, ພວກເຮົາຕ້ອງການຂໍ້ມູນລະບົບເພື່ອການວິເຄາະ."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"ບໍ່ຕ້ອງສະແດງອີກ"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"ການຕັ້ງຄ່າໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"ຊອກຫາລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"ອະນຸຍາດໃຫ້ລາຍຊື່ຜູ້ຕິດຕໍ່ຊອກຫາໂດຍອົງກອນຂອງທ່ານໄດ້ເພື່ອຢືນຢັນຜູ້ໂທ ແລະ ລາຍຊື່ຜູ້ຕິດຕໍ່ຕ່າງໆ"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ຊົ່ວໂມງ</item>
+      <item quantity="one">1 ຊົ່ວໂມງ</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ນາທີ</item>
+      <item quantity="one">1 ນາທີ</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ວິນາທີ</item>
+      <item quantity="one">1 ວິນາທີ</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"ລໍຖ້າ ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"ຄອມພິວເຕີ"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"ຊຸດຫູຟັງ"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"ໂທລະສັບ"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"ຫູຟັງ"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"ອຸປະກອນພ່ວງອິນພຸດ"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"ເພື່ອຊ່ວຍເພີ່ມພື້ນທີ່ຫວ່າງສຳລັບການຈັດເກັບຂໍ້ມູນ, ຕົວຈັດການບ່ອນຈັດເກັບຂໍ້ມູນຈະລຶບຮູບພາບ ແລະ ວິດີໂອທີ່ສຳຮອງຂໍ້ມູນໄວ້ອອກຈາກອຸປະກອນຂອງທ່ານ."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ລຶບຮູບພາບ ແລະ ວິດີໂອ"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"ຕົວຈັດການບ່ອນຈັດເກັບຂໍ້ມູນ"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"ອັດຕະໂນມັດ"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"ຕັ້ງຄ່າເອງ"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"ທ່າທາງ"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"ໂດດໄປກ້ອງຖ່າຍຮູບ"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"ເພື່ອເປີດກ້ອງແບບດ່ວນ, ໃຫ້ກົດປຸ່ມເປີດ/ປິດສອງເທື່ອ ເຊິ່ງເຮັດໄດ້ຈາກທຸກໜ້າຈໍ."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ປີ້ນກ້ອງ"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"ເພື່ອສະລັບກ້ອງໜ້າ ແລະ ກ້ອງຫຼັງ, ໃຫ້ບິດສອງເທື່ອ."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"ກວດສອບໜ້າຈໍແບບດ່ວນ"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"ເພື່ອເບິ່ງໂທລະສັບຂອງທ່ານໂດຍບໍ່ຕ້ອງປຸກມັນໃຫ້ຕື່ນເຕັມຮູບແບບ, ໃຫ້ຍູ້ ຫຼື ຍົກມັນຂຶ້ນມາ."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"ປັດລົງເພື່ອເບິ່ງການແຈ້ງເຕືອນ"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"ເພື່ອເບິ່ງການແຈ້ງເຕືອນຂອງທ່ານຈາກໜ້າຈໍໃດກໍໄດ້, ໃຫ້ປັດນິ້ວລົງໃສ່ເຊັນເຊີລາຍນິ້ວມື."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"ເປີດ"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"ປິດ"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader ຖືກປົດລັອກຢູ່ກ່ອນແລ້ວ"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"ເຊື່ອມຕໍ່ຫາອິນເຕີເນັດກ່ອນ"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"ບໍ່ສາມາດໃຊ້ໄດ້ໃນອຸປະກອນທີ່ຜູ້ໃຫ້ບໍລິການລັອກໄວ້"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index cb0f520..1b4a01f 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Rožinė"</item>
     <item msgid="6131821495505931173">"Raudona"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Daugiau nei 30 dienų"</item>
+    <item msgid="2900554746706302178">"Daugiau nei 60 dienų"</item>
+    <item msgid="5692284879054004388">"Daugiau nei 90 dienų"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-lt/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-lt/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-lt/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 4fd6bbd..3f3cfd0 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -41,6 +41,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Įgalinti duomenų ryšį"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Išjungti duomenų ryšį"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"„VoLTE“ aprūpinimas"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Vaizdo skambutis aprūpinimas"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Skambinimo naudojant „Wi-Fi“ ryšį aprūpinimas"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Mobiliojo radijo maitinimas"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Žiūrėti SIM kortelės adresų knygą"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Žiūrėti fiksuoto rinkimo numerius"</string>
@@ -340,7 +342,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Atrakinimas piršto atspaudu"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Tiesiog palieskite kontrolinio kodo jutiklį, kad atrakintumėte telefoną, autorizuotumėte pirkinius ar prisijungtumėte prie savo programų. Naudojant visus pridėtus kontrolinius kodus bus galima atlikti šiuos veiksmus, todėl atidžiai rinkitės, kieno kontrolinius kodus pridedate.\n\nPastaba: kontrolinis kodas gali būti ne toks saugus kaip sudėtingas atrakinimo piešinys ar PIN kodas. "<annotation id="url">"Sužinokite daugiau"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Tiesiog palieskite kontrolinio kodo jutiklį, kad galėtumėte atrakinti telefoną, įgalioti pirkimo operacijas arba prisijungti prie programų. Naudojant visus pridėtus kontrolinius kodus bus galima atlikti šiuos veiksmus, todėl atidžiai rinkitės, kieno kontrolinius kodus pridedate.\n\nPastaba: kontrolinis kodas gali būti ne toks saugus kaip sudėtingas atrakinimo piešinys ar PIN kodas."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Atšaukti"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Tęsti"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Praleisti"</string>
@@ -361,12 +363,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Ištrinti"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Pradėkime!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Uždėkite pirštą ant jutiklio ir pakelkite, kai pajusite vibravimą"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Puiku! Dabar pakartokite"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Tęskite"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Truputį pajudinkite pirštą, kad būtų pridėtos visos skirtingos piršto atspaudo dalys"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Piršto atspaudas pridėtas!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kai rodoma ši piktograma, galite naudoti piršto atspaudą tapatybei nustatyti ar pirkimo operacijai autorizuoti."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Tiesiog palieskite kontrolinio kodo jutiklį, kad pažadintumėte ir atrakintumėte įrenginį."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Kai pamatysite šią piktogramą, galėsite naudoti kontrolinį kodą."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Kai pamatysite šią piktogramą, taip pat galėsite autorizuoti pirkimo operacijas arba prisijungti prie programų."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Praleisti pirštų atspaudų nustatymą?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Pasirinkote naudoti piršto atspaudą kaip vieną iš telefono atrakinimo būdų. Jei praleisite dabar, turėsite nustatyti funkciją vėliau. Nustatymas apytiksliai užtruks tik minutę."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Nustatyti ekrano užraktą"</string>
@@ -853,6 +855,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Atnaujinkite skubiems atvejams skirtą adresą"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Adresas, kurį kaip jūsų vietovę naudoja pagalbos tarnybos, jei numeriu 911 skambinate naudodami „Wi-Fi“"</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>
@@ -1075,6 +1079,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Pamiršti"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Nustatyti"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Naršyti"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Atlaisvinti vietos"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Tvarkyti saugyklą"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB kompiuterio jungtis"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Prisijungti kaip"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Medijos įrenginys (MTP)"</string>
@@ -1111,8 +1117,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Garso failai"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Talpykloje saugomi duomenys"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Kiti"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Naršyti <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Skiltyje „Kiti“ rodomi programų išsaugoti bendrinami failai, iš interneto arba naudojant „Bluetooth“ atsiųsti failai, „Android“ failai ir t. t.\n\nKad būtų rodomas visas šios saugyklos („<xliff:g id="NAME">^1</xliff:g>“) turinys, palieskite „Naršyti“."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Sistema įtraukia failus, kurie naudojami „Android“ operacinėje sistemoje. \n\nŠių failų negalima peržiūrėti atskirai."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> galėjo išsaugoti nuotraukų, muzikos, filmų, programų ir kitų duomenų, kurie užima <xliff:g id="SIZE">^2</xliff:g> saugyklos vietos. \n\nKad galėtumėte peržiūrėti išsamią informaciją, perjunkite į <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1303,7 +1311,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Teisinė informacija"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Pagalbininkai"</string>
     <string name="manual" msgid="3025943393642974445">"Neautomatiškai"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Reguliuojam. informacija"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Įstat. numatytos etiketės"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Saugos ir teisinė informacija"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autorių teisės"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencija"</string>
     <string name="terms_title" msgid="7697580845616764642">"Taisyklės ir nuostatos"</string>
@@ -2264,6 +2273,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Visada įjungtas VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Nepridėta jokių VPN."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Visada aktyvus"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Nepalaikoma šioje programoje"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Pasirinkite VPN profilį, kad visada būtumėte prisijungę. Tinklo srautas bus leidžiamas tik prisijungus prie šio VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Joks"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Norint, kad VPN būtų visada įjungtas, reikalingas serverio ir DNS IP adresas."</string>
@@ -2540,6 +2550,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"slysti ir atrakinti, slaptažodis, šablonas, PIN kodas"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"darbo iššūkis, darbas, profilis"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"darbo profilis, tvarkomas profilis, suvienodinti, suvienodinimas, darbas, profilis"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"gestas"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nustatyti „Wi-Fi“ ALR žymą"</string>
     <string name="write_tag" msgid="8571858602896222537">"Rašyti"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Palieskite žymą, kad galėtumėte rašyti..."</string>
@@ -3053,7 +3064,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Foniniai duomenys pasiekiami tik prisijungus prie „Wi-Fi“ ryšio. Tai gali paveikti kai kurias programas ar paslaugas, kai „Wi-Fi“ ryšys nepasiekiamas."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Darbo profilis išjungtas"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Programos, sinchronizavimas fone ir kitos su jūsų darbo profiliu susijusios funkcijos išjungtos."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Pasiūlymai (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Pasiūlymai"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"Dar <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Pašalinti"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Šaltų spalvų temperatūra"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Naudoti šaltesnes ekrano spalvas"</string>
@@ -3148,6 +3160,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Iš naujo nustatyti „ShortcutManager“ įkainius ribojančius skaitiklius?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Užrakinimo ekrano pranešimų valdymas"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Rodykite arba slėpkite pranešimo turinį"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Viskas"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Palaikymas"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Mažiausias plotis"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nėra jokių įdiegtų programų, pateikusių išskirtinių SMS prieigos užklausą"</string>
@@ -3155,9 +3169,49 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Išskirtinių SMS prieiga"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Išjungta"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Demonstracinis režimas"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Esame pasiruošę padėti"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Esame pasiruošę padėti 24 val. per parą, 7 dienas per savaitę"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Palaikymo komanda pasiruošusi išspręsti visas kilusias problemas"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Palaikymo komanda pasiekiama visą dieną, kasdien"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Palaikymo telefonu komandos darbo laikas (vietos laiku)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Ieškokite pagalbos ir naršykite patarimus bei gudrybes"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Palaikymas:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> – <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Keliaujate užsienyje?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Gali būti taikomi tarptautiniai mokesčiai"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefonas"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Pokalbis"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Naršyti patarimus ir gudrybes"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Ieškoti pagalbos ir siųsti atsiliepimą"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Prisijunkite, kad gautumėte pagalbos"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Prisijungti"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Negalite pasiekti paskyros?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Siųsti sistemos informaciją"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Kad galėtume padėti greitai išspręsti problemą, mums reikalinga sistemos informacija diagnozei atlikti."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Daugiau nerodyti"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Darbo profilio nustatymai"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaktų paieška"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Leiskite nustatyti skambintojus ir kontaktus atliekant organizacijos kontaktų paiešką"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> valanda</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> valandos</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> valandos</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> valandų</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minutė</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> minutės</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> minutės</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minučių</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> sekundė</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> sekundės</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> sekundės</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekundžių</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Palaukite ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Kompiuteris"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Ausinės"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telefonas"</string>
@@ -3165,4 +3219,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Ausinės"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Išorinis įvesties įrenginys"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Kad padėtų atlaisvinti saugyklos vietos, saugyklos tvarkytuvė iš įrenginio pašalina nuotraukas ir vaizdo įrašus, kurių atsarginė kopija sukurta."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Pašalinti nuotraukas ir vaizdo įrašus"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Saugyklos tvarkytuvė"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatiniai"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Neautomatiniai"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestai"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Fotoaparato įjungimas"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Jei norite greitai atidaryti fotoaparatą, tiesiog dukart palieskite maitinimo mygtuką. Veiksmą galima atlikti iš bet kurio ekrano."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Fotoaparato perjungimas"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Jei norite perjungti priekinį ir užpakalinį fotoaparatus, dukart pasukite."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Sparti ekrano patikra"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Jei norite patikrinti telefoną visiškai jo nepažadinę, švelniai jį palieskite arba pakelkite."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Perbraukimas norint patikrinti pranešimus"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Jei norite patikrinti pranešimus iš bet kurio ekrano, perbraukite žemyn virš kontrolinio kodo jutiklio."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Įjungta"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Išjungta"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Paleidyklė jau atrakinta"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Pirmiausia prisijungti prie interneto"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Nepasiekiamas įrenginiuose, kuriuose taik. operat. pasirink. ribojimas"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 8cd31b7..8174071 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Rozā"</item>
     <item msgid="6131821495505931173">"Sarkana"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Vecāki par 30 dienām"</item>
+    <item msgid="2900554746706302178">"Vecāki par 60 dienām"</item>
+    <item msgid="5692284879054004388">"Vecāki par 90 dienām"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-lv/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-lv/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-lv/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 987f145..4dbe082 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -40,6 +40,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Iespējot datu savienojumu"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Atspējot datu savienojumu"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE nodrošināts"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videozvani ir nodrošināti"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi zvani ir nodrošināti"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Mobilā tālruņa radio signāla stiprums"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Skatīt SIM adrešu grāmatu"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Fiksētās iezvanes numuru skatīšana"</string>
@@ -337,7 +339,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Atbloķēšana ar pirksta nospiedumu"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Pieskarieties pirksta nospieduma sensoram, lai atbloķētu tālruni, autorizētu pirkumus vai pierakstītos lietotnēs. Rūpīgi apsveriet, kuru personu pirkstu nospiedumus pievienojat. Jebkurš pievienotais pirksta nospiedums ļauj paveikt šīs darbības.\n\nPiezīme. Pirksta nospiedums var būt mazāk drošs nekā sarežģīta kombinācija vai PIN. "<annotation id="url">"Uzziniet vairāk"</annotation>"."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Pieskarieties pirksta nospieduma sensoram, lai atbloķētu tālruni, autorizētu pirkumus vai pierakstītos lietotnēs. Rūpīgi apsveriet, kuru personu pirkstu nospiedumus pievienojat. Jebkurš pievienotais pirksta nospiedums ļauj paveikt šīs darbības.\n\nPiezīme. Pirksta nospiedums var būt mazāk drošs nekā sarežģīta kombinācija vai PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Atcelt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Turpināt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Izlaist"</string>
@@ -358,12 +360,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Dzēst"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Sāciet!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Novietojiet pirkstu uz sensora un paceliet to pēc tam, kad sajūtat vibrāciju"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Lieliski, atkārtojiet!"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Turpināšana"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Nedaudz pakustiniet pirkstu, lai pievienotu dažādas pirksta nospieduma daļas."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Nospiedums pievienots!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kad tiek rādīta šī ikona, varat izmantot pirksta nospiedumu identifikācijai vai pirkuma autorizēšanai."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Pieskarieties pirkstu nospiedumu sensoram, lai aktivizētu un atbloķētu savu ierīci."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Kad redzat šo ikonu, varat izmantot pirkstu nospiedumu."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Ja redzat šo ikonu, varat atļaut pirkumus vai pierakstīties lietotnēs."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Izlaist pirksta nospieduma iestatīšanu?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Jūs izvēlējāties pirksta nospiedumu kā vienu no tālruņa atbloķēšanas iespējām. Ja izlaidīsiet šo darbību, iestatīšana būs jāveic vēlāk. Iestatīšanai nepieciešama aptuveni viena minūte."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Iestatīt ekrāna bloķēšanu"</string>
@@ -844,6 +846,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Atjaunināt adresi ārkārtas gadījumiem"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Adrese, ko izmantos ārkārtas palīdzības dienesti kā jūsu atrašanās vietu, ja zvanīsiet uz numuru 911, lietojot Wi-Fi"</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>
@@ -1065,6 +1069,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Noņemt"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Iestatīt"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Pārlūkot"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Atbrīvot vietu"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Pārvaldīt krātuvi"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB savienojums ar datoru"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Izveidot savienojumu kā"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Multivides ierīce (MTP)"</string>
@@ -1101,8 +1107,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Skaņa"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Kešatmiņā ievietotie dati"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Citi"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistēma"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Pārlūkot: <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Citi faili ir lietotnēs saglabāti kopīgoti faili, no interneta vai Bluetooth savienojumā lejupielādēti faili, Android faili un citi. \n\nLai skatītu visu saturu šajā ierīcē (<xliff:g id="NAME">^1</xliff:g>), pieskarieties vienumam Pārlūkot."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Sistēmā ir iekļauti faili, kas operētājsistēmā Android tiek iekšēji izmantoti. \n\nŠos failus nevar apskatīt atsevišķi."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Lietotājs <xliff:g id="USER_0">^1</xliff:g>, iespējams, ir saglabājis fotoattēlus, mūziku, filmas, lietotnes vai citus datus, kas aizņem <xliff:g id="SIZE">^2</xliff:g> lielu vietu atmiņā. \n\nLai skatītu detalizētu informāciju, pārslēdzieties uz lietotāju <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1293,7 +1301,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Juridiskā informācija"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Līdzdalībnieki"</string>
     <string name="manual" msgid="3025943393642974445">"Rokasgrāmata"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Regulējoša informācija"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Norādījumu uzlīmes"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Drošības un regulējošā informācija"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autortiesības"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Pakalpojumu sniegšanas noteikumi"</string>
@@ -2247,6 +2256,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Vienmēr ieslēgts VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Nav pievienots neviens VPN."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Režīms “Vienmēr ieslēgts” ir aktīvs"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Šajā lietotnē netiek atbalstīts"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Izvēlieties VPN profilu, ar kuru izveidot pastāvīgu savienojumu. Tīkla datplūsma tiks atļauta, tikai esot izveidotam savienojumam ar šo VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Nav"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Vienmēr ieslēgtam VPN ir nepieciešama servera un DNS IP adrese."</string>
@@ -2519,6 +2529,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"vilkt, lai atbloķētu, parole, kombinācija, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"drošības uzdevums darba profilā, darbs, profils"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"darba profils, pārvaldīts profils, apvienot, apvienošana, darbs, profils"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"žests"</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>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Pieskarieties atzīmei, lai rakstītu."</string>
@@ -3020,7 +3031,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Fona dati ir pieejami, izmantojot tikai Wi-Fi savienojumu. Tas var ietekmēt dažu lietotņu vai pakalpojumu darbību, kad Wi-Fī tīkls nav pieejams."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Darba profils ir izslēgts"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Lietotnes, sinhronizācija fonā un citas ar jūsu darba profilu saistītās funkcijas ir izslēgtas."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Ieteikumi (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Ieteikumi"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Noņemt"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Vēsu krāsu temperatūra"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Izmantot vēsākas krāsas"</string>
@@ -3114,6 +3126,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Vai atiestatīt ShortcutManager ātruma ierobežošanas skaitītājus?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Bloķēšanas ekrāna paziņojumu kontrole"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Rādīt vai slēpt paziņojumu saturu"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Visas"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Atbalsts"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Mazākais platums"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nevienā instalētajā lietotnē nav pieprasīta piekļuve maksas īsziņām."</string>
@@ -3121,9 +3135,46 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Piekļuve maksas īsziņām"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Atspējots"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Demonstrācijas režīms"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Esam gatavi jums palīdzēt"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Esam gatavi palīdzēt jebkurā diennakts laikā"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Atbalsta komanda palīdzēs izskatīt visas problēmas."</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Mūsu atbalsta komanda ir pieejama katru dienu, visu diennakti"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Atbalsta tālruņa darbalaiks (pēc vietējā laika)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Meklējiet palīdzību vai izpētiet padomus un ieteikumus"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Atbalsts:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> — <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Vai atrodaties ārzemēs?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Var tikt piemērota maksa par starptautisku zvanu"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Tālrunis"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Tērzēt"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Skatīt padomus un ieteikumus"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Meklēt palīdzību un sūtīt atsauksmes"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Pierakstieties, lai saņemtu palīdzību"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Pierakstīties"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Vai nevarat piekļūt savam kontam?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Sistēmas informācijas nosūtīšana"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Lai mēs varētu ātri atrisināt jūsu problēmu, mums ir nepieciešama sistēmas informācija problēmas diagnosticēšanai."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Vairs nerādīt"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Darba profila iestatījumi"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaktpersonu meklēšana"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Atļaut identificēt zvanītājus un kontaktpersonas, kad organizācijā tiek meklētas kontaktpersonas"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="zero"><xliff:g id="NUMBER">%s</xliff:g> stundu</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> stunda</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> stundas</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="zero"><xliff:g id="NUMBER">%s</xliff:g> minūšu</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minūte</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minūtes</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="zero"><xliff:g id="NUMBER">%s</xliff:g> sekunžu</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> sekunde</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekundes</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Gaidīšanas laiks: apm. <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Dators"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Austiņas ar mikrofonu"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Tālrunis"</string>
@@ -3131,4 +3182,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Austiņas"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Ievades ierīce"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Lai atbrīvotu vietu krātuvē, krātuves pārvaldnieks noņem no jūsu ierīces dublētos fotoattēlus un videoklipus."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Fotoattēlu un videoklipu noņemšana"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Krātuves pārvaldnieks"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automātiski"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuāli"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Žesti"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Pāriešana uz kameru"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Lai ātri atvērtu kameru, vienkārši veiciet dubultskārienu barošanas pogai. Tas darbojas jebkurā ekrānā."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Apvērst kameru"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Lai pārslēgtos no priekšējās kameras uz aizmugurējo kameru un otrādi, divreiz pagrieziet ierīci."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Ātra ekrāna skatīšana"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Lai pārbaudītu savu tālruni, neaktivizējot to pilnībā, pakustiniet vai paceliet to."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Vilkšana, lai skatītu paziņojumus"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Lai jebkurā ekrānā pārbaudītu paziņojumus, velciet uz leju pirksta nospieduma sensoru."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Ieslēgti"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Izslēgti"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Palaišanas ielādētājs jau ir atbloķēts"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Vispirms izveidojiet savienojumu ar internetu"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Nav pieejams mobilo sakaru operatoru bloķētās ierīcēs"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-mk-rMK/arrays.xml b/res/values-mk-rMK/arrays.xml
index fee79fd..e671268 100644
--- a/res/values-mk-rMK/arrays.xml
+++ b/res/values-mk-rMK/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Розова"</item>
     <item msgid="6131821495505931173">"Црвена"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Постари од 30 дена"</item>
+    <item msgid="2900554746706302178">"Постари од 60 дена"</item>
+    <item msgid="5692284879054004388">"Постари од 90 дена"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-mk-rMK/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-mk-rMK/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-mk-rMK/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 6903ae3..08e79aa 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Овозможи ја врската со податоците"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Оневозможи ја врската со податоците"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Обезбедување на VoLTE"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Овозможено е видеоповикување"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Овозможено е повикување преку Wi-Fi"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Мобилна радио моќ"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Прикажи SIM адресар"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Прикажи броеви на фиксно бирање"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Отклучи со отпечаток"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Само допрете го сензорот за отпечатоци за да го отклучите телефонот, да авторизирате купувања или да се најавите на апликациите. Бидете внимателни чии отпечатоци додавате. Дури и еден додаден отпечаток може да ги прави сите тие работи.\n\nЗабелешка: вашиот отпечаток можеби е помалку безбеден од силна шема или PIN. "<annotation id="url">"Дознајте повеќе"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Само допрете го сензорот за отпечаток за отклучување на телефонот, за одобрување купувања или за најавување на апликациите. Внимавајте чии отпечатоци додавате. Само еден додаден отпечаток може да ги прави сите тие работи.\n\nЗабелешка: вашиот отпечаток може да биде помалку безбеден од силна шема или PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Откажи"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Продолжи"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Прескокни"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Избриши"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Да почнеме!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Ставете го прстот на сензорот и подигнете го откако ќе почувствувате вибрации"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Одлично! Сега повторете"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Допрете повторно"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Мрдајте малку со прстот за да ги додадете сите различни делови од вашиот отпечаток"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Отпечатокот е додаден!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Секогаш кога ќе ја видите оваа икона, може да го користите вашиот отпечаток за идентификација или да авторизирате купување."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Само допрете го сензорот за отпечатоци за да го разбудите и отклучите уредот."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Кога ќе ја видите иконава, може да го користите отпечатокот."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Кога ќе ја видите иконата, исто така може да одобрувате купувања или да се најавувате на апликации."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Да се прескокне поставувањето отпечаток?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Избравте да го користите отпечатокот од прстот како еден од начините на отклучување на телефонот. Ако го прескокнете сега, ќе треба да го поставите подоцна. За поставувањето ќе ви треба околу една минута."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Поставете заклучување на екранот"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Кога е вклучено повикувањето преку Wi-Fi, телефонот може да насочува повици преку мрежи на Wi-Fi или мрежата на операторот, зависно од параметрите и кој сигнал е посилен. Пред да ја вклучите функцијата, проверете кај операторот за давачки и други детали."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"Ажурирајте ја адресата за итни случаи"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Адреса што ќе ја користат службите за итни случаи како ваша локација ако повикате 192 преку 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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Заборави"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Постави"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Истражувај"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Ослободи простор"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Управувајте со меморијата"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"УСБ врска со компјутер"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Поврзи како"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Медиумски уред (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Аудио"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Кеширани податоци"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Друго"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Систем"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Истражи <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Делот Друго опфаќа споделени датотеки што ги зачувале апликациите, датотеки преземени од интернет или Bluetooth, датотеки на Android итн. \n\nЗа да ја видите целокупната содржина на <xliff:g id="NAME">^1</xliff:g>, допрете Истражи."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Системот вклучува датотеки што интерно ги користи оперативниот систем Android. \n\nТие датотеки не може да се прегледуваат индивидуално."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> може да има зачувани фотографии, музика, филмови, апликации или други податоци што зафаќаат <xliff:g id="SIZE">^2</xliff:g> меморија. \n\nЗа детали, префрлете се на <xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Правни информации"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Соработници"</string>
     <string name="manual" msgid="3025943393642974445">"Упатство"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Регулаторни информации"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Регулаторни етикети"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Безбедност и регулаторни информации"</string>
     <string name="copyright_title" msgid="865906688917260647">"Авторски права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лиценца"</string>
     <string name="terms_title" msgid="7697580845616764642">"Правила и услови"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN секогаш вклучена"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Не се додадени ВПН-мрежи."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"„Секогаш вклучена“ е активна"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Не е поддржано од оваа апликација"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Избери VPN профил што секогаш ќе биде поврзан на мрежата, сообраќајот ќе биде дозволен само кога е поврзан со оваа VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Ниедна"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"VPN секогаш вклучена бара ИП адреса за серверот и за DNS."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"лизгајте за отклучување, лозинка, шема, пин"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"работен предизвик, работа, профил"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"работен профил, управуван профил, унифицирај, унифицирање, работа, профил"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"движење"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Поставете Wi-Fi ознака за NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"Пишувај"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Допрете ознака да пишувате…"</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Сообраќајот во заднина е достапен само преку Wi-Fi. Ова може да влијае на некои апликации или услуги кога Wi-Fi не е достапно."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Работниот профил е исклучен"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Апликациите, синхронизирањето во заднина и други карактеристики поврзани со вашиот работен профил се исклучени."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Предлози (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Предлози"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Отстрани"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Ладна боја за температура"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Користи поладни бои на екранот"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Ресетирајте ги бројачите за ограничување оцени на ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Контролирајте ги известувањата на заклучениот екран"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Прикажете или сокријте содржина на известување"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Сите"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Поддршка"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Најмала ширина"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ниедна од инсталираните апликации не побара пристап до премиум SMS"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Пристап до премиум SMS"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Оневозможено"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Демо режим"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Тука сме за да ви помогнеме"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Ние сме тука за вас 24/7"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Нашиот тим за поддршка е тука за да ви помогне да се справите со проблемите"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Нашиот тим за поддршка е достапен по цел ден, секој ден"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Работно време на телефонот за поддршка (локално време)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Пребарајте ја помошта или истражувајте ги советите и триковите"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Поддршка за:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Дали патувате во странство?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Може да се применат меѓународни трошоци"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Телефон"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Разговор"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Истражувајте ги советите и триковите"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Пребарајте помош и испратете повратни информации"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Најавете се за поддршка"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Најави се"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Не може да се пристапи до вашата сметка?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Испрати системски информации"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"За помош во брзото решавање на проблемот ни требаат системски информации за дијагнозата."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Не покажувај повторно"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Поставки на работен профил"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Пребарување контакти"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Дозволете при пребарувањата контакти на вашата организација да се препознаваат повикувачи и контакти"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> часа</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> часа</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> минути</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> минути</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> секунди</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> секунди</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> чекање"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Компјутер"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Слушалки"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Телефон"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Слушалка"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Периферен влез"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"За помош при ослободувањето простор за меморијата, управникот со меморијата ги отстранува резервните копии од фотографиите и видеата од уредот."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Отстранете фотографии и видеа"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Управник со меморија"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Автоматски"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Рачни"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Движења"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Скокнете на камерата"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"За брзо отворање на камерата, допрете го копчето за вклучување двапати. Работи од секој екран."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Превртете ја камерата"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"За префрлање помеѓу предната и задната камера, завртете двапати."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Брза проверка на екранот"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"За да го проверите телефонот без да го будите во целост, поттурнете го или подигнете го."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Повлечете за известувања"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"За да ги проверите известувањата од кој било екран, повлечете надолу на сензорот за отпечатоци."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Вклучено"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Исклучено"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Подигнувачот веќе е отклучен"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Прво поврзете се на интернет"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Недостапно на уредите заклучени од операторот"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-ml-rIN/arrays.xml b/res/values-ml-rIN/arrays.xml
index 282014b..119a991 100644
--- a/res/values-ml-rIN/arrays.xml
+++ b/res/values-ml-rIN/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"പിങ്ക്"</item>
     <item msgid="6131821495505931173">"ചുവപ്പ്"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"30 ദിവസത്തിലധികം പഴയത്"</item>
+    <item msgid="2900554746706302178">"60 ദിവസത്തിലധികം പഴയത്"</item>
+    <item msgid="5692284879054004388">"90 ദിവസത്തിലധികം പഴയത്"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-ml-rIN/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-ml-rIN/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-ml-rIN/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 7ff9242..b555a9b 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"ഡാറ്റാ കണക്ഷൻ പ്രവർത്തനക്ഷമമാക്കുക"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ഡാറ്റ കണക്ഷൻ പ്രവർത്തനരഹിതമാക്കുക"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE പ്രൊവിഷൻ"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"വീഡിയോ കോളിംഗ് ഏർപ്പെടുത്തി"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"വൈഫൈ കോളിംഗ് ഏർപ്പെടുത്തി"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"സെല്ലുലാർ റേഡിയോ പവർ"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"സിം വിലാസ പുസ്‌‌തകം കാണുക"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"സ്ഥിര ഡയലിംഗ് നമ്പറുകൾ കാണുക"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"വിരലടയാളം വഴി അൺലോക്കുചെയ്യുക"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"നിങ്ങളുടെ ഫോൺ അൺലോക്കുചെയ്യാനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകാനോ ആപ്സിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ വിരലടയാള സെൻസറിൽ സ്പർശിക്കുക. ആരുടെയൊക്കെ വിരലടയാളങ്ങൾ ചേർക്കുന്നു എന്ന കാര്യത്തിൽ നിങ്ങൾ ജാഗ്രത പുലർത്തുക. ചേർത്തിട്ടുള്ള ഒരു വിരലടയാളത്തിന് പോലും ഈ സംഗതികളൊക്കെ ചെയ്യാനാകും.\n\nശ്രദ്ധിക്കുക: നിങ്ങളുടെ വിരലടയാളത്തിന്റെ സുരക്ഷ, ശക്തമായ പാറ്റേണിനേക്കാളോ PIN-നേക്കാളോ കുറവായിരിക്കാം. "<annotation id="url">"കൂടുതലറിയുക"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"ഫോൺ അൺലോക്കുചെയ്യാനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകാനോ ആപ്സിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ വിരലടയാള സെൻസർ തൊട്ടാൽ മാത്രം മതി. ആരുടെയൊക്കെ വിരലടയാളങ്ങൾ ചേർക്കുന്നു എന്ന കാര്യത്തിൽ നിങ്ങൾ ജാഗ്രത പുലർത്തുക. ചേർത്തിട്ടുള്ള ഒരു വിരലടയാളത്തിന് പോലും ഈ സംഗതികളൊക്കെ ചെയ്യാനാകും.\n\nശ്രദ്ധിക്കുക: നിങ്ങളുടെ വിരലടയാളത്തിന്റെ സുരക്ഷ, ശക്തമായ പാറ്റേണിനേക്കാളോ PIN-നേക്കാളോ കുറവായിരിക്കാം."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"റദ്ദാക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"തുടരൂ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"ഒഴിവാക്കുക"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"ഇല്ലാതാക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"ആരംഭിക്കാം!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"സെൻസറിൽ വിരൽ വച്ച് ഒരു വൈബ്രേഷൻ അനുഭവപ്പെട്ട ശേഷം വിരൽ മാറ്റുക."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"കൊള്ളാം! ഇപ്പോൾ ആവർത്തിക്കുക"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"അങ്ങനെത്തന്നെ തുടരുക"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"നിങ്ങളുടെ വിരലടയാളത്തിന്റെ എല്ലാ വ്യത്യസ്ത ഭാഗങ്ങളും ചേർക്കുന്നതിന് വിരൽ പതുക്കെ നീക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"വിരലടയാളം ചേർത്തു!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"നിങ്ങൾ ഈ ഐക്കൺ കാണുമ്പോഴെല്ലാം, തിരിച്ചറിയാനോ ഒരു വാങ്ങലിന് അംഗീകാരം നൽകാനോ വിരലടയാളം ഉപയോഗിക്കാനാകും."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"നിങ്ങളുടെ ഉപകരണം ഉണർത്താനും അൺലോക്കുചെയ്യാനും വിരലടയാള സെൻസറിൽ തൊട്ടാൽ മതിയാകും."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"ഈ ഐക്കൺ കാണുമ്പോൾ, നിങ്ങൾക്ക് വിരലടയാളം ഉപയോഗിക്കാനാകും."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"ഈ ഐക്കൺ കാണുമ്പോൾ നിങ്ങൾക്ക്, വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകാനോ ആപ്‌സിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ കഴിയും."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"വിരലടയാളം സജ്ജമാക്കൽ ഒഴിവാക്കണോ?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"നിങ്ങളുടെ ഫോൺ അൺലോക്കുചെയ്യുന്നതിനുള്ള ഒരു മാർഗ്ഗമായി നിങ്ങൾ വിരലടലാളം ഉപയോഗിക്കുന്നതിന് തീരുമാനിച്ചിരിക്കുന്നു. നിങ്ങളിത് ഇപ്പോൾ ഒഴിവാക്കുന്നുവെങ്കിൽ, പിന്നീട് സജ്ജമാക്കേണ്ടി വരും. സജ്ജീകരിക്കലിന് ഒരൽപ്പസമയമേ എടുക്കുകയുള്ളൂ."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"സ്‌ക്രീൻ ലോക്ക് സജ്ജമാക്കുക"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"വൈഫൈ കോളിംഗ് ഓണായിരിക്കുമ്പോൾ, നിങ്ങളുടെ മുൻഗണനയും ഏത് സിഗ്നലാണ് ശക്തമെന്നതും അടിസ്ഥാനമാക്കി ഫോണിന് വൈഫൈ നെറ്റ്‌വർക്കോ കാരിയർ നെറ്റ്‌വർക്കോ വഴി കോളുകൾ റൂട്ട് ചെയ്യാനാകും. ഈ ഫീച്ചർ ഓണാക്കുന്നതിനുമുമ്പ്, നിരക്കുകളും മറ്റ് വിശദാംശങ്ങളും അറിയുന്നതിന് നിങ്ങളുടെ കാരിയറെ ബന്ധപ്പെടുക."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"അടിയന്തര വിലാസം അപ്ഡേറ്റുചെയ്യുക"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"വൈഫൈ ഉപയോഗിച്ച് നിങ്ങൾ 911-ലേക്ക് വിളിക്കുമ്പോൾ, ലൊക്കേഷൻ പോലുള്ള അടിയന്തര സേവനങ്ങൾ ഉപയോഗിക്കുന്ന വിലാസം"</string>
     <string name="home_settings" msgid="212375129455718176">"ഹോം"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ഡിസ്പ്ലേ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ശബ്‌ദം"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"മറക്കുക"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"സജ്ജമാക്കുക"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"അടുത്തറിയുക"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"ഇടം സൃഷ്ടിക്കുക"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"സ്റ്റോറേജ്  നിയന്ത്രിക്കുക"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB കമ്പ്യൂട്ടർ കണക്ഷൻ"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"ഇതായി കണ‌ക്റ്റുചെയ്യുക"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"മീഡിയ ഉപകരണം (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"ഓഡിയോ"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"കാഷെ ചെയ്‌ത ഡാറ്റ"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"മറ്റുള്ളവ"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"സിസ്‌റ്റം"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> അടുത്തറിയുക"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"മറ്റുള്ളവയിൽ, ആപ്‌സ് വഴി സംരക്ഷിച്ച പങ്കിട്ട ഫയലുകളും ഇന്റർനെറ്റിൽ നിന്നോ Bluetooth-ൽ നിന്നോ ഡൗൺലോഡ് ചെയ്തിട്ടുള്ള ഫയലുകളും Android ഫയലുകളും മറ്റും ഉൾപ്പെടുന്നു. \n\nഈ <xliff:g id="NAME">^1</xliff:g> എന്നതിന്റെ മുഴുവൻ ഉള്ളടക്കങ്ങളും കാണുന്നതിന്, അടുത്തറിയുക ടാപ്പുചെയ്യുക."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Android ഓപ്പറേറ്റിംഗ് സിസ്റ്റം ആന്തരികമായി ഉപയോഗിച്ച ഫയലുകൾ സിസ്റ്റത്തിൽ ഉൾപ്പെടുന്നു. \n\nഈ ഫയലുകൾ വെവ്വേറെയായി കാണാൻ കഴിയുകയില്ല."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"സംഭരണത്തിന്റെ <xliff:g id="SIZE">^2</xliff:g> വരെ ഇടം എടുക്കുന്ന ഫോട്ടോകൾ, സംഗീതം, സിനിമകൾ, ആപ്സ്, മറ്റ് ഡാറ്റ തുടങ്ങിയവ <xliff:g id="USER_0">^1</xliff:g> സംരക്ഷിച്ചിട്ടുണ്ടാകാം. \n\nവിശദാംശങ്ങൾ കാണുന്നതിന്, <xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"നിയമപരമായ വിവരം"</string>
     <string name="contributors_title" msgid="5917703088825286504">"സംഭാവകർ"</string>
     <string name="manual" msgid="3025943393642974445">"മാനുവൽ"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"റെഗുലേറ്ററി വിവരം"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"റെഗുലേറ്ററി ലേബലുകൾ"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"സുരക്ഷാ - റെഗുലേറ്ററി വിവരങ്ങൾ"</string>
     <string name="copyright_title" msgid="865906688917260647">"പകർപ്പവകാശം"</string>
     <string name="license_title" msgid="1990487604356037871">"ലൈസന്‍സ്"</string>
     <string name="terms_title" msgid="7697580845616764642">"നിബന്ധനകളും വ്യവസ്ഥകളും"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"എല്ലായ്‌പ്പോഴും ഓണായിരിക്കുന്ന VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"VPN-കളൊന്നും ചേർത്തിട്ടില്ല."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"\'എല്ലായ്പ്പോഴും ഓൺ\' സജീവം"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"ഈ ആപ്പ് പിന്തുണയ്ക്കുന്നില്ല"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"എല്ലായ്‌പ്പോഴും കണക്റ്റുചെയ്‌തതായി തുടരുന്ന ഒരു VPN പ്രൊഫൈൽ തിരഞ്ഞെടുക്കുക. ഈ VPN-ലേക്ക് കണക്റ്റുചെയ്‌തിരിക്കുമ്പോൾ മാത്രമേ നെറ്റ്‌വർക്ക് ട്രാഫിക്ക് അനുവദിക്കുകയുള്ളൂ."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"ഒന്നുമില്ല"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"എല്ലായ്പ്പോഴും ഓണായിരിക്കുന്ന VPN-ന് രണ്ട് സെർവറുകൾക്കും DNS-നുമായി ഒരു IP വിലാസം ആവശ്യമാണ്."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"അൺലോക്കുചെയ്യാൻ സ്ലൈഡുചെയ്യുക, പാസ്‌വേഡ്, പാറ്റേൺ, പിൻ"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"ഔദ്യോഗിക വെല്ലുവിളി, ഔദ്യോഗികം, പ്രൊഫൈൽ"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"ഔദ്യോഗിക പ്രൊഫൈൽ, മാനേജുചെയ്യപ്പെടുന്ന പ്രൊഫൈൽ, ഏകീകരിക്കുക, ഏകീകരിക്കൽ, ഔദ്യോഗികം, പ്രൊഫൈൽ"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"ജെസ്‌റ്റർ"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"വൈഫൈ NFC ടാഗ് സജ്ജമാക്കുക"</string>
     <string name="write_tag" msgid="8571858602896222537">"റൈറ്റുചെയ്യുക"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"റൈറ്റുചെയ്യാൻ ഒരു ടാഗ് ടാപ്പുചെയ്യുക..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"വൈഫൈ വഴി മാത്രം പശ്ചാത്തല ഡാറ്റ ലഭ്യമാണ്. വൈഫൈ ലഭ്യമല്ലാത്തപ്പോൾ ചില ആപ്സോ സേവനങ്ങളോ ഇതിനാൽ ബാധിക്കപ്പെട്ടേക്കാം."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"ഔദ്യോഗിക പ്രൊഫൈൽ ഓഫാണ്"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലുമായി ബന്ധപ്പെട്ട ആപ്‌സ്, പശ്ചാത്തല സമന്വയം, മറ്റ് ഫീച്ചറുകൾ എന്നിവ ഓഫാക്കിയിരിക്കുന്നു."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"നിർദ്ദേശങ്ങൾ (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"നിര്‍ദ്ദേശങ്ങള്‍"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"നീക്കംചെയ്യുക"</string>
     <string name="color_temperature" msgid="2070126836910615605">"തണുത്ത വർണ്ണ താപനില"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"കൂടുതൽ തണുത്ത ഡിസ്പ്ലേ വർണ്ണങ്ങൾ ഉപയോഗിക്കുക"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"കുറുക്കുവഴിമാനേജർ നിരക്ക്-പരിമിതപ്പെടുത്തൽ കൗണ്ടറുകൾ പുനഃക്രമീകരിക്കണോ?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"ലോക്ക് സ്ക്രീൻ അറിയിപ്പുകൾ നിയന്ത്രിക്കുക"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"അറിയിപ്പ് ഉള്ളടക്കം കാണിക്കുക അല്ലെങ്കിൽ മറയ്ക്കുക"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"എല്ലാം"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"പിന്തുണ"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"ഏറ്റവും ചെറിയ വീതി"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ഇൻസ്റ്റാൾ ചെയ്തിട്ടുള്ള ആപ്സൊന്നും പ്രീമിയം SMS ആക്‌സസ് അഭ്യർത്ഥിച്ചിട്ടില്ല"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"പ്രീമിയം SMS ആക്സസ്"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"പ്രവർത്തനരഹിതമാക്കി"</string>
     <string name="demo_mode" msgid="2655748420527206870">"ഡെമോ മോഡ്"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"സഹായിക്കാൻ ഞങ്ങൾ ഇവിടെയുണ്ട്"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"നിങ്ങൾക്ക് 24/7 സഹായം നൽകാൻ ഞങ്ങളുണ്ട്"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"ഏത് പ്രശ്നവും പരിഹരിക്കുന്നതിന് ഞങ്ങളുടെ പിന്തുണ ടീമിന്റെ സഹായം ലഭിക്കും"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"ദിവസം മുഴുവനും എല്ലാ സമയവും ഞങ്ങളുടെ പിന്തുണ ടീം സഹായത്തിനുണ്ട്"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"ഫോൺ പിന്തുണ സമയം (പ്രാദേശിക സമയം)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"സഹായം തിരയുക അല്ലെങ്കിൽ നുറുങ്ങുവിവരങ്ങളും പൊടിക്കൈകളും അടുത്തറിയുക"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"ഇതിനായുള്ള പിന്തുണ:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"വിദേശത്തേക്ക് യാത്ര ചെയ്യുകയാണോ?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"അന്താരാഷ്ട്ര നിരക്കുകൾ ബാധകമായേക്കാം"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"ഫോൺ"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"ചാറ്റുചെയ്യുക"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"നുറുങ്ങുവിവരങ്ങളും പൊടിക്കൈകളും അടുത്തറിയുക"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"സഹായം തിരയുക, ഫീഡ്‌ബാക്ക് അയയ്ക്കുക"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"പിന്തുണ ലഭിക്കാൻ സൈൻ ഇൻ ചെയ്യുക"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"സൈൻ ഇൻ ചെയ്യുക"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"നിങ്ങളുടെ അക്കൌണ്ട് ആക്‌സസ് ചെയ്യാൻ കഴിയുന്നില്ലേ?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"സിസ്റ്റം വിവരങ്ങൾ അയയ്ക്കുക"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"നിങ്ങളുടെ പ്രശ്നം വേഗത്തിൽ പരിഹരിക്കുന്നതിന്, പ്രശ്നനിർണ്ണയത്തിനായി ഞങ്ങൾക്ക് സിസ്റ്റം വിവരങ്ങൾ ആവശ്യമാണ്."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"വീണ്ടും കാണിക്കരുത്"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"ഔദ്യോഗിക പ്രൊഫൈൽ ക്രമീകരണം"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"കോൺടാക്റ്റ് തിരയൽ"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"വിളിക്കുന്നവരെയും കോൺടാക്റ്റുകളെയും തിരിച്ചറിയുന്നതിന് കോൺടാക്റ്റുകൾ തിരയാൻ നിങ്ങളുടെ സ്ഥാപനത്തെ അനുവദിക്കുക"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> മണിക്കൂർ</item>
+      <item quantity="one">ഒരു മണിക്കൂർ</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> മിനിറ്റ്</item>
+      <item quantity="one">ഒരു മിനിറ്റ്</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> സെക്കൻഡ്</item>
+      <item quantity="one">ഒരു സെക്കൻഡ്</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> കാക്കുക"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"കമ്പ്യൂട്ടർ"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"ഹെഡ്‌സെറ്റ്"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"ഫോൺ"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"ഹെഡ്ഫോൺ"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"ഇൻപുട്ട് പെരിഫറൽ"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"സ്റ്റോറേജ് ഇടം സൃഷ്ടിക്കുന്നതിന്, ബാക്കപ്പെടുത്ത ഫോട്ടോകളും വീഡിയോകളും നിങ്ങളുടെ ഉപകരണത്തിൽ നിന്ന് സ്റ്റോറേജ് മാനേജർ നീക്കംചെയ്യുന്നു."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ഫോട്ടോകളും വീഡിയോകളും നീക്കംചെയ്യുക"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"സ്റ്റോറേജ് മാനേജർ"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"സ്വയമേവ"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"മാനുവൽ"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"ജെസ്‌റ്ററുകൾ"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"ക്യാമറയിലേക്ക് മാറുക"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"ക്യാമറ വേഗത്തിൽ തുറക്കുന്നതിന്, പവർ ബട്ടണിൽ രണ്ടുതവണ ടാപ്പുചെയ്താൽ മാത്രം മതി. ഏത് സ്ക്രീനിലും പ്രവർത്തിക്കും."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ക്യാമറ ഫ്ലിപ്പുചെയ്യുക"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"മുൻ, പിൻ ക്യാമറകൾക്കിടയിൽ മാറാൻ രണ്ടുതവണ തിരിക്കുക."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"ദ്രുത സ്ക്രീൻ പരിശോധന"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"മുഴുവനായി ഉണർത്താതെ ഫോൺ പരിശോധിക്കുന്നതിന് അതിൽ മെല്ലെ തട്ടുകയോ കയ്യിലെടുക്കുകയോ ചെയ്യുക."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"അറിയിപ്പുകൾ കാണാൻ സ്വൈപ്പുചെയ്യുക"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"ഏത് സ്ക്രീനിൽ നിന്നും നിങ്ങളുടെ അറിയിപ്പുകൾ പരിശോധിക്കാൻ വിരലടയാള സെൻസറിൽ താഴേക്ക് സ്വൈപ്പുചെയ്യുക."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"ഓൺ"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"ഓഫ്"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"ബൂട്ട്‌ലോഡർ ഇതിനകം അൺലോക്കുചെയ്തിട്ടുണ്ട്"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"ആദ്യം ഇന്റർനെറ്റിലേക്ക് കണക്റ്റുചെയ്യുക"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"കാരിയർ ലോക്കുചെയ്തിട്ടുള്ള ഉപകരണങ്ങളിൽ ലഭ്യമല്ല"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-mn-rMN/arrays.xml b/res/values-mn-rMN/arrays.xml
index ef91977..d749193 100644
--- a/res/values-mn-rMN/arrays.xml
+++ b/res/values-mn-rMN/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Ягаан"</item>
     <item msgid="6131821495505931173">"Улаан"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"30 гаруй хоног хадгална"</item>
+    <item msgid="2900554746706302178">"60 гаруй хоног хадгална"</item>
+    <item msgid="5692284879054004388">"90 гаруй хоног хадгална"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-mn-rMN/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-mn-rMN/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-mn-rMN/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 29b704c..04f9345 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Дата холболтыг идэвхжүүлэх"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Дата холболтыг идэвхгүй болгох"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE хэлбэрт оруулсан"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Видео дуудлагыг бэлтгэсэн"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi дуудлагыг бэлтгэсэн"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Үүрэн радионы цахилгаан"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM хаягийн лавлахыг харах"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Тогтвортой залгах дугаарыг харах"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Хурууны хээгээр түгжээ тайлах"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Та утасныхаа түгжээг тайлах, худалдан авалт баталгаажуулах, апп-д нэвтрэхийн тулд хурууны хээ мэдрэгчид хүрэхэд хангалттай. Та хурууных нь хээг нэмэх хүнээ болгоомжтой сонгоно уу. Таны нэмсэн хурууны хээ эдгээр үйлдлийг хийх боломжтой.\n\nСанамж: Таны хурууны хээ ээдрээт зурган түгжээ, PIN-с хамгаалалт сул байна. "<annotation id="url">"Дэлгэрэнгүй үзэх"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Утасныхаа түгжээг тайлах, худалдан авалт хийх болон апп-д нэвтрэхдээ хурууны хээний мэдрэгчид хүрэхэд хангалттай. Та хурууных нь хээг нэмэх хүнээ болгоомжтой сонгоно уу. Таны нэмсэн ганц л хурууны хээгээр дээрх үйлдлийг хийх боломжтой.\n\nСанамж: Таны хурууны хээ нь хэцүү зурган түгжээ, эсвэл ПИН-с хамгаалалт муутай байдаг."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Цуцлах"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Үргэлжлүүлэх"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Алгасах"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Устгах"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Эхэлцгээе!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Мэдрэгч дээр хуруугаа тавиад, чичиргээ мэдрэгдэхэд аваарай"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Сайн байна! Үйлдлийг давтах."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Үргэлжлүүлээд байгаарай"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Хурууны хээгээ бүрэн гаргахын тулд хуруугаа удаанаар хөдөлгөнө үү."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Хурууны хээ нэмсэн!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Энэ тэмдэг гарч ирэхэд та өөрийн хурууны хээг оруулах, худалдан авалтыг зөвшөөрөх боломжтой болно."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Утсаа сэрээх, түгжээг тайлахдаа хурууны хээ мэдрэгчид хүрээрэй."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Энэ тэмдэг гарахад хурууны хээгээ оруулна."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Та энэ дүрс тэмдгийг харснаар худалдан авалт баталгаажуулах, эсвэл апп-д нэвтрэх боломжтой."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Хурууны хээн тохиргоог алгасах уу?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Та утасны түгжээг тайлах нэг хувилбараар хурууны хээн тохиргоог сонголоо. Хэрэв та одоо алгасвал энэ тохиргоог дараа хийх шаардлагатай болно. Тохиргоо хийхэд хэдхэн хором шаардлагатай."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Дэлгэцийн түгжээ тохируулах"</string>
@@ -825,6 +827,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi дуудлага асаалттай байгаа үед таны сонголт болон аль дохио илүү хүчтэй байгаагаас шалтгаалан Wi-Fi сүлжээ болон таны операторын сүлжээгээр дамжуулан таны утас дуудлагуудыг хянаж дамжуулна. Энэ горимыг асаахаасаа өмнө өөрийнхөө операторын төлбөр болон бусад дэлгэрэнгүй мэдээллүүдийг шалгаж үзээрэй."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"Онцгой байдлын хаягийг шинэчлэх"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"WiFi-р 911-н дуудлага хийх үед яаралтай тусламжийн үйлчилгээнийхнээс танд тусламж үзүүлэх байршлын хаяг"</string>
     <string name="home_settings" msgid="212375129455718176">"Нүүр"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дэлгэц"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Дуу"</string>
@@ -1045,6 +1049,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Мартах"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Тохируулах"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Судлах"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Зай гаргах"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Санг удирдах"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB компьютерийн холболт"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Холбогдох"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Медиа төхөөрөмж (MTP)"</string>
@@ -1081,8 +1087,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Аудио"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Нууцаар нөөцөлсөн өгөгдөл"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Бусад"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Систем"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g>-г судлах"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Бусад файлд апп-ын хадгалсан файл болон Интернэт, Bluetooth, Android-с татсан файл зэрэг багтдаг. \n\nЭнэ <xliff:g id="NAME">^1</xliff:g>-н бүх агуулгыг харахын тулд Судлах хэсгийг дарна уу."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Систем нь Андройд үйлдлийн системийн дотооддоо хэрэглэдэг файлыг агуулдаг. \n\nЭдгээр файлыг тус бүрээр нь харах боломжгүй."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> нь нийт багтаамжийн <xliff:g id="SIZE">^2</xliff:g>-г эзлэх хэмжээний зураг, дуу хөгжим, кино, апп болон бусад файлыг хадгалсан байж магадгүй. \n\nДэлгэрэнгүйг харахын тулд <xliff:g id="USER_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>
@@ -1273,7 +1281,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Хууль эрх зүйн мэдээлэл"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Хувь оруулагчид"</string>
     <string name="manual" msgid="3025943393642974445">"Гар ажиллагаатай"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Зохицуулалтын мэдээлэл"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Зохицуулалтын шошго"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Аюулгүй байдлын, зохицуулалтын мэдээлэл"</string>
     <string name="copyright_title" msgid="865906688917260647">"Зохиогчийн эрх"</string>
     <string name="license_title" msgid="1990487604356037871">"Лиценз"</string>
     <string name="terms_title" msgid="7697580845616764642">"Ерөнхий нөхцлүүд"</string>
@@ -2220,6 +2229,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Байнгын VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"VPN нэмээгүй."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Үргэлж асаалттай байлгах"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Энэ апп-с дэмжээгүй"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Байнга холболттой байхын тулд VPN профайл сонгоно уу. Сүлжээний трафик зөвхөн энэ VPN-д холбогдсон үед зөвшөөрөгдөх болно."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Байхгүй"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Байнга асаалттай байх VPN нь сервер болон DNS-т хоёуланд нь IP хаяг шаардана."</string>
@@ -2488,6 +2498,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"түгжээг тайлахын тулд гулсуулах, нууц үг,  загвар, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"ажлын сорилт, ажил, профайл"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"ажлын профайл, удирдсан профайл, нэгтгэх, нэгдэл, ажил, профайл"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"зангаа"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC Tагь тохируулах"</string>
     <string name="write_tag" msgid="8571858602896222537">"Бичих"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Бичихийн тулд тагь дээр дарах ..."</string>
@@ -2977,7 +2988,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Дэвсгэр дата зөвхөн Wi-Fi-р дамжуулсан тохиолдолд боломжтой. Ингэснээр Wi-Fi байхгүй үед зарим апп эсвэл үйлчилгээнд нөлөөлж болзошгүй."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Ажлын профайлыг унтраасан байна"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Таны ажлын профайлд холбогдох апп, дэвсгэрийн синк болон бусад тохиргоог унтраасан байна."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Санал болголт (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Санал зөвлөмж"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Арилгах"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Хүйтэн өнгөний температур"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Илүү хүйтэн дэлгэцийн өнгө ашиглах"</string>
@@ -3070,6 +3082,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager үнэлгээ хязгаарлалтын тоолуурыг дахин тохируулах уу?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Дэлгэцийн түгжээний мэдэгдлийг хянах"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Харуулах эсвэл нуух мэдэгдлийн агуулга"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Бүгд"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Дэмжлэг"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Хамгийн бага өргөн"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Суулгасан апп гуравдагч талын SMS хандалтыг шаардаагүй байна"</string>
@@ -3077,9 +3091,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Гуравдагч талын SMS хандалт"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Идэвхгүй болгосон"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Демо горим"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Бид туслахад бэлэн байна"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Бид танд 7 хоногийн 24 цагийн турш туслахад бэлэн"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Манай дэмжлэгийн баг аливаа асуудлыг шийдвэрлэхээр ажилладаг"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Манай дэмжлэгийн багийнхан танд туслахад хэзээд бэлэн байна"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Утасны дэмжлэгийн цаг (орон нутгийн цагаар)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Тусламж, эсвэл зөвлөмж, арга заль хайх"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Дэмжлэг:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Гадагшаа аялаж байна уу?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Олон улсын хураамж ногдож болзошгүй"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Утас"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Чат"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Зөвлөмж, арга заль хайх"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Тусламж хайх, санал хүсэлт илгээх"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Дэмжлэг авахын тулд нэвтэрнэ үү"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Нэвтрэх"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Бүртгэлдээ хандаж чадахгүй байна уу?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Системийн мэдээллийг илгээх"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Таны асуудлыг хурдан шийдвэрлэхийн тулд бид системийн мэдээллээр оношлогоо хийх шаардлагатай байна."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Дахин бүү үзүүл"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Ажлын профайлын тохиргоо"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Харилцагч хайх"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Дуудлага хийгч болон харилцагчийг тогтоохын тулд танай байгууллагыг харилцагчийн хайлт хийхийг зөвшөөрдөг"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> цаг</item>
+      <item quantity="one">1 цаг</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> минут</item>
+      <item quantity="one">1 минут</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> секунд</item>
+      <item quantity="one">1 секунд</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> хүлээнэ үү"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Компьютер"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Чихэвч"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Утас"</string>
@@ -3087,4 +3135,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Чихэвч"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Нэмэлт оролт"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Сангийн багтаамжийг нэмэгдүүлэхийн тулд сангийн менежер нөөцөлсөн зураг, видеог таны төхөөрөмжөөс устгах болно."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Зураг, видео устгах"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Сангийн менежер"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Автомат"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Гар ажиллагаатай"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Зангаа"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Камер руу очих"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Камерыг шуурхай нээхийн тулд асаах товчлуурыг хоёр удаа товшино уу. Дурын дэлгэцээс ажиллах болно."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Камер солих"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Урд, ард талын камерыг шилжүүлэхийн тулд бугуйгаа хоёр удаа эргүүлнэ үү."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Дэлгэцийг хурдан шалгах"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Утсаа бүрэн асаахгүйгээр шалгахын тулд үүнийг нудрах, эсвэл авна уу."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Мэдэгдлийг харахын тулд шударна уу"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Мэдэгдлийг хүссэн дэлгэцээс шалгахын тулд хурууны мэдрэгчийг доош шударна уу."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Идэвхтэй"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Идэвхгүй"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Үйлдлийн систем ачааллагчийн түгжээг аль хэдийн тайлсан"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Эхлээд интернэтэд холбогдоно уу"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Оператор компаниас түгжсэн төхөөрөмжид боломжгүй"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-mr-rIN/arrays.xml b/res/values-mr-rIN/arrays.xml
index c7f0bf9..a0c3a56 100644
--- a/res/values-mr-rIN/arrays.xml
+++ b/res/values-mr-rIN/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"गुलाबी"</item>
     <item msgid="6131821495505931173">"लाल"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"30 दिवसांपेक्षा अधिक जुने"</item>
+    <item msgid="2900554746706302178">"60 दिवसांपेक्षा अधिक जुने"</item>
+    <item msgid="5692284879054004388">"90 दिवसांपेक्षा अधिक जुने"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-mr-rIN/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-mr-rIN/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-mr-rIN/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 8ee76a1..6ac0501 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"डेटा कनेक्शन सक्षम करा"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"डेटा कनेक्शन अक्षम करा"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE तरतूद केली"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"व्हिडिओ कॉलिंगची तरतूद केली"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"वायफाय कॉलिंगची तरतूद केली"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"सेल्युलर रेडिओ पॉवर"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"सिम अॅड्रेस बुक पहा"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"निश्चित डायलिंग नंबर पहा"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"फिंगरप्रिंटने अनलॉक करा"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"आपला फोन अनलॉक करण्यासाठी, खरेदी अधिकृत किंवा अॅप्समध्ये साइन इन करण्यासाठी फक्त फिंगरप्रिंट सेन्सरला स्पर्श करा. आपण ज्यांचे फिंगरप्रिंट जोडता त्याविषयी सावधगिरी बाळगा. जोडलेला एक प्रिंट देखील यापैकी कोणतीही गोष्ट करू शकतो. \n\n टीप: आपले फिंगरप्रिंट सशक्त नमुना किंवा पिन पेक्षा कमी सुरक्षित असू शकते. "<annotation id="url">"अधिक जाणून घ्या"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"आपला फोन अनलॉक करण्यासाठी, खरेदी अधिकृत किंवा अॅप्समध्ये साइन इन करण्‍यासाठी फक्त फिंगरप्रिंट सेन्सरला स्पर्श करा. आपण ज्यांचे फिंगरप्रिंट जोडता त्याविषयी सावधगिरी बाळगा. जोडलेला एक प्रिंट देखील यापैकी कोणतीही गोष्ट करू शकतो. \n\n टीप: आपले फिंगरप्रिंट मजबूत नमुना किंवा पिन पेक्षा कमी सुरक्षित असू शकतात."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"रद्द करा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"सुरु ठेवा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"वगळा"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"हटवा"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"आपण प्रारंभ करूया!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"आपले बोट सेन्सरवर ठेवा आणि आपल्‍याला कंपन जाणवल्यावर ते उचला"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"छान! आता परत करा"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"सुरु ठेवावे"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"आपल्‍या फिंगरप्रिंटचे सर्व भिन्न प्रकार जोडण्‍यासाठी आपले बोट किंचित हलवा"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"फिंगरप्रिंट जोडले!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"जेव्हाही आपण हे चिन्ह पाहता, तेव्हा आपण ओळखीसाठी किंवा खरेदी अधिकृत करण्यासाठी आपले फिंगरप्रिंट वापरू शकता."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"आपले डिव्‍हाइस सक्रिय आणि अनलॉक करण्‍यासाठी फक्त फिंगरप्रिंट सेन्सरला स्पर्श करा."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"आपण हे चिन्ह पाहता तेव्‍हा, आपण आपले फिंगरप्रिंट वापरू शकता."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"आपण हे चिन्ह पाहता तेव्हा, आपण आपल्या खरेदी अधिकृत करू शकता किंवा अॅप्समध्ये साइन इन देखील करू शकता."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"फिंगरप्रिंट सेटअप वगळायचे?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"आपण आपला फोन अनलॉक करण्याची एक पद्धत म्हणून आपण आपले फिंगरप्रिंट वापरणे निवडले. आता आपण वगळल्यास, आपल्याला हे नंतर सेट करण्याची आवश्यकता असेल. सेटअपला केवळ एक मिनिट लागेल."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"स्क्रीन लॉक सेट करा"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"वाय-फाय कॉलिंग चालू असताना, आपला फोन आपल्या प्राधान्यावर आणि कोणता सिग्नल मजबूत आहे याच्या आधारावर, वाय-फाय नेटवर्क किंवा आपल्या वाहकाच्या नेटवर्कद्वारे कॉल मार्गस्थ करू शकतो. हे वैशिष्ट्य चालू करण्यापूर्वी, फी आणि इतर तपशीलांच्या संबंधात आपल्या वाहकास विचारा."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"आणीबाणी पत्ता अद्यतनित करा"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"वायफाय वापरून आपण 911 वर कॉल केल्यास आपले स्थान म्हणून आणीबाणी सेवांनी वापरलेला पत्ता"</string>
     <string name="home_settings" msgid="212375129455718176">"घर"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"प्रदर्शन"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ध्वनी"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"विसरा"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"सेट करा"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"एक्सप्लोर करा"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"जागा मोकळी करा"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"संचय व्यवस्थापित करा"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB संगणक कनेक्शन"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"म्हणून कनेक्ट करा"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"मीडिया डिव्हाइस (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"ऑडिओ"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"कॅश केलेला डेटा"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"इतर"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"सिस्टीम"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> एक्सप्लोर करा"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"अन्यमध्ये अॅप्सनी जतन केलेल्या सामायिक फायली, इंटरनेट किंवा ब्लूटुथ वरून डाउनलोड केलेल्या फायली, Android फायली आणि इत्यादीचा समावेश होतो. \n\n या <xliff:g id="NAME">^1</xliff:g> मधील संपूर्ण सामग्री पाहण्यासाठी एक्सप्लोर करा टॅप करा."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"सिस्टीममध्ये Android ऑपरेटिंग सिस्टीमने अंतर्गतरित्या वापरलेल्या फायली समाविष्‍ट असतात. \n\nया फायली वैयक्तिकरित्या पाहिल्या जाऊ शकत नाहीत."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="SIZE">^2</xliff:g> संचयन घेत असलेले फोटो, संगीत, चित्रपट, अ‍ॅप्स किंवा अन्य डेटा <xliff:g id="USER_0">^1</xliff:g> नी जतन केला असू शकतो. \n\nतपशील पाहण्‍यासाठी, <xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"कायदेशीर माहिती"</string>
     <string name="contributors_title" msgid="5917703088825286504">"योगदानकर्ते"</string>
     <string name="manual" msgid="3025943393642974445">"व्यक्तिचलित"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"नियामक माहिती"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"नियामक लेबले"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"सुरक्षा आणि नियामक माहिती"</string>
     <string name="copyright_title" msgid="865906688917260647">"कॉपीराइट"</string>
     <string name="license_title" msgid="1990487604356037871">"परवाना"</string>
     <string name="terms_title" msgid="7697580845616764642">"अटी आणि नियम"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"नेहमी चालू असलेले VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"कोणतेही VPN जोडले नाही."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"नेहमी-चालू सक्रिय"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"या अॅप द्वारे समर्थित नाही"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"नेहमी कनेक्ट केलेले राहण्यासाठी एक VPN प्रोफाईल निवडा. केवळ या VPN शी कनेक्ट केलेले असताना नेटवर्क रहदारीला अनुमती दिली जाईल."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"काहीही नाही"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"नेहमी चालू असलेल्या VPN ला सर्व्हर आणि DNS दोन्हीसाठी एका IP पत्त्याची आवश्यकता आहे."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"अनलॉक करण्यासाठी स्लाइड करा, संकेतशब्द, नमुना, पिन"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"कार्य आव्हान, कार्य, प्रोफाईल"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"कार्य प्रोफाईल, व्यवस्थापित केलेले प्रोफाईल, एकीकरण, एकीकरण करणे, कार्य, प्रोफाईल"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"जेश्चर"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"वाय-फाय NFC टॅग सेट अप"</string>
     <string name="write_tag" msgid="8571858602896222537">"लिहा"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"लिहिण्यासाठी एक टॅग टॅप करा..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"पार्श्वभूमी डेटा केवळ Wi-Fi द्वारे उपलब्ध आहे. Wi-Fi उपलब्ध नसते तेव्हा हे काही अॅप्स किंवा सेवांना प्रभावित करू शकते."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"कार्य प्रोफाइल बंद आहे"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"आपल्या कार्य प्रोफाइल संबंधित अॅप्स, पार्श्वभूमी संकालन आणि इतर वैशिष्ट्ये बंद केली आहेत."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"सूचना (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"सूचना"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"काढा"</string>
     <string name="color_temperature" msgid="2070126836910615605">"छान रंगाचे तापमान"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"आणखी छान प्रदर्शन रंग वापरा"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager दर-मर्यादित करणे काउंटर रीसेट करायचे?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"लॉक स्क्रीन सूचना नियंत्रित करा"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"सूचना सामग्री दर्शवा किंवा लपवा"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"सर्व"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"सहाय्य"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"सर्वात लहान रुंदी"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"स्थापित केलेल्या कोणत्याही अॅप्सनी प्रीमियम SMS प्रवेशाची विनंती केली नाही"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"प्रीमियम SMS प्रवेश"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"अक्षम केले"</string>
     <string name="demo_mode" msgid="2655748420527206870">"डेमो मोड"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"मदत करण्यासाठी आम्ही येथे आहोत"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"आम्ही आपल्यासाठी 24/7 येथे आहोत"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"कोणत्याही समस्येचे निराकरण करण्यात मदत करण्यासाठी आमचा सहाय्य कार्यसंघ येथे आहे"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"आमचा सहाय्य कार्यसंघ दररोज, दिवसभर येथे आहे"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"फोन समर्थन तास (स्थानिक वेळ)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"मदत शोधा किंवा टिपा आणि युक्त्या एक्सप्लोर करा"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"यासाठी समर्थन:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"परदेशी प्रवास करीत आहात?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"आंतरराष्ट्रीय शुल्क लागू होऊ शकतात"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"फोन"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"चॅट करा"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"टिपा आणि युक्त्या एक्सप्लोर करा"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"मदत शोधा आणि अभिप्राय पाठवा"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"सहाय्यासाठी साइन इन करा"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"साइन इन करा"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"आपल्या खात्यात प्रवेश करू शकत नाही?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"सिस्टीम माहिती पाठवा"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"आपल्या समस्येचे द्रुतपणे निराकरण करण्यासाठी, निदानाकरिता आम्हाला सिस्टीम माहितीची आवश्‍यकता असते."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"परत दर्शवू नका"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"कार्य प्रोफाइल सेटिंग्ज"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"संपर्क शोध"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"कॉलर आणि संपर्कांना ओळखण्यासाठी आपल्या संस्थेनुसार संपर्क शोधांची अनुमती द्या"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> तास</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> तास</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> मिनिट</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> मिनिटे</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> सेकंद</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> सेकंद</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> प्रतीक्षा"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"संगणक"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"हेडसेट"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"फोन"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"हेडफोन"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"इनपुट परिधीय"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"ब्लूटुथ"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"संचय स्थान मोकळे करण्यात मदत करण्यासाठी, संचय व्यवस्थापक आपल्या डिव्हाइस वरून बॅक अप घेतलेले फोटो आणि व्हिडिओ काढतो."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"फोटो आणि व्हिडिओ काढा"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"संचय व्यवस्थापक"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"स्वयंचलित"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"व्यक्तिचलित"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"जेश्चर"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"कॅमेर्‍यावर जा"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"द्रुतपणे कॅमेरा उघडण्यासाठी, फक्त पॉवर बटण दोनदा-टॅप करा. कोणत्याही स्क्रीनवरून कार्य करते."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"कॅमेरा फ्लिप करा"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"पुढील आणि मागील कॅमेर्‍यावर स्विच करण्यासाठी, दोनदा-फिरवा."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"द्रुत स्क्रीन तपासणी"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"आपल्या फोनला पूर्णपणे सक्रिय न करता तो तपासण्यासाठी, त्यास सौम्य स्पर्श करा किंवा तो उचला."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"सूचनांसाठी स्वाइप करा"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"कोणत्‍याही स्‍क्रीनवरून आपल्या सूचना पाहण्यासाठी, फिंगरप्रिंट सेन्सरवर खाली स्वाइप करा."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"चालू"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"बंद"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"बुटलोडर आधीपासून अनलॉक केले"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"प्रथम इंटरनेटशी कनेक्ट करा"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"वाहक-लॉक केलेल्या डिव्हाइसेसवर अनुपलब्ध"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-ms-rMY/arrays.xml b/res/values-ms-rMY/arrays.xml
index 3f6315b..13f1fc1 100644
--- a/res/values-ms-rMY/arrays.xml
+++ b/res/values-ms-rMY/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Merah jambu"</item>
     <item msgid="6131821495505931173">"Merah"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Lebih 30 hari"</item>
+    <item msgid="2900554746706302178">"Lebih 60 hari"</item>
+    <item msgid="5692284879054004388">"Lebih 90 hari"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-ms-rMY/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-ms-rMY/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-ms-rMY/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 2604c46..7c6ca47 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Dayakan Sambungan Data"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Lumpuhkan Sambungan Data"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE Diperuntukkan"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Panggilan Video Diperuntukkan"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Panggilan Wi-Fi Diperuntukkan"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Kuasa Radio Selular"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Lihat Buku Alamat SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Lihat Nombor Dailan Tetap"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Buka kunci dengan cap jari"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Hanya sentuh penderia cap jari untuk membuka kunci telefon anda, membenarkan pembelian atau log masuk ke apl. Berhati-hati tentang cap jari yang anda tambahkan. Satu cap jari yang ditambahkan dapat melakukan mana-mana perkara ini.\n\nPerhatian: Cap jari anda mungkin kurang selamat berbanding corak atau PIN yang kukuh. "<annotation id="url">"Ketahui lebih lanjut"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Hanya sentuh penderia cap jari untuk membuka kunci telefon anda, membenarkan pembelian atau mengelog masuk ke apl. Berhati-hati tentang cap jari yang anda tambahkan. Satu cap jari yang ditambahkan dapat melakukan mana-mana perkara ini.\n\nPerhatian: Cap jari anda mungkin kurang selamat berbading corak atau PIN yang kukuh."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Batal"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Teruskan"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Langkau"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Padam"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Mari mulakan!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Letakkan jari anda pada penderia, kemudian angkat jari itu selepas anda merasa getaran"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Bagus! Sekarang, ulang"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Teruskan"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Gerakkan jari anda sedikit untuk menambahkan bahagian lain cap jari anda"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Cap jari ditambahkan!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Apabila anda melihat ikon ini, anda boleh menggunakan cap jari untuk pengenalan atau membenarkan pembelian."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Sentuh sahaja penderia cap jari untuk membangunkan dan membuka kunci peranti anda."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Anda boleh menggunakan cap jari setiap kali ikon ini kelihatan."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Apabila anda melihat ikon ini, anda boleh mengizinkan pembelian atau mengelog masuk ke apl."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Langkau persediaan cap jari?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Anda telah memilih untuk menggunakan cap jari sebagai satu cara untuk membuka kunci telefon anda. Jika anda melangkaui sekarang, anda perlu menyediakannya kemudian. Persediaan hanya mengambil sedikit masa."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Sediakan kunci skrin"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Kemas Kini Alamat Kecemasan"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Alamat yang digunakan oleh perkhidmatan kecemasan sebagai lokasi anda jika anda membuat panggilan 911 menggunakan Wi-Fi"</string>
     <string name="home_settings" msgid="212375129455718176">"Skrin Utama"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Paparan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Bunyi"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Lupakan"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Sediakan"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Teroka"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Kosongkan ruang"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Urus storan"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Sambungan komputer USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Sambung sebagai"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Peranti media (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Data cache"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Lain-lain"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Teroka <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Lain-lain termasuk fail kongsi yang disimpan oleh apl, fail yang dimuat turun daripada Internet atau Bluetooth, fail Android dan seterusnya. \n\nUntuk melihat keseluruhan kandungan <xliff:g id="NAME">^1</xliff:g> ini, ketik Teroka."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Sistem termasuk fail yang digunakan secara dalaman oleh sistem pengendalian Android. \n\nFail ini tidak boleh dilihat satu persatu."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> mungkin telah menyimpan foto, muzik, filem, apl atau data lain yang menggunakan ruang storan sebesar <xliff:g id="SIZE">^2</xliff:g>. \n\nUntuk melihat butirannya, beralih kepada <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Maklumat undang-undang"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Penyumbang"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Maklumat kawal selia"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Label kawal selia"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Maklumat keselamatan &amp; kawal selia"</string>
     <string name="copyright_title" msgid="865906688917260647">"Hak cipta"</string>
     <string name="license_title" msgid="1990487604356037871">"Lesen"</string>
     <string name="terms_title" msgid="7697580845616764642">"Terma dan Syarat"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN sentiasa dihidupkan"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Tiada VPN ditambahkan."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Sentiasa hidup aktif"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Tidak disokong oleh apl ini"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Pilih profil VPN untuk sentiasa kekal tersambung. Trafik rangkaian hanya akan dibenarkan apabila bersambung ke VPN ini."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Tiada"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"VPN yang sentiasa dihidupkan memerlukan alamat IP untuk kedua-dua pelayan dan DNS."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"luncur untuk membuka kunci, kata laluan, corak, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"cabaran kerja, kerja, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"profil kerja, profil terurus, menyatukan, penyatuan, kerja, profil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"gerak isyarat"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Sediakan Teg NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Tulis"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Ketik teg untuk menulis..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Data latar belakang hanya tersedia melalui Wi-Fi. Perkara ini mungkin menjejaskan beberapa apl atau perkhidmatan apabila Wi-Fi tidak tersedia."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Profil kerja dimatikan"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Apl, penyegerakan latar belakang dan ciri lain yang berkaitan dengan profil kerja anda dimatikan."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Cadangan (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Cadangan"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Alih keluar"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Suhu warna sejuk"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gunakan warna paparan yang lebih sejuk"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Tetapkan semula pembilang had kadar ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kawal pemberitahuan skrin kunci"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Tunjukkan atau sembunyikan kandungan pemberitahuan"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Semua"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Sokongan"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Lebar terkecil"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Tiada apl terpasang yang telah meminta akses SMS Premium"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Akses SMS Premium"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Dilumpuhkan"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Mod tunjuk cara"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Kami bersedia membantu anda"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Kami sedia membantu anda 24 jam sehari, 7 hari seminggu"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Pasukan sokongan kami bersedia untuk membantu anda dalam mengendalikan sebarang masalah"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Pasukan sokongan kami boleh dihubungi sepanjang hari, setiap hari"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Waktu operasi sokongan telefon (masa tempatan)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Cari bantuan atau teroka petua &amp; kiat"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Sokongan untuk:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Adakah anda akan ke luar negara?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Caj antarabangsa boleh dikenakan"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Sembang"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Teroka petua &amp; kiat"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Cari bantuan &amp; hantar maklum balas"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Log masuk untuk mendapatkan sokongan"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Log masuk"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Tidak dapat mengakses akaun anda?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Hantar maklumat sistem"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Untuk membantu menangani masalah anda dengan cepat, kami memerlukan maklumat sistem untuk membuat diagnosis."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Jangan tunjukkan lagi"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Tetapan profil kerja"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Carian kenalan"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Benarkan carian kenalan oleh organisasi anda untuk mengenal pasti pemanggil dan kenalan"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> jam</item>
+      <item quantity="one">1 jam</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minit</item>
+      <item quantity="one">1 minit</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> saat</item>
+      <item quantity="one">1 saat</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> masa tunggu"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Komputer"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Set Kepala"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telefon"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Fon kepala"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Persisian Input"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Untuk membantu mengosongkan ruang storan, pengurus storan akan mengalih keluar foto dan video sandaran daripada peranti anda."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Alih keluar foto &amp; video"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Pengurus storan"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatik"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Gerak isyarat"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Langkau ke Kamera"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Untuk membuka kamera dengan pantas, hanya ketik dua kali pada butang kuasa. Berfungsi daripada mana-mana skrin."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Balikkan kamera"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Pusing dua kali untuk beralih antara kamera depan dengan belakang."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Semakan skrin pantas"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Untuk menyemak telefon anda tanpa membangunkan telefon sepenuhnya, sigung atau angkat telefon itu."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Leret untuk mendapatkan pemberitahuan"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Untuk menyemak pemberitahuan anda daripada sebarang skrin, leret ke bawah pada penderia cap jari."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Hidup"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Mati"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Pemuat but sudah dibuka"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Sambung ke Internet dahulu"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Tidak tersedia pada peranti yang dikunci pembawa"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-my-rMM/arrays.xml b/res/values-my-rMM/arrays.xml
index c96f224..8fdfa59 100644
--- a/res/values-my-rMM/arrays.xml
+++ b/res/values-my-rMM/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"ပန်းရောင်"</item>
     <item msgid="6131821495505931173">"အနီ"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"ရက်ပေါင်း ၃၀ ထက်ကျော်နေပါပြီ"</item>
+    <item msgid="2900554746706302178">"ရက်ပေါင်း ၆၀ ထက်ကျော်နေပါပြီ"</item>
+    <item msgid="5692284879054004388">"ရက်ပေါင်း ၉၀ ထက်ကျော်နေပါပြီ"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-my-rMM/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-my-rMM/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-my-rMM/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index a0fa910..9483762 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"ဒေတာချိတ်ဆက်မှုကို ဖွင့်ပါ"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ဒေတာချိတ်ဆက်မှုကို ပိတ်ပါ"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE ထောက်ပံ့ထားသည်"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"ဗီဒီယိုခေါ်ဆိုမှု ပံ့ပိုးထားပါသည်"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi ဖြင့် ခေါ်ဆိုမှု ပံ့ပိုးထားပါသည်"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"ဆဲလ်လူလာ ရေဒီယိုပါဝါ"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM ထဲရှိ လိပ်စာ စာအုပ်ကိုကြည့်ပါ"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ခေါ်ဆိုသည့်အခြေစိုက်နံပါတ်အားကြည့်မည်"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"လက်ဗွေရာသုံး၍ ဖွင့်ပါ"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"သင့်ဖုန်းကိုလော့ခ်ဖွင့်ရန်၊ ဝယ်ယူမှုများကို အတည်ပြုရန်၊ သို့မဟုတ် အက်ပ်မျာသို့ လက်မှတ်ထိုးဝင်ရောက်ရန် လက်ဗွေဖတ်ကိရိယာကိုသာ ထိလိုက်ပါ။ သင်သည် မည်သူ၏လက်ဗွေများအား ထည့်သွင်းမည်ဖြစ်ကြောင်းကို သတိပြုပါ။ တစ်ခုထည့်လိုက်သည်နှင့် ထိုအရာများအားလုံးကို လုပ်ဆောင်နိုင်မည်ဖြစ်သည်။\n\nမှတ်ချက်− သင့်လက်ဗွေသည် ခိုင်မာသည့်ပုံစံ သို့မဟုတ် ပင်နံပါတ် တစ်ခုထက် လုံခြုံမှု ပိုနည်းနိုင်သည်။ "<annotation id="url">"ပိုမိုလေ့လာရန်"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"သင့်ဖုန်းကို လော့ခ်ဖွင့်ရန်၊ ဝယ်ယူမှုများကို အတည်ပြုရန် သို့မဟုတ် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ရန် လက်ဗွေအာရုံခံစနစ်ကိုသာ ထိလိုက်ပါ။ သင်သည် မည်သူ၏လက်ဗွေများအား ထည့်သွင်းမည်ကို သတိပြုပါ။ \n\nမှတ်ချက် − သင့်လက်ဗွေသည် ခိုင်မာသည့် ပုံစံ သို့မဟုတ် ပင်နံပါတ် တစ်ခုထက် လုံခြုံမှု ပိုအားနည်းနိုင်ပါသည်။"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"မလုပ်တော့"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ဆက်လုပ်ရန်"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"ကျော်ပါ"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"ဖျက်ရန်"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"စတင်ကြစို့။"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"သင့်လက်ချောင်းကို အာရုံခံကိရိယာ ပေါ်သို့ တင်ပေးလိုက်ကာ တုန်ခါမှုကို ခံစားရချိန်တွင် မ’ယူလိုက်ပါ"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"ကောင်းပါသည်။ အခု ထပ်လုပ်ပါ။"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"ဆက်လုပ်ပါ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"သင့်လက်ဗွေရဲ့  အပိုင်း အမျိုးမျိုးကို ထည့်ပေးရန် သင့်လက်ချောင်းကို မသိမသာ ရွေ့လျားပေးပါ"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"လက်ဗွေကို ထည့်ပြီးပါပြီ။"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ဤသင်္ကေတကို တွေ့လျှင် သင်သည် လက်ဗွေကို သက်သေခံအထောက်အထားအဖြစ် အသုံးပြုနိုင်သည် သို့မဟုတ် ဝယ်ယူခြင်းကို ခွင့်ပြုနိုင်ပါသည်။"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"သင်၏ ကိရိယာကို နှိုးပေးရန် နှင့် သော့ဖွင့်ရန် လက်ဗွေ အာရုံခံ ကိရိယာကို ထိလိုက်ရုံပါပဲ။"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"သင်သည် ဤအိုင်ကွန်ကို မြင်သောလျှင်၊ သင်သည် သင်၏ လက်ဗွေကို သုံးနိုင်သည်။"</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"ဤသင်္ကေတကိုတွေ့လျှင် ဝယ်ယူမှုများကို သင်က ခွင့်ပြုပေးနိုင်သည် သို့မဟုတ် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်နိုင်သည်။"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"လက်ဗွေရာ သတ်မှတ်မှုကို ကျော်မလား"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"သင့်လက်ဗွေဖြင့် သင့်ဖုန်းကို သော့ဖွင့်ရန် နည်းလမ်းတစ်ခုအဖြစ် ရွေးချယ်ခဲ့သည်။ အကယ်၍ယခုကျော်သွားလျှင်၊ ၎င်းကိုနောက်နှောင်တွင် သတ်မှတ်ရပါလိမ့်မည်။ သတ်မှတ်ခြင်းသည် မိနစ်အနည်းငယ်သာ ကြာပါသည်။"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ဖုန်းဖန်သားပြင် သော့စနစ် သတ်မှတ်ပါ"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"၁"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"သင့်ရွေးချယ်မှု သိုမ့ဟုတ်  စစ်ဂနယ် အားရှိမှုပေါ် မူတည်လျှက်၊ ဝိုင်ဖိုင်ခေါ်ဆိုမှု ဖွင့်ထားပါက၊ သင့်ဖုန်းသည် ဝိုင်ဖိုင်ကွန်ယက်များ သို့မဟုတ် သင့် မိုဘိုင်းဝန်ဆောင်မှုဌာန၏ ကွန်ယက်မှတဆင့် ခေါ်ဆိုမှုများအား ပေးပို့နိုင်သည်။ ဤလုပ်ဆောင်နိုင်ချက်အား မဖွင့်မီ၊ ကျသင့်ငွေနှင့် အခြားအသေးစိတ်များအတွက် သင့် မိုဘိုင်းဝန်ဆောင်မှုဌာနအား မေးမြန်းပါ။"</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"အရေးပေါ်လိပ်စာကို အပ်ဒိတ်လုပ်ပါ"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"WiFi ကို အသုံးပြု၍ ၉၁၁ သို့ ဖုန်းခေါ်ဆိုသည့်အခါ သင့်တည်နေရာအဖြစ် အရေးပေါ်ဝန်ဆောင်မှုများမှ အသုံးပြုသည့် လိပ်စာ"</string>
     <string name="home_settings" msgid="212375129455718176">"ပင်မ​စာ​မျက်နှာ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ဖန်သားပြင်"</string>
     <string name="sound_settings" msgid="5534671337768745343">"အသံ"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"မေ့ပစ်ရန်"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"စဖွင့်သတ်မှတ်"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"စူးစမ်းရန်"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"နေရာလွတ် ပြုလုပ်ပါ"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"သိုလှောင်ခန်းကို စီမံခန့်ခွဲပါ"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB ကွန်ပြုတာချိတ်ဆက်မှု"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"အနေဖြင့်ဆက်သွယ်ရန်"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"မီဒီယာစက်ပစ္စည်း (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"အသံ"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"မှတ်သိမ်းထားသော ဒေတာ"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"အခြား"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"စနစ်"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> အား လေ့လာပါ"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"အခြားပါဝင်မှုများမှာ အက်ပ်များမှ သိမ်းဆည်းလိုက်သည့် ဖိုင်များ၊ အင်တာနက် သို့မဟုတ် ဘလူးတုသ်မှ ဒေါင်းလုဒ်လုပ်ထားသည့် မျှဝေထားသောဖိုင်များ၊ Android ဖိုင်များ၊ စသည်တို့ဖြစ်သည်။ \n\n<xliff:g id="NAME">^1</xliff:g>၏ အကြောင်းအရာများ တစ်ခုလုံးကိုကြည့်ရန်၊ လေ့လာပါ ကိုတို့ပါ။"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"စနစ်တွင် Android လည်ပတ်မှုစနစ်အတွင်း အသုံးပြုသည့် ဖိုင်များ ပါဝင်ပါသည်။ \n\nဤဖိုင်များကို တစ်ခုချင်းစီဖွင့်ကြည့်၍ မရပါ။"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> သည် ဓာတ်ပုံများ၊ ဂီတ၊ ရုပ်ရှင်များ၊ အက်ပ်များနှင့် အခြားဒေတာများအား သိုလှောင်မှု၏ <xliff:g id="SIZE">^2</xliff:g>  အထိ နေရာယူနိုင်သည်။ \n\n အသေးစိတ်အား ကြည့်ရန်၊ သို့ ပြောင်းပါ။ <xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"ဥပဒေဆိုင်ရာအချက်အလက်များ"</string>
     <string name="contributors_title" msgid="5917703088825286504">"ထောက်ပံ့သူများ"</string>
     <string name="manual" msgid="3025943393642974445">"ကိုယ်တိုင်ထည့်သွင်းခြင်း"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"စံစည်းမျဉ်း လိုက်နာမှု"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"စည်းမျဉ်း အညွှန်းများ"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"လုံခြုံရေးနှင့် စည်းမျဉ်းအချက်အလက်များ"</string>
     <string name="copyright_title" msgid="865906688917260647">"မူပိုင်ခွင့်"</string>
     <string name="license_title" msgid="1990487604356037871">"လိုင်စင်"</string>
     <string name="terms_title" msgid="7697580845616764642">"သတ်မှတ်ချက်များနှင့် အခြေအနေများ"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN အမြဲတမ်းဖွင့်ထားရန်"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"မည်သည့် VPN မျှမထည့်ရသေးပါ။"</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"အမြဲတမ်းဖွင့်ခြင်းဆက်တင် ဖွင့်ထားသည်"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"ဤအက်ပ်က ပံ့ပိုးမထားပါ"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"VPN ကိုယ်ရေးအချက်အလက်ကို အမြဲတမ်းချိတ်ဆက်ထားလျက် ရှိနေရန် ရွေးပါ။ ၎င်းသည် VPN ကို ချိတ်ဆက်ထားသောအခါမှသာ ကွန်ရက်အသွားအလာကို ခွင့်ပြုလိမ့်မည်။"</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"တစ်ခုမှမဟုတ်ပါ"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"အမြဲပွင့်နေသော VPN အတွက် ဆာဗာနှင့်DNS.နှစ်ခုလုံးအတွက် IP လိပ်စာတစ်ခုလိုအပ်သည်။"</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"သော့ဖွင့်ရန်ပွတ်ဆွဲပါ၊ စကားဝှက်၊ ပုံစံ၊ ပင်နံပါတ်"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"အလုပ်၏ စိန်ခေါ်မှု၊ အလုပ်၊ ပရိုဖိုင်"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"အလုပ်ပရိုဖိုင်၊ စီမံခန့်ခွဲထားသည့် ပရိုဖိုင်၊ စည်းလုံးစေခြင်း၊ စည်းလုံးအောင်ပြုလုပ်ခြင်း၊ အလုပ်၊ ပရိုဖိုင်"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"လှုပ်ရှားမှုဟန်"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ကြိုးမဲ့ NFC တဲဂ်ကို စဖွင့်သတ်မှတ်ရန်"</string>
     <string name="write_tag" msgid="8571858602896222537">"ရေးရန်"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ရေးရန် တဲဂ် တစ်ခုကို ပုပ်ပါ..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"နောက်ချက်ဒေတာသည် ဝိုင်ဖိုင်မှတစ်ဆင့်သာ ရနိုင်သည်။ ၎င်းသည် ဝိုင်ဖိုင်မရချိန်တွင် အက်ပ်များသို့မဟုတ် ဝန်ဆောင်မှုများကို ထိခိုက်စေပါသည်။"</string>
     <string name="condition_work_title" msgid="7293722361184366648">"အလုပ်ပရိုဖိုင်ပိတ်ထားသည်"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"သင့်အလုပ်ပရိုဖိုင်နှင့် သက်ဆိုင်သည့် အက်ပ်များ၊ နောက်ခံစင့်ခ်လုပ်ခြင်း၊ နှင့်အခြား အင်္ဂါရပ်များကို ပိတ်ထားပါသည်။"</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"အကြံပြုချက်များ (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"အကြံပြုချက်များ"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"ဖယ်ရှားပါ"</string>
     <string name="color_temperature" msgid="2070126836910615605">"အေးသည့် အရောင်အပူချိန်"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ပိုအေးသည့် မျက်နှာပြင် အရောင်များကိုအသုံးပြုရန်"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager နှုန်းကန့်သတ်ခြင်း ရေတွက်စနစ်ကို ပြန်လည်သတ်မှတ်မလား။"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"လော့ခ်မျက်နှာပြင် အကြောင်းကြားချက်များကို ထိန်းချုပ်ပါ"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"အကြောင်းကြားချက်ပါ အကြောင်းအရာများကို ပြပါ သို့မဟုတ် ဝှက်ပါ"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"အားလုံး"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"ပံ့ပိုးမှု"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"အသေးဆုံး အကျယ်"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ထည့်သွင်းထားသည့် မည်သည့်အက်ပ်တစ်ခုမျှ ပရီမီယံ SMS အသုံးပြုခွင့်တောင်းဆိုမှု မရှိပါ။"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"ပရီမီယံ SMS အသုံးပြုခွင့်"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"ပိတ်ထားသည်"</string>
     <string name="demo_mode" msgid="2655748420527206870">"သရုပ်ပြမုဒ်"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"ကျွန်ုပ်တို့ကူညီဖို့ အသင့်ရှိနေပါသည်"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"သင့်အတွက် ကျွန်ုပ်တို့သည် တစ်နေ့ ၂၄ နာရီနှင့် ၇ ရက်တပတ်လုံး အသင့်ရှိနေပါသည်။"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"ကျွန်ုပ်တို့၏ ဝန်ဆောင်မှုပေးရေးအဖွဲ့သည် ပြဿနာအရပ်ရပ်ကို ဖြေရှင်းပေးရန် အသင့်ရှိပါသည်။"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"ကျွန်ုပ်တို့၏ ဝန်ဆောင်မှုပေးရေးအဖွဲ့သည် နေ့တိုင်းဤနေရာတွင် တစ်နေကုန်အသင့်ရှိနေပါသည်"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"ဖုန်းဖြင့် ဝန်ဆောင်မှုပေးသည့် အချိန် (ဒေသတွင်းအချိန်)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"အကူအညီကိုရှာဖွေပါ သို့မဟုတ် နည်းလမ်းများကို ရှာဖွေပါ"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"အောက်ပါနိုင်ငံများတွင် ပံ့ပိုးပေးသည် −"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"ခရီးသွားနေပါသလား။"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"အပြည်ပြည်ဆိုင်ရာ ငွေကျသင့်မှုများ ရှိနိုင်သည်"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"ဖုန်း"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"ချတ်လုပ်ရန်"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"နည်းစနစ်များနှင့် အကြံဉာဏ်များကို လေ့လာရန်"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"အကူအညီရှာရန် နှင့် အကြံပြုချက်ပေးပို့ရန်"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"အကူအညီရယူရန် လက်မှတ်ထိုးဝင်ပါ"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"လက်မှတ်ထိုး ဝင်ပါ"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"သင့်အကောင့်ကို ဝင်ရန် အခက်အခဲရှိပါသလား။"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"စနစ်အချက်အလက်များကို ပို့ပါ"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"သင့်ပြဿနာကို လျင်မြန်စွာ ဖြေရှင်းပေးနိုင်ရန် စစ်ဆေးမှုများပြုလုပ်ရန်အတွက် အချက်အလက်များ လိုအပ်ပါသည်။"</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"နောက်တစ်ခါ မပြပါနှင့်"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"အလုပ်ပရိုဖိုင်ဆက်တင်များ"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"အဆက်အသွယ်ကို ရှာဖွေပါ"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"ခေါ်ဆိုသူများနှင့် အဆက်အသွယ်များကို မည်သူမည်ဝါဖြစ်ကြောင်း ခွဲခြားနိုင်ရန်အတွက် သင့်အဖွဲ့အစည်းအမည်ကို အဆက်အသွယ်အား ရှာဖွေခွင့်ပြုပါ"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> နာရီ</item>
+      <item quantity="one">၁ နာရီ</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> မိနစ်</item>
+      <item quantity="one">၁ မိနစ်</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> စက္ကန့်</item>
+      <item quantity="one">၁ စက္ကန့်</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"စောင့်ဆိုင်းရမည့်အချိန် ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"ကွန်ပျူတာ"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"မိုက်ခွက်ပါနားကြပ်"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"ဖုန်း"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"နားကြပ်"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"ချိတ်ဆက်အသုံးပြုရသည့် စက်ပစ္စည်းများ"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"ဘလူးတုသ်"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"သိုလှောင်ခန်း နေရာလွတ်များ ရှိလာစေရန် သိုလှောင်ခန်းမန်နေဂျာသည် သင့်စက်ပစ္စည်းပေါ်ရှိ မိတ္တူကူးယူထားသည့် ဓာတ်ပုံနှင့် ဗီဒီယိုများကို ဖယ်ရှားလိုက်ပါမည်။"</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ဓာတ်ပုံနှင့် ဗီဒီယိုများကို ဖယ်ရှားပါ"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"သိုလှောင်ခန်းမန်နေဂျာ"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"အလိုအလျောက်"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"ကိုယ်တိုင်ထည့်သွင်းခြင်း"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"အမူအရာ"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"ကင်မရာသို့ သွားရန်"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"ကင်မရာကို လျင်မြန်စွာဖွင့်နိုင်ရန် ပါဝါခလုတ်ကိုနှစ်ချက်တို့ပါ။ မည်သည့်မျက်နှာပြင်တွင်မဆို အသုံးပြုနိုင်ပါသည်။"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ကင်မရာပြောင်းရန်"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"အရှေ့နှင့် အနောက်ကင်မရာကို ပြောင်းရန် နှစ်ချက်လှည့်ပါ။"</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"မျက်နှာပြင်ကို အမြန်စစ်ဆေးခြင်း"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"သင့်ဖုန်းကို အပြည့်အဝမဖွင့်ဘဲ စစ်ဆေးရန် တို့ပါ သို့မဟုတ် ကောက်ယူလိုက်ပါ။"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"အကြောင်းကြားချက်များကိုဖွင့်ရန် ပွတ်ဆွဲပါ"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"အကြောင်းကြားချက်များကို မည်သည့်မျက်နှာပြင်မှမဆို စစ်ဆေးနိုင်ရန် လက်ဗွေအာရုံခံစနစ်ပေါ်တွင် အောက်သို့ပွတ်ဆွဲလိုက်ပါ။"</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"ဖွင့်ထားသည်"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"ပိတ်ထားသည်"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"စဖွင့်သည့်စနစ်ကို လော့ခ်ဖွင့်ပြီးပါပြီ"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"အင်တာနက်သို့ ဦးစွာချိတ်ဆက်ပါ"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"ဝန်ဆောင်မှုပေးသူလော့ခ်ချထားသည့် စက်ပစ္စည်းများတွင်မရနိုင်ပါ"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 4ec2665..879bab4 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Rosa"</item>
     <item msgid="6131821495505931173">"Rød"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Over 30 dager gammelt"</item>
+    <item msgid="2900554746706302178">"Over 60 dager gammelt"</item>
+    <item msgid="5692284879054004388">"Over 90 dager gammelt"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-nb/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-nb/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-nb/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index f815eb5..dc9cf57 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Slå på datatilkobling"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Slå av datatilkobling"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE-tildelt"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Identitetshåndtering aktiv for videoanrop"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Identitetshåndtering aktiv for Wi-Fi-anrop"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Strømforsyning for mobilradio"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Se adressebok for SIM-kort"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Vis faste numre"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Lås opp med fingeravtrykk"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Du trenger bare å trykke på fingeravtrykkssensoren for å låse opp telefonen, godkjenne kjøp eller logge på apper. Tenk godt over hvilke fingeravtrykk du legger til – alle som får tilgang, kan nemlig utføre disse handlingene.\n\nMerk: Fingeravtrykket ditt er kanskje ikke like sikkert som et sterkt mønster eller en sterk PIN-kode. "<annotation id="url">"Finn ut mer"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Du trenger bare å trykke på fingeravtrykkssensoren for å låse opp telefonen, autorisere kjøp eller logge på apper. Tenk godt over hvilke fingeravtrykk du legger til – alle som får tilgang, kan nemlig utføre disse handlingene.\n\nMerk: Fingeravtrykket ditt kan være mindre sikkert enn et sterkt mønster eller en sterk PIN-kode."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Avbryt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Fortsett"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Hopp over"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Slett"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"La oss sette i gang!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Plassér fingeren på sensoren, og løft den når du kjenner en vibrasjon"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Flott! En gang til"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Fortsett"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Flytt fingeren litt for å registrere de ulike delene av fingeravtrykket ditt"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Fingeravtrykk lagt til!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Når du ser dette ikonet, kan du bruke fingeravtrykket ditt som identifikasjon eller til å godkjenne kjøp."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Bare trykk på fingeravtrykksensoren for å vekke og låse opp enheten din."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Når du ser dette ikonet, kan du bruke fingeravtrykket ditt."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Når du ser dette ikonet, kan du også autorisere kjøp eller logge på apper."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Vil du hoppe over fingeravtrykk-konfig.?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Du har valgt å bruke fingeravtrykket ditt som én måte å låse opp telefonen din på. Hvis du hopper over konfigureringen nå, må du fullføre den senere. Konfigureringen tar bare et par minutter."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Konfigurer skjermlås"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Oppdater nødadressen"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Adressen nødetatene bruker som posisjonen din når du ringer et nødnummer via Wi-Fi"</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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Glem"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Konfigurer"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Utforsk"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Frigjør lagringsplass"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Administrer lagring"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-tilkoblingen til datamaskinen"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Koble til som"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Medieenhet (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Lyd"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Bufrede data"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Annet"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Utforsk <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Andre filer inkluderer delte filer som er lagret av apper, filer lastet ned fra Internett eller via Bluetooth, Android-filer og så videre. \n\nFor å se en fullstendig oversikt over innholdet på <xliff:g id="NAME">^1</xliff:g>, trykk på Utforsk."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Systemet inkluderer filer som brukes internt av Android-operativsystemet. \n\nDisse filene kan ikke sees hver for seg."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> kan ha lagret bilder, musikk, filmer, apper eller andre data som tar opp <xliff:g id="SIZE">^2</xliff:g> av lagringsplassen. \n\nHvis du vil se detaljer, bytt til <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Juridisk informasjon"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Medvirkende"</string>
     <string name="manual" msgid="3025943393642974445">"Brukerveiledning"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Standarder/bestemmelser"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Forskriftsmessig merking"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Sikkerhetsinformasjon og forskrifter"</string>
     <string name="copyright_title" msgid="865906688917260647">"Opphavsrett"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisens"</string>
     <string name="terms_title" msgid="7697580845616764642">"Betingelser"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Alltid på-VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Ingen VPN er lagt til."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Alltid på er aktiv"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Støttes ikke av denne appen"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Velg en VPN-profil du vil forbli tilkoblet til. Nettverkstrafikk blir bare tillatt når du er tilkoblet denne VPN-en."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Ingen"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Alltid på-VPN krever en IP-adresse for både tjener og DNS."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"skyv for å låse opp, passord, mønster, PIN-kode"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"jobbutfordring, jobb, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"jobbprofil, administrert profil, forene, forening, jobb, profil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"bevegelse"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Konfigurer NFC-tag for Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Trykk på en brikke for å skrive"</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Bakgrunnsdata er bare tilgjengelig via Wi-Fi. Dette kan påvirke noen apper og tjenester når Wi-Fi ikke er tilgjengelig."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Jobbprofilen er av"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Apper, synkronisering i bakgrunnen og andre funksjoner som er knyttet til jobbprofilen din, er slått av."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Forslag (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Forslag"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Fjern"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Kald fargetemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Bruk kaldere skjermfarger"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Vil du tilbakestille tellerne av frekvensbegrensning for ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrollér låseskjermvarsler"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Vis eller skjul varselinnhold"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Alle"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Brukerstøtte"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Minst bredde"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ingen installerte apper har bedt om tilgang til premium-SMS."</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Tilgang til premium-SMS"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Slått av"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Demomodus"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Vi er her for å hjelpe deg"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Vi er her for å hjelpe deg døgnet rundt, sju dager i uken"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Brukerstøtteteamet vårt er her for å hjelpe til med å løse eventuelle problemer"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Brukerstøtteteamet vårt er tilgjengelig hele dagen – hver eneste dag"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Brukerstøttens åpningstid (lokal tid)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Søk etter hjelp eller utforsk tips og triks"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Støtte for:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> – <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Reiser du i utlandet?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Utenlandstakster kan påløpe"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Utforsk tips og triks"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Søk i hjelp og send tilbakemelding"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Logg på for å få hjelp"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Logg på"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Får du ikke tilgang til kontoen din?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Send systeminformasjon"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"For å løse problemet ditt raskt trenger vi systeminformasjon for å finne ut hva det er."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Ikke vis dette igjen"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Innstillinger for jobbprofilen"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaktsøk"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Tillat kontaktsøk for organisasjonen din for å identifisere innringere og kontakter"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> timer</item>
+      <item quantity="one">1 time</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutter</item>
+      <item quantity="one">1 minutt</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekunder</item>
+      <item quantity="one">1 sekund</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Ventetid: ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Datamaskin"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Hodetelefoner"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telefon"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Øretelefoner"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Inndata fra ytre utstyrsenheter"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"For å frigjøre lagringsplass fjernes sikkerhetskopierte bilder og videoer fra enheten din av lagringsadministratoren."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Fjern bilder og videoer"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Lagringsadministrator"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatisk"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuelle innstillinger"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Bevegelser"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Gå til kameraet"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"For å åpne kameraet raskt, bare dobbelttrykk på av/på-knappen. Dette fungerer fra alle skjermbilder."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Vend kameraet"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"For å bytte mellom det fremre og det bakre kameraet, vri to ganger."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Rask skjermsjekk"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"For å sjekke telefonen uten å vekke den helt, dytt borti eller løft den."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Sveip for varsler"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"For å sjekke varslene dine fra et hvilket som helst skjermbilde, sveip ned på fingeravtrykksensoren."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"På"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Av"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Oppstartsinnlasteren er allerede låst opp"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Koble til Internett først"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Utilgjengelig på enheter med operatørlås"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-ne-rNP/arrays.xml b/res/values-ne-rNP/arrays.xml
index 00d92de..9282407 100644
--- a/res/values-ne-rNP/arrays.xml
+++ b/res/values-ne-rNP/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"गुलाबी"</item>
     <item msgid="6131821495505931173">"रातो"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"३० दिनभन्दा बढी पुरानो"</item>
+    <item msgid="2900554746706302178">"६० दिनभन्दा बढी पुरानो"</item>
+    <item msgid="5692284879054004388">"९० दिनभन्दा बढी पुरानो"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-ne-rNP/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-ne-rNP/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-ne-rNP/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 59938f9..0b0dabd 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"डेटामा जडानलाई सक्रिय गर्नुहोस्"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"डेटामा जडानलाई असक्षम गर्नुहोस्"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE को प्रावधानीकरणलाई सक्रिय गरिएको छ"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"भिडियो कलिङ सम्बन्धी प्रावधानलाई सक्रिय गरिएको छ"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi कलिङ सम्बन्धी प्रावधानलाई सक्रिय गरिएको छ"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"सेलुलर रेडियोको पावर"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM को ठेगाना पुस्तिका हेर्नुहोस्"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"स्थिर डायल गर्ने नम्बरहरू हेर्नुहोस्"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"फिंगरप्रिन्टमार्फत अनलक"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"तपाईँको फोनलाई अनलक गर्न, खरिदहरूलाई अधिकार प्रदान गर्न वा अनुप्रयोगहरूमा साइन इन गर्न केवल  फिंगरप्रिन्टको सेन्सरमा छुनुहोस्। तपाईँ कसका फिंगरप्रिन्टहरू थप्दै हुनुहुन्छ भन्ने कुरामा सावधान रहनुहोस्। थपिएको एउटै फिंगरप्रिन्टले यी मध्ये कुनै कुरा गर्न सक्छ\n\nटिप्पणी: तपाईँको फिंगरप्रिन्ट कुनै बलियो ढाँचा वा PIN भन्दा कम सुरक्षित हुन सक्छ।  "<annotation id="url">"थप जान्नुहोस्"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"आफ्नो फोन अनलक गर्न, खरिदहरूका लागि अनुमति दिन वा अनुप्रयोगहरूमा साइन इन गर्न फिंगरप्रिन्ट सेन्सरलाई केवल छुनुहोस्। तपाईँ कसका फिंगरप्रिन्टहरू थप्दै हुनुहुन्छ भन्ने कुरामा सावधान रहनुहोस्। थपिएको एउटै फिंगरप्रिन्टले यी मध्ये कुनै कुरा गर्न सक्छ।\n\nतपाईँको फिंगरप्रिन्ट कुनै बलियो ढाँचा वा PIN भन्दा कम सुरक्षित हुन सक्छ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"रद्द गर्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"जारी राख्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"छाड्नुहोस्"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"मेटाउनुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"सुरु गरौं!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"सेन्सरमा आफ्नो औंला राख्नुहोस्  र तपाईंले भाइब्रेसन महसुस गरेपछि उठाउनुहोस्"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"अति उत्तम! अब दोहोर्‍याउनुहोस्।"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"छोइराख्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"तपाईंको फिंगरप्रिन्टको सबै फरक भागहरु थप्न आफ्नो औंला बिस्तारै सार्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"फिंगरप्रिन्ट थपियो!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"तपाईँ यस आइकनलाई देख्नुहुने समय तपाईँ पहिचानको लागि वा एक खरिदलाई अधिकार दिनको निम्ति आफ्नो फिंगरप्रिन्ट प्रयोग गर्न सक्नुहुन्छ।"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"जगाउन र तपाईँको यन्त्रलाई अनलक गर्न फिंगरप्रिन्ट सेन्सरमा छुनुहोस्।"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"तपाईँले यो आइकन देखेको बेला तपाईँ आफ्नो फिंगरप्रिन्ट प्रयोग गर्न सक्नुहुन्छ।"</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"तपाईँले यो आइकन देख्नुभो भने तपाईँ खरिदहरूलाई अनुमति दिन वा अनुप्रयोगहरूमा साइन इन गर्न पनि सक्नुहुन्छ।"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"फिंगरप्रिन्ट सेटअप छोड्न चाहनुहुन्छ?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"तपाईँले आफ्नो फोन अनलक गर्ने एक तरिका रूपमा फिंगरप्रिन्ट छान्‍नुभएको छ। यदि तपाईँले अहिले छोड्नु भएमा पछि पुन: सेटअप गर्न पर्नेछ। सेटअप गर्न मात्र केहि मिनेट लाग्‍नेछ।"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"स्क्रिन लक सेटअप गर्नुहोस्"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"१"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi कलिङ सक्रिय हुँदा तपाईँको प्राथमिकता र कुन संकेत बलियो छ भन्ने आधारमा तपाईँको फोनले कलहरूलाई Wi-Fi नेटवर्हकरू वा तपाईँको वाहकको नेटवर्कमार्फत पठाउन सक्छ। यो सुविधा सक्रिय पार्न अघि शुल्क र अन्य विवरणको बारेमा तपाईँको वाहकसँग जाँच गर्नुहोस्।"</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"आपतकालीन ठेगानालाई अद्यावधिक गर्नुहोस्"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"तपाईँले WiFi को प्रयोग गरी कुनै ९११ सम्बन्धी कल गर्दा आपतकालीन सेवाहरूले तपाईँको स्थानको रूपमा प्रयोग गर्ने ठेगाना"</string>
     <string name="home_settings" msgid="212375129455718176">"गृह"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"प्रदर्शन"</string>
     <string name="sound_settings" msgid="5534671337768745343">"आवाज"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"बिर्सनुहोस्"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"सेटअप गर्नुहोस्"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"अन्वेषण गर्नुहोस्"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"ठाउँ खाली गर्नुहोस्"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"भण्डारणको व्यवस्थापन गर्नुहोस्"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB कम्प्युटर जडान"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"यस रूपमा जडान गर्नुहोस्"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"मिडिया उपकरण (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"अडियो"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"क्यास गरेको डेटा"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"अन्य"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"प्रणाली"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> अन्वेषण गर्नुहोस्"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"अन्यमा साझेदारी गरिएका फाइलहरू, अनुप्रयोगहरूद्वारा साझेदारी गरिएका फाइलहरू, इन्टरनेट वा Bluetooth बाट डाउनलोड गरिएका फाइलहरू, Android फाइलहरू र धेरै समावेश छन्। \n\n यो सम्पूर्ण सामग्रीहरू हेर्न <xliff:g id="NAME">^1</xliff:g> अन्वेषणमा ट्याप गर्नुहोस्।"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"प्रणालीमा Android अपरेटिङ सिस्टमद्वारा आन्तरिक रूपमा प्रयोग गरिएका फाइलहरू समावेश छन्।\n\nयी फाइलहरूलाई एक-एक गरेर हेर्न सकिँदैन।"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> ले तस्बिर, सँगीत, चलचित्र, अनुप्रयोग, वा अन्य डेटा सुरक्षित गरेको हुनसक्छ जसले <xliff:g id="SIZE">^2</xliff:g> को भण्डारण ओगटिरहेको छ।\n\nविवरणहरू हेर्न <xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"कानुनी जानकारी"</string>
     <string name="contributors_title" msgid="5917703088825286504">"योगदानकर्ताहरू"</string>
     <string name="manual" msgid="3025943393642974445">"म्यानुअल"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"नियमित जानकारी"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"नियामक सम्बन्धी लेबलहरू"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"सुरक्षा र नियामक सम्बन्धी जानकारी"</string>
     <string name="copyright_title" msgid="865906688917260647">"प्रतिलिपि अधिकार"</string>
     <string name="license_title" msgid="1990487604356037871">"इजाजतपत्र"</string>
     <string name="terms_title" msgid="7697580845616764642">"सेवा सर्तहरू"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"सधैँ VPN मा"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"कुनै पनि VPN हरू थपिएका छैनन्।"</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"सधैँ-सक्रिय भन्ने सुविधा सक्रिय छ"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"यो अनुप्रयोगले समर्थन गर्दैन"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"सधैँ जडान भइरहन VPN प्रोफाइल चयन गर्नुहोस्। यस VPN जडान भएको बेला नेटवर्क ट्राफिकलाई मात्र अनुमति हुने छ।"</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"कुनै पनि होइन"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"सधैँ चल्ने VPN लाई IP ठेगाना दुबै सर्भर र DNS का लागि चाहिन्छ।"</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"अनलक गर्न स्लाइड गर्नुहोस्, पासवर्ड, ढाँचा, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"कार्य चुनौती, कार्य, प्रोफाइल"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"कार्यको प्रोफाइल, व्यवस्थापन गरिएको प्रोफाइल, एकरूपता ल्याउनु, एकरूपता, कार्य, प्रोफाइल"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"इसारा"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ट्याग सेट गर्नुहोस्"</string>
     <string name="write_tag" msgid="8571858602896222537">"लेख्नुहोस्"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"लेख्न ट्याग छुनुहोस्..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"पृष्ठभूमि डेटा Wi-Fi मार्फत मात्र उपलब्ध छ। Wi-Fi उपलब्ध नहुँदा यसले केही अनुप्रयोग वा सेवाहरूलाई प्रभावित गर्न सक्नेछ।"</string>
     <string name="condition_work_title" msgid="7293722361184366648">"कार्यको प्रोफाइल बन्द छ"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"तपाईँको कार्यको प्रोफाइलसँग सम्बन्धित अनुप्रयोग, पृष्ठभूमि सिंक र अन्य विशेषताहरू निष्क्रिय छन्।"</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"सुझावहरू (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"सुझावहरू"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"हटाउनुहोस्"</string>
     <string name="color_temperature" msgid="2070126836910615605">"सुन्दर रंगको तापमान"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"अझ सुन्दर प्रदर्शनको रंगहरू प्रयोग गर्नुहोस्"</string>
@@ -3084,6 +3096,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager का दर-सीमित गर्ने काउन्टरहरूलाई रिसेट गर्ने हो?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"लक स्क्रिनका सूचनाहरूलाई नियन्त्रण गर्नु"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"सूचना सम्बन्धी सामग्री देखाउनुहोस् वा लुकाउनुहोस्"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"सबै"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"समर्थन"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"सबैभन्दा सानो चौडाइ"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"स्थापना गरिएका कुनै पनि अनुप्रयोगहरूले प्रिमियम SMS माथि पहुँचका लागि अनुरोध गरेका छैनन्"</string>
@@ -3091,9 +3105,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"प्रिमियम SMS माथि पहुँच"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"असक्षम गरियो"</string>
     <string name="demo_mode" msgid="2655748420527206870">"डेमो मोड"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"हामी मद्दतका लागि तयार छौँ"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"हामी तपाईँको सहायताका लागि २४/७ उपलब्ध छौँ"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"हाम्रो समर्थन टोली जुनसुकै समस्याको समाधान गर्नमा मद्दतका लागि तयार छ"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"हाम्रो सहायता टोली पूरा दिन र हरेक दिन तपाईँको सहायताका लागि उपलब्ध छ"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"फोन मार्फत गरिने सहायताको समयावधि (स्थानीय समय)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"मद्दतमा खोज्नुहोस् वा सुझाव र जुक्तिहरूको अन्वेषण गर्नुहोस्"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"निम्नका लागि समर्थन:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"विदेश यात्रा गर्दै हुनुहुन्छ?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"अन्तर्राष्ट्रिय शुल्कहरू लाग्न सक्छन्"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"फोन"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"कुराकानी"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"सुझाव र जुक्तिहरूको अन्वेषण गर्नुहोस्"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"मद्दत खण्डमा खोज्नुहोस् र प्रतिक्रिया पठाउनु‍ु‍होस्"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"सहायताका लागि साइन इन गर्नुहोस्"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"साइन इन गर्नुहोस्"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"आफ्नो खातामाथि पहुँच राख्न सक्नुहुन्न?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"प्रणाली सम्बन्धी जानकारी पठाउनुहोस्"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"तपाईँको समस्यालाई चाँडै सम्बोधन गर्न मद्दत पुगोस् भन्नका खातिर हामीलाई निदानका लागि प्रणाली सम्बन्धी जानकारीको आवश्यकता पर्दछ।"</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"फेरि नदेखाउनुहोस्"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"कार्य प्रोफाइलका सेटिङहरू"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"सम्पर्कको खोजी"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"कलर र सम्पर्कहरूको पहिचान गर्न तपाईँको संगठन अनुसार गरिने सम्पर्कका खोजीहरूलाई अनुमति दिनुहोस्"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> घन्टा</item>
+      <item quantity="one">१ घन्टा</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> मिनेट</item>
+      <item quantity="one">१ मिनेट</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> सेकेन्ड</item>
+      <item quantity="one">१ सेकेन्ड</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> कुर्नुहोस्"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"कम्प्युटर"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"हेडसेट"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"फोन"</string>
@@ -3101,4 +3149,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"हेडफोन"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"इनपुट सम्बन्धी बाह्य यन्त्र"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"ब्लुटुथ"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"भण्डारण प्रबन्धकले भण्डारणको ठाउँ खाली गर्न मद्दतका लागि तपाईँको यन्त्रबाट ब्याक अप गरिएका तस्बिर र भिडियोहरू हटाउँदछ।"</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"तस्बिर र भिडियोहरूलाई मेट्नुहोस्"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"भण्डारण प्रबन्धक"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"स्वतः"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"म्यानुअल"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"इसाराहरू"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"तुरुन्त क्यामेरा खोल्ने"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"द्रुत रूपमा क्यामेरा खोल्न पावर बटनलाई डबल-ट्याप गरे पुग्छ। जुनसुकै स्क्रिनमा काम गर्दछ।"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"क्यामेरा फ्लिप गर्ने"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"अगाडि र पछाडिको क्यामेरा बीच परिवर्तन गर्न दुई पटक बटार्नुहोस्।"</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"द्रुत रूपमा स्क्रिनको जॉंच गर्ने"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"पूर्णतया नउठाइकन आफ्नो फोनको जॉंच गर्न त्यसलाई बिस्तारै हल्लाउनुहोस् वा उठाउनुहोस्।"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"सूचनाहरूका लागि स्वाइप गर्ने"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"जुनसुकै स्क्रिनबाट आफ्ना सूचनाहरूको जाँच गर्न फिंगरप्रिन्ट सेन्सरमा तलतिर स्वाइप गर्नुहोस्।"</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"सक्रिय"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"निष्क्रिय"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"बुटलोडर पहिले नै अनलक गरिएको छ"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"पहिले इन्टरनेटमा जडान गर्नुहोस्"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"वाहकद्वारा लक गरिएका यन्त्रहरूमा उपलब्ध छैन"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index a9087fb..fe81f9b 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Roze"</item>
     <item msgid="6131821495505931173">"Rood"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Meer dan 30 dagen oud"</item>
+    <item msgid="2900554746706302178">"Meer dan 60 dagen oud"</item>
+    <item msgid="5692284879054004388">"Meer dan 90 dagen oud"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-nl/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-nl/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-nl/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 29015a9..7226041 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Gegevensverbinding inschakelen"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Gegevensverbinding uitschakelen"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE-registratie"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videogesprekken geregistreerd"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi-gesprekken geregistreerd"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Energieverbruik door mobiele radio"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Adresboek op simkaart weergeven"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Vaste nummers weergeven"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Ontgrendelen met vingerafdruk"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Raak de vingerafdruksensor aan om je telefoon te ontgrendelen, aankopen te autoriseren of in te loggen bij apps. Deze dingen kunnen worden gedaan met alle vingerafdrukken die zijn toegevoegd aan je telefoon, dus wees voorzichtig met wie je toevoegt.\n\nOpmerking: Je vingerafdruk is mogelijk minder veilig dan een sterk patroon of sterke pincode. "<annotation id="url">"Meer informatie"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Raak de vingerafdruksensor aan om je telefoon te ontgrendelen, aankopen te autoriseren of in te loggen bij apps. Deze dingen kunnen worden gedaan met alle vingerafdrukken die zijn toegevoegd aan je telefoon, dus wees voorzichtig met wie je toevoegt.\n\nOpmerking: Je vingerafdruk is mogelijk minder veilig dan een sterk patroon of sterke pincode."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Annuleren"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Doorgaan"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Overslaan"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Verwijderen"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Aan de slag"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Plaats je vinger op de sensor en til deze op nadat je een trilling hebt gevoeld"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Prima! Herhaal dit nu."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Blijf aanraken"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Beweeg je vinger enigszins om alle delen van je vingerafdruk toe te voegen"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Gelukt!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Wanneer je dit pictogram ziet, kun je je vingerafdruk gebruiken voor identificatie of om een aankoop goed te keuren."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Raak de vingerafdruksensor aan om je apparaat te activeren en te ontgrendelen."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Wanneer dit pictogram wordt weergegeven, kun je je vingerafdruk gebruiken."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Wanneer dit pictogram wordt weergegeven, kun je ook aankopen autoriseren of inloggen bij apps."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Instellen van vingerafdruk overslaan?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Je hebt ervoor gekozen je vingerafdruk te gebruiken als manier om je telefoon te ontgrendelen. Als je dit nu overslaat, moet je het later instellen. Het instellen neemt ongeveer een minuut in beslag."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Schermvergrendeling instellen"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wanneer bellen via wifi is ingeschakeld, kan je telefoon oproepen doorschakelen via wifi-netwerken of het netwerk van je provider, afhankelijk van je voorkeur en welk signaal sterker is. Voordat je deze functie inschakelt, neem je contact met je provider op over de kosten en andere details."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"Noodadres updaten"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Adres dat door noodhulpdiensten als je locatie wordt gebruikt als je het noodnummer belt via wifi"</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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Vergeten"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Configureren"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Verkennen"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Ruimte vrijmaken"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Opslagruimte beheren"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-computerverbinding"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Verbinding maken als"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Media-apparaat (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Gegevens in het cachegeheugen"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Overige"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Systeem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> verkennen"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Overig omvat gedeelde bestanden die zijn opgeslagen door apps, bestanden die zijn gedownload via internet of Bluetooth, Android-bestanden en meer. \n\nAls je de volledige inhoud van deze <xliff:g id="NAME">^1</xliff:g> wilt bekijken, tik je op Verkennen."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"\'Systeem\' omvat bestanden die intern worden gebruikt door het Android-besturingssysteem. \n\nDeze bestanden kunnen niet afzonderlijk worden bekeken."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> kan opgeslagen foto\'s, muziek, films, apps of andere gegevens bevatten die <xliff:g id="SIZE">^2</xliff:g> aan opslagruimte innemen. \n\nAls je details wilt bekijken, schakel je over naar <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Je <xliff:g id="NAME">^1</xliff:g> configureren"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Gebruiken als draagbare opslag"</string>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Juridische informatie"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Bijdragers"</string>
     <string name="manual" msgid="3025943393642974445">"Handleiding"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Wettelijke informatie"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Regelgevingslabels"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Info over veiligheid en regelgeving"</string>
     <string name="copyright_title" msgid="865906688917260647">"Auteursrecht"</string>
     <string name="license_title" msgid="1990487604356037871">"Licentie"</string>
     <string name="terms_title" msgid="7697580845616764642">"Algemene voorwaarden"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Always-on VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Geen VPN\'s toegevoegd."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"\'Altijd aan\' is actief"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Niet ondersteund door deze app"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecteer een VPN-profiel waarmee je altijd verbonden wilt blijven. Netwerkverkeer wordt alleen toegestaan bij verbinding met dit VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Geen"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Voor Always-on VPN is een IP-adres voor zowel de server als DNS vereist."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"schuiven om te ontgrendelen, wachtwoord, patroon, pincode"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"werkuitdaging, werk, profiel"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"werkprofiel, beheerd profiel, gelijkschakelen, unificatie, werk, profiel"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"gebaar"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wifi NFC-tag instellen"</string>
     <string name="write_tag" msgid="8571858602896222537">"Schrijven"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tik op een tag om te schrijven..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Achtergrondgegevens zijn alleen beschikbaar via wifi. Dit kan van invloed zijn op bepaalde apps of services wanneer er geen wifi beschikbaar is."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Werkprofiel is uitgeschakeld"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Apps, synchronisatie op de achtergrond en andere functies met betrekking tot je werkprofiel worden uitgeschakeld."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Suggesties (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Suggesties"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Verwijderen"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Koele kleurtemperatuur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Koelere weergavekleuren gebruiken"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Tellers voor frequentielimieten van ShortcutManager opnieuw instellen?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Meldingen voor vergrendelingsscherm beheren"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Content van meldingen weergeven of verbergen"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Alle"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Ondersteuning"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Kleinste breedte"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Er zijn geen geïnstalleerde apps die premium sms-toegang hebben aangevraagd"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium sms-toegang"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Uitgeschakeld"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Demomodus"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"We zijn er om je te helpen"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"We staan voor je klaar"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Ons ondersteuningsteam zit klaar om je te helpen met problemen"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Ons ondersteuningsteam is elke dag de hele dag beschikbaar"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Openingstijden voor telefonische ondersteuning (lokale tijd)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Help doorzoeken of tips en trucs bekijken"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Ondersteuning voor:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Op reis in het buitenland?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Er kunnen internationale kosten in rekening worden gebracht"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefoon"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chatten"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Tips en trucs bekijken"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Help doorzoeken en feedback verzenden"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Log in voor ondersteuning"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Inloggen"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Geen toegang tot je account?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Systeeminformatie verzenden"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"We hebben systeeminformatie nodig om het probleem vast te stellen en je snel te kunnen helpen."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Niet opnieuw weergeven"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Instellingen voor werkprofiel"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Contacten zoeken"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Contactzoekopdrachten door je organisatie toestaan om bellers en contacten te identificeren"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> uur</item>
+      <item quantity="one">1 uur</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuten</item>
+      <item quantity="one">1 minuut</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> seconden</item>
+      <item quantity="one">1 seconde</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Ca. <xliff:g id="ESTIMATE">%1$s</xliff:g> wachten"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Computer"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Headset"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telefoon"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Hoofdtelefoon"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Randapparaat voor invoer"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Opslagbeheer verwijdert foto\'s en video\'s waarvan een back-up is gemaakt, van je apparaat om opslagruimte vrij te maken."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Foto\'s en video\'s verwijderen"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Opslagbeheer"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatisch"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Handmatig"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Gebaren"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Naar camera schakelen"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Als je de camera snel wilt openen, dubbeltik je op de aan/uit-knop. Werkt vanuit elk scherm."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Schakelen tussen camera\'s"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Draai snel twee keer vanuit je pols om te schakelen tussen de camera\'s aan de voor- en achterzijde."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Snelle schermcontrole"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Als je je telefoon wilt checken zonder deze volledig te activeren, geef je hem een duwtje of pak je hem op."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Vegen voor meldingen"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Als je vanuit elk gewenst scherm je meldingen wilt controleren, veeg je omlaag over de vingerafdruksensor."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Aan"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Uit"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader is al ontgrendeld"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Maak eerst verbinding met internet"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Niet beschikbaar op door provider vergrendelde apparaten"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-pa-rIN/arrays.xml b/res/values-pa-rIN/arrays.xml
index d3759bb..b36d614 100644
--- a/res/values-pa-rIN/arrays.xml
+++ b/res/values-pa-rIN/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"ਗੁਲਾਬੀ"</item>
     <item msgid="6131821495505931173">"ਲਾਲ"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"30 ਦਿਨਾਂ ਤੋਂ ਜ਼ਿਆਦਾ ਪੁਰਾਣੀ"</item>
+    <item msgid="2900554746706302178">"60 ਦਿਨਾਂ ਤੋਂ ਜ਼ਿਆਦਾ ਪੁਰਾਣੀ"</item>
+    <item msgid="5692284879054004388">"90 ਦਿਨਾਂ ਤੋਂ ਜ਼ਿਆਦਾ ਪੁਰਾਣੀ"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-pa-rIN/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-pa-rIN/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-pa-rIN/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index 919742e..58a502c 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"ਡੈੈਟਾ ਕਨੈਕਸ਼ਨ ਯੋਗ ਬਣਾਓ"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ਡੈਟਾ ਕਨੈਕਸ਼ਨ ਅਯੋਗ ਬਣਾਓ"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE ਪ੍ਰੋਵਿਨਜਨਡ"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"ਵੀਡੀਓ ਕਾਲਿੰਗ ਦੀ ਪ੍ਰੋਵੀਜ਼ਨ ਕੀਤੀ ਗਈ"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi ਕਾਲਿੰਗ ਦੀ ਪ੍ਰੋਵੀਜ਼ਨ ਕੀਤੀ ਗਈ"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"ਸੈਲਿਊਲਰ ਰੇਡੀਓ ਪਾਵਰ"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"ਸਿਮ ਪਤਾ ਬੁੱਕ ਵੇਖੋ"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ਫਿਕਸਡ ਡਾਇਲਿੰਗ ਨੰਬਰ ਦੇਖੋ"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਨਾਲ ਅਨਲੌਕ ਕਰੋ"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"ਆਪਣੇ ਫੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ, ਖ਼ਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਲਈ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ ਇਨ ਕਰਨ ਲਈ ਸਿਰਫ਼ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੂਚਕ ਨੂੰ ਸਪਰਸ਼ ਕਰੋ। ਇਸ ਗੱਲੋਂ ਸੁਚੇਤ ਰਹੋ ਕਿ ਤੁਸੀਂ ਕਿੰਨ੍ਹਾਂ ਦੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕਰ ਰਹੇ ਹੋ। ਇੱਥੋਂ ਤੱਕ ਕਿ ਸ਼ਾਮਲ ਕੀਤੇ ਗਏ ਇੱਕ ਪ੍ਰਿੰਟ ਨਾਲ ਇਹਨਾਂ ਚੀਜ਼ਾਂ ਵਿੱਚੋਂ ਕੋਈ ਵੀ ਚੀਜ਼ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।\n\nਨੋਟ ਕਰੋ: ਤੁਹਾਡਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਇੱਕ ਮਜ਼ਬੂਤ ਪੈਟਰਨ ਜਾਂ PIN ਤੋਂ ਘੱਟ ਸੁਰੱਖਿਅਤ ਹੋ ਸਕਦਾ ਹੈ। "<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"ਆਪਣੇ ਫੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ, ਖ਼ਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ ਇਨ ਕਰਨ ਲਈ ਸਿਰਫ਼ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੰਵੇਦਕ ਨੂੰ ਸਪਰਸ਼ ਕਰੋ। ਇਸ ਬਾਰੇ ਸਾਵਧਾਨ ਰਹੋ ਕਿ ਤੁਸੀਂ ਕਿਸ ਵਿਅਕਤੀ ਦੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰ ਰਹੇ ਹੋ। ਇੱਥੋਂ ਤੱਕ ਕਿ ਸ਼ਾਮਲ ਕੀਤੇ ਗਏ ਇੱਕ ਪ੍ਰਿੰਟ ਨਾਲ ਇਹਨਾਂ ਚੀਜ਼ਾਂ ਵਿੱਚੋਂ ਕੋਈ ਵੀ ਚੀਜ਼ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।\n\nਨੋਟ ਕਰੋ: ਤੁਹਾਡਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਇੱਕ ਮਜ਼ਬੂਤ ਪੈਟਰਨ ਜਾਂ PIN ਤੋਂ ਘੱਟ ਸੁਰੱਖਿਅਤ ਹੋ ਸਕਦਾ ਹੈ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"ਰੱਦ ਕਰੋ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ਜਾਰੀ ਰੱਖੋ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"ਛੱਡੋ"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"ਮਿਟਾਓ"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"ਆਓ ਸ਼ੁਰੂ ਕਰੀਏ!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ਆਪਣੀ ਉਂਗਲ ਨੂੰ ਸੰਵੇਦਕ ’ਤੇ ਰੱਖੋ ਅਤੇ ਇੱਕ ਕੰਪਨ ਮਹਿਸੂਸ ਹੋਣ ਤੋਂ ਬਾਅਦ ਚੁੱਕ ਲਵੋ"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"ਬਹੁਤ ਵਧੀਆ! ਹੁਣ ਦੁਬਾਰਾ ਕਰੋ"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"ਜਾਰੀ ਰੱਖੋ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੇ ਸਾਰੇ ਵੱਖ-ਵੱਖ ਹਿੱਸੇ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਆਪਣੀ ਉਂਗਲ ਨੂੰ ਥੋੜ੍ਹਾ ਜਿਹਾ ਸਰਕਾਓ"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ਜਦੋਂ ਵੀ ਤੁਸੀਂ ਇਹ ਚਿੰਨ੍ਹ ਦੇਖਦੇ ਹੋ, ਤਾਂ ਤੁਸੀਂ ਪਛਾਣ ਲਈ ਜਾਂ ਕਿਸੇ ਖ਼ਰੀਦ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਲਈ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤ ਸਕਦੇ ਹੋ।"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"ਆਪਣੀ ਡੀਵਾਈਸ ਨੂੰ ਸਕਿਰਿਆ ਅਤੇ ਅਨਲੌਕ ਕਰਨ ਲਈ ਕੇਵਲ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੰਵੇਦਕ ਨੂੰ ਸਪੱਰਸ਼ ਕਰੋ।"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"ਜਦੋਂ ਤੁਸੀਂ ਇਹ ਆਈਕਨ ਦੇਖੋ, ਤਾਂ ਤੁਸੀਂ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤ ਸਕਦੇ ਹੋ।"</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"ਜਦੋਂ ਤੁਹਾਨੂੰ ਇਹ ਚਿੰਨ੍ਹ ਵਿਖਾਈ ਦੇਵੇ, ਤਾਂ ਤੁਸੀਂ ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ ਇਨ ਵੀ ਕਰ ਸਕਦੇ ਹੋ।"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ਕੀ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਟਅਪ ਛੱਡਣਾ ਹੈ?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਦਾ ਇੱਕ ਤਰੀਕਾ ਆਪਣੇ ਉਂਗਲਾਂ ਦੇ ਨਿਸ਼ਾਨ ਦਾ ਉਪਯੋਗ ਕਰਨਾ ਚੁਣਿਆ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਹੁਣੇ ਇਸਨੂੰ ਛੱਡਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਨੂੰ ਇਹ ਬਾਅਦ ਵਿੱਚ ਸਥਾਪਿਤ ਕਰਨ ਦੀ ਲੋੜ ਹੋਵੇਗੀ। ਸੈੱਟਅੱਪ ਸਿਰਫ਼ ਇੱਕ ਮਿੰਟ ਲੈਂਦਾ ਹੈ।"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ਸਕ੍ਰੀਨ ਲੌਕ ਸੈੱਟਅੱਪ ਕਰੋ"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"ਜਦੋਂ Wi-Fi ਕਾਲਿੰਗ ਚਾਲੂ ਹੁੰਦੀ ਹੈ, ਤਾਂ ਤੁਹਾਡਾ ਫੋਨ ਤੁਹਾਡੀ ਤਰਜੀਹ ਅਤੇ ਕਿਹੜਾ ਸਿਗਨਲ ਵੱਧ ਮਜ਼ਬੂਤ ਹੈ, ਦੇ ਆਧਾਰ ਤੇ Wi-Fi ਨੈੱਟਵਰਕਾਂ ਜਾਂ ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਦੇ ਨੈੱਟਵਰਕ ਰਾਹੀਆਂ ਕਾਲਾਂ ਰੂਟ ਕਰ ਸਕਦਾ ਹੈ। ਇਸ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਚਾਲੂ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ, ਫੀਸ ਅਤੇ ਹੋਰ ਵੇਰਵਿਆਂ ਲਈ ਆਪਣੇ ਕੈਰੀਅਰ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।"</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"ਐਮਰਜੈਂਸੀ ਪਤਾ ਅੱਪਡੇਟ ਕਰੋ"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"ਤੁਹਾਡੇ ਵੱਲੋਂ WiFi ਦੀ ਵਰਤੋਂ ਨਾਲ 911 ਨੂੰ ਕਾਲ ਕਰਨ \'ਤੇ ਐਮਰਜੈਂਸੀ ਸੇਵਾਵਾਂ ਦੁਆਰਾ ਤੁਹਾਡੇ ਟਿਕਾਣੇ ਵਜੋਂ ਵਰਤਿਆ ਜਾਣ ਵਾਲਾ ਪਤਾ"</string>
     <string name="home_settings" msgid="212375129455718176">"ਮੁੱਖ ਸਕ੍ਰੀਨ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ਡਿਸਪਲੇ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ਧੁਨੀ"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"ਭੁੱਲ ਜਾਓ"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"ਸਥਾਪਤ ਕਰੋ"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"ਐਕਸਪਲੋਰ ਕਰੋ"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"ਥਾਂ ਖ਼ਾਲੀ ਕਰੋ"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"ਸਟੋਰੇਜ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB ਕੰਪਿਊਟਰ ਕਨੈਕਸ਼ਨ"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"ਇਸਦੇ ਤੌਰ ਤੇ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"ਮੀਡੀਆ ਡੀਵਾਈਸ (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"ਔਡੀਓ"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"ਕੈਚ ਕੀਤਾ ਡੈਟਾ"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"ਹੋਰ"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"ਸਿਸਟਮ"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> ਐਕਸਪਲੋਰ ਕਰੋ"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"ਹੋਰਾਂ ਵਿੱਚ ਐਪਾਂ ਦੁਆਰਾ ਰੱਖਿਅਤ ਕੀਤੀਆਂ ਸਾਂਝੀਆਂ ਕੀਤੀਆਂ ਫ਼ਾਈਲਾਂ, ਇੰਟਰਨੈੱਟ ਜਾਂ ਬਲੂਟੁੱਥ ਤੋਂ ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਫ਼ਾਈਲਾਂ ਆਦਿ ਸ਼ਾਮਲ ਹਨ। \n\n<xliff:g id="NAME">^1</xliff:g> ਦੀ ਸਾਰੀ ਸਮੱਗਰੀ ਵੇਖਣ ਲਈ, ਪੜਚੋਲ \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"ਸਿਸਟਮ ਵਿੱਚ Android ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ ਵੱਲੋਂ ਅੰਦਰੂਨੀ ਤੌਰ \'ਤੇ ਵਰਤੀਆਂ ਜਾਣ ਵਾਲੀਆਂ ਫ਼ਾਈਲਾਂ ਸ਼ਾਮਲ ਹਨ। \n\nਇਹਨਾਂ ਫ਼ਾਈਲਾਂ ਨੂੰ ਵਿਅਕਤੀਗਤ ਤੌਰ \'ਤੇ ਵੇਖਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ।"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> ਨੇ ਫੋਟੋਆਂ, ਸੰਗੀਤ, ਮੂਵੀਜ, ਐਪਸ ਜਾਂ ਹੋਰ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕੀਤਾ ਹੋ ਸਕਦਾ ਹੈ ਜੋ <xliff:g id="SIZE">^2</xliff:g> ਸਟੋਰੇਜ ਲੈ ਰਿਹਾ ਹੈ। \n\n ਵੇਰਵੇ ਦੇਖਣ ਲਈ, <xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"ਕਨੂੰਨੀ ਜਾਣਕਾਰੀ"</string>
     <string name="contributors_title" msgid="5917703088825286504">"ਸਹਿਯੋਗੀ"</string>
     <string name="manual" msgid="3025943393642974445">"ਮੈਨੁਅਲ"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"ਨਿਯਾਮਕ ਜਾਣਕਾਰੀ"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"ਰੈਗੂਲੇਟਰੀ ਲੇਬਲ"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"ਸੁਰੱਖਿਆ ਅਤੇ ਰੈਗੂਲੇਟਰੀ ਜਾਣਕਾਰੀ"</string>
     <string name="copyright_title" msgid="865906688917260647">"ਕਾਪੀਰਾਈਟ"</string>
     <string name="license_title" msgid="1990487604356037871">"ਲਾਇਸੰਸ"</string>
     <string name="terms_title" msgid="7697580845616764642">"ਨਿਯਮ ਅਤੇ ਸ਼ਰਤਾਂ"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"ਹਮੇਸ਼ਾਂ-ਚਾਲੂ VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"ਕੋਈ VPNs ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤੇ ਗਏ।"</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"ਹਮੇਸ਼ਾ-ਚਾਲੂ ਕਿਰਿਆਸ਼ੀਲ"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"ਇਸ ਐਪ ਦੁਆਰਾ ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"ਹਮੇਸ਼ਾਂ ਉਸ ਨਾਲ ਕਨੈਕਟ ਰਹਿਣ ਲਈ ਇੱਕ VPN ਪ੍ਰੋਫਾਈਲ ਚੁਣੋ। ਨੈੱਟਵਰਕ ਟ੍ਰੈਫਿਕ ਦੀ ਆਗਿਆ ਕੇਵਲ ਇਸ VPN ਨਾਲ ਕਨੈਕਟ ਕੀਤੇ ਜਾਣ ਤੇ ਹੀ ਦਿੱਤੀ ਜਾਏਗੀ।"</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"ਕੋਈ ਨਹੀਂ"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"ਸਰਵਰ ਅਤੇ DNS ਦੋਵਾਂ ਲਈ ਹਮੇਸ਼ਾਂ-ਚਾਲੂ VPN ਲਈ ਇੱਕ IP ਪਤਾ ਲੁੜੀਂਦਾ ਹੈ।"</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"ਅਨਲੌਕ ਕਰਨ ਲਈ ਸਲਾਈਡ ਕਰੋ, ਪਾਸਵਰਡ, ਪੈਟਰਨ, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"ਕੰਮ ਚੁਣੌਤੀ, ਕੰਮ, ਪ੍ਰੋਫਾਈਲ"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ, ਪ੍ਰਬੰਧਿਤ ਕੀਤੀ ਗਈ ਪ੍ਰੋਫਾਈਲ, ਇਕਰੂਪ ਕਰਨਾ, ਏਕੀਕਰਨ, ਕੰਮ, ਪ੍ਰੋਫਾਈਲ"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"ਸੰਕੇਤ"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ਟੈਗ ਸੈਟ ਅਪ ਕਰੋ"</string>
     <string name="write_tag" msgid="8571858602896222537">"ਲਿਖੋ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ਲਿਖਣ ਲਈ ਇੱਕ ਟੈਗ ਟੈਪ ਕਰੋ..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"ਪਿਛੋਕੜ ਡੈਟਾ ਸਿਰਫ਼ Wi-Fi ਰਾਹੀਂ ਉਪਲਬਧ ਹੈ। Wi-Fi ਉਪਲਬਧ ਨਾ ਹੋਣ \'ਤੇ ਇਹ ਕੁਝ ਐਪਾਂ ਜਾਂ ਸੇਵਾਵਾਂ \'ਤੇ ਅਸਰ ਪਾ ਸਕਦਾ ਹੈ।"</string>
     <string name="condition_work_title" msgid="7293722361184366648">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਬੰਦ ਹੈ"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"ਤੁਹਾਡੀ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਨਾਲ ਸਬੰਧਿਤ ਐਪਾਂ, ਬੈਕਗ੍ਰਾਊਂਡ ਸਮਕਾਲੀਕਰਨ, ਅਤੇ ਹੋਰ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਬੰਦ ਹਨ।"</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"ਸੁਝਾਅ (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"ਸੁਝਾਅ"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"ਹਟਾਓ"</string>
     <string name="color_temperature" msgid="2070126836910615605">"ਠੰਡਾ ਰੰਗ ਤਾਪਮਾਨ"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ਵਧੇਰੇ ਠੰਡੇ ਡਿਸਪਲੇ ਰੰਗਾਂ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ਕੀ ShortcutManager ਰੇਟ-ਲਿਮਟਿੰਗ ਕਾਊਂਟਰਾਂ ਨੂੰ ਮੁੜ-ਸੈੱਟ ਕਰਨਾ ਹੈ?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"ਲੌਕ ਸਕ੍ਰੀਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਕੰਟਰੋਲ ਕਰੋ"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"ਸੂਚਨਾ ਸਮੱਗਰੀ ਨੂੰ ਵਿਖਾਓ ਜਾਂ ਲੁਕਾਓ"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"ਸਭ"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"ਸਹਿਯੋਗ"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"ਸਭ ਤੋਂ ਘੱਟ ਚੁੜਾਈ"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ਕਿਸੇ ਵੀ ਸਥਾਪਤ ਐਪ ਨੇ ਪ੍ਰੀਮੀਅਮ SMS ਪਹੁੰਚ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਕੀਤੀ"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"ਪ੍ਰੀਮੀਅਮ SMS ਪਹੁੰਚ"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
     <string name="demo_mode" msgid="2655748420527206870">"ਡੈਮੋ ਮੋਡ"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"ਅਸੀਂ ਸਹਾਇਤਾ ਕਰਨ ਲਈ ਉਪਲਬਧ ਹਾਂ"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"ਅਸੀਂ ਤੁਹਾਡੇ ਲਈ 24/7 ਉਪਲਬਧ ਹਾਂ"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"ਸਾਡੀ ਸਹਾਇਤਾ ਟੀਮ ਕਿਸੇ ਵੀ ਤਰ੍ਹਾਂ ਦੀਆਂ ਸਮੱਸਿਆਵਾਂ ਨੂੰ ਹੱਲ ਕਰਨ ਲਈ ਉਪਲਬਧ ਹੈ"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"ਸਾਡੀ ਸਹਾਇਤਾ ਟੀਮ ਹਰ ਵੇਲੇ, ਹਰ ਦਿਨ ਉਪਲਬਧ ਹੈ।"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"ਫ਼ੋਨ ਰਾਹੀਂ ਸਹਾਇਤਾ ਦਾ ਸਮਾਂ (ਸਥਾਨਕ ਸਮਾਂ)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"ਮਦਦ ਖੋਜੋ ਜਾਂ ਨੁਕਤਿਆਂ ਅਤੇ ਜੁਗਤਾਂ ਦੀ ਪੜਚੋਲ ਕਰੋ"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"ਇਸ ਲਈ ਸਮਰਥਨ:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"ਕੀ ਵਿਦੇਸ਼ ਯਾਤਰਾ ਕਰ ਰਹੇ ਹੋ?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"ਅੰਤਰਰਾਸ਼ਟਰੀ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"ਫੋਨ"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"ਚੈਟ ਕਰੋ"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"ਨੁਕਤਿਆਂ ਅਤੇ ਜੁਗਤਾਂਂ ਦੀ ਪੜਚੋਲ ਕਰੋ"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"ਮਦਦ ਖੋਜੋ ਅਤੇ ਪ੍ਰਤੀਕਰਮ ਭੇਜੋ"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"ਸਹਾਇਤਾ ਲਈ ਸਾਈਨ ਇਨ ਕਰੋ"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"ਸਾਈਨ ਇਨ ਕਰੋ"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"ਕੀ ਆਪਣੇ ਖਾਤੇ \'ਤੇ ਪਹੁੰਚ ਨਹੀਂ ਕਰ ਸਕਦੇ?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"ਸਿਸਟਮ ਜਾਣਕਾਰੀ ਭੇਜੋ"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"ਤੁਹਾਡੀ ਸਮੱਸਿਆ ਨੂੰ ਤੇਜ਼ੀ ਨਾਲ ਹੱਲ ਕਰਨ ਵਿੱਚ ਮਦਦ ਲਈ, ਸਾਨੂੰ ਨਿਦਾਨ ਲਈ ਸਿਸਟਮ ਜਾਣਕਾਰੀ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"ਦੁਬਾਰਾ ਨਾ ਵਿਖਾਓ"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਸੈਟਿੰਗਾਂ"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"ਸੰਪਰਕ ਖੋਜ"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"ਕਾਲ ਕਰਨ ਵਾਲਿਆਂ ਅਤੇ ਸੰਪਰਕਾਂ ਦੀ ਪਛਾਣ ਕਰਨ ਲਈ ਤੁਹਾਡੀ ਸੰਸਥਾ ਵਿੱੱਚ ਸੰਪਰਕ ਖੋਜਾਂ ਕਰਨ ਦਿਓ"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ਘੰਟੇ</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ਘੰਟੇ</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ਮਿੰਟ</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ਮਿੰਟ</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ਸਕਿੰਟ</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ਸਕਿੰਟ</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> ਉਡੀਕ ਕਰੋ"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"ਕੰਪਿਊਟਰ"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"ਹੈੱਡਸੈੱਟ"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"ਫੋਨ"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"ਹੈੱਡਫੋਨ"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"ਇਨਪੁੱਟ ਪੈਰਿਫੈਰਲ"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"ਬਲੂਟੁੱਥ"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"ਸਟੋਰੇਜ ਥਾਂ ਖ਼ਾਲੀ ਕਰਨ ਵਿੱਚ ਮਦਦ ਲਈ, ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਤੋਂ ਬੈਕਅੱਪ ਲਈਆਂ ਗਈਆਂ ਫੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ ਨੂੰ ਹਟਾਉਂਦਾ ਹੈ।"</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ਫੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ ਹਟਾਓ"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"ਸਵੈਚਾਲਿਤ"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"ਦਸਤੀ"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"ਸੰਕੇਤ"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"ਕੈਮਰੇ \'ਤੇ ਜਾਓ"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"ਕੈਮਰੇ ਨੂੰ ਤੁਰੰਤ ਖੋਲ੍ਹਣ ਲਈ, ਸਿਰਫ਼ ਪਾਵਰ ਬਟਨ ਨੂੰ ਦੋ ਵਾਰ ਟੈਪ ਕਰੋ। ਇਹ ਕਿਸੇ ਵੀ ਸਕ੍ਰੀਨ ਤੋਂ ਕੰਮ ਕਰਦਾ ਹੈ।"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ਕੈਮਰਾ ਫਲਿੱਪ ਕਰੋ"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"ਮੂਹਰਲੇ ਅਤੇ ਪਿਛਲੇ ਕੈਮਰਿਆਂ ਵਿਚਕਾਰ ਅਦਲਾ-ਬਦਲੀ ਕਰਨ ਲਈ, ਦੋ ਵਾਰ ਟਵਿਸਟ ਕਰੋ।"</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"ਤਤਕਾਲ ਸਕ੍ਰੀਨ ਜਾਂਚ"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਪੂਰੀ ਤਰ੍ਹਾਂ ਕਿਰਿਆਸ਼ੀਲ ਕੀਤੇ ਬਿਨਾਂ ਜਾਂਚਣ ਲਈ, ਉਸ ਨੂੰ ਹਲਕਾ ਜਿਹਾ ਹਿਲਾਓ ਜਾਂ ਚੁੱਕੋ।"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"ਸੂਚਨਾਵਾਂ ਲਈ ਸਵਾਈਪ ਕਰੋ"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"ਕਿਸੇ ਵੀ ਸਕ੍ਰੀਨ ਤੋਂ ਆਪਣੀਆਂ ਸੂਚਨਾਵਾਂ ਵੇਖਣ ਲਈ, ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੂਚਕ \'ਤੇ ਹੇਠਾਂ ਨੂੰ ਸਵਾਈਪ ਕਰੋ।"</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"ਚਾਲੂ"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"ਬੰਦ"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"ਬੂਟਲੋਡਰ ਪਹਿਲਾਂ ਹੀ ਅਨਲੌਕ ਕੀਤਾ ਹੋਇਆ ਹੈ"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"ਪਹਿਲਾਂ ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"ਕੈਰੀਅਰ-ਲੌਕ ਕੀਤੀਆਂ ਡੀਵਾਈਸਾਂਂ \'ਤੇ ਉਪਲਬਧ ਨਹੀਂ"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 19279b6..dc25517 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Różowy"</item>
     <item msgid="6131821495505931173">"Czerwony"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Starsze niż 30 dni"</item>
+    <item msgid="2900554746706302178">"Starsze niż 60 dni"</item>
+    <item msgid="5692284879054004388">"Starsze niż 90 dni"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-pl/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-pl/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-pl/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 58deaed..13a3f3a 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -41,6 +41,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Włącz transmisję danych"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Wyłącz transmisję danych"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Obsługa głosu przez LTE włączona"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Możliwość prowadzenia rozmów wideo"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Możliwość prowadzenia rozmów przez Wi-Fi"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Moc sygnału radia komórkowego"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Wyświetl książkę adresową z karty SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Wyświetl ustalone numery"</string>
@@ -340,7 +342,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Odblokuj odciskiem palca"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Dotknij czytnika linii papilarnych, by odblokować telefon, autoryzować zakupy lub zalogować się w aplikacjach. Z rozwagą dodawaj odciski palców innych osób, bo każda z nich będzie mogła wykonywać wszystkie te czynności.\n\nUwaga: odcisk palca może być mniej bezpieczny niż trudny wzór czy kod PIN. "<annotation id="url">"Więcej informacji"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Dotknij czytnika linii papilarnych, by odblokować telefon, autoryzować zakupy lub zalogować się w aplikacjach. Z rozwagą dodawaj odciski palców innych osób – każda dodana osoba będzie mogła wykonywać wszystkie powyższe działania.\n\nUwaga: odcisk palca może być mniej bezpieczny niż trudny wzór czy kod PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Anuluj"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Dalej"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Pomiń"</string>
@@ -361,12 +363,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Usuń"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Rozpocznij"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Przyłóż palec do czytnika. Podnieś go, gdy poczujesz wibracje."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Powtórz czynność"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Nie przerywaj"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Obróć lekko palcem, by odcisk był bardziej dokładny."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Odcisk palca dodany"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Za każdym razem, gdy zobaczysz tę ikonę, możesz użyć odcisku palca, aby potwierdzić swoją tożsamość lub autoryzować zakup."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Dotknij czytnika linii papilarnych, by wybudzić i odblokować urządzenie."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Ta ikona oznacza, że możesz użyć odcisku palca."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Gdy pojawi się ta ikona, możesz w ten sposób autoryzować zakupy i logować się do aplikacji."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Pominąć konfigurację odcisku palca?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Chcesz odblokowywać telefon m.in. odciskiem palca. Jeśli nie skonfigurujesz tej funkcji teraz, musisz to zrobić później. Zajmie Ci to około minuty."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Skonfiguruj blokadę ekranu"</string>
@@ -853,6 +855,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Zaktualizuj adres alarmowy"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Adres, który służby ratunkowe będą traktować jako Twoją lokalizację, jeśli zadzwonisz pod numer alarmowy 112 przez Wi-Fi"</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>
@@ -1075,6 +1079,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Zapomnij"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Skonfiguruj"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Przeglądaj"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Zwolnij miejsce"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Zarządzanie pamięcią"</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>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Urządzenie multimedialne (MTP)"</string>
@@ -1111,8 +1117,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Dźwięk"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Dane w pamięci podręcznej"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Inne"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Przeglądaj <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Inne elementy to udostępnione pliki zapisane przez aplikacje, pliki pobrane z internetu lub przez Bluetooth, pliki Androida itp. \n\nAby wyświetlić całą zawartość nośnika <xliff:g id="NAME">^1</xliff:g>, dotknij Przeglądaj."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"System zawiera pliki używane wewnętrznie przez system operacyjny Android. \n\nNie można ich wyświetlić pojedynczo."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Użytkownik <xliff:g id="USER_0">^1</xliff:g> może mieć zapisane zdjęcia, muzykę, filmy, aplikacje i inne dane, które zajmują <xliff:g id="SIZE">^2</xliff:g> pamięci. \n\nAby wyświetlić szczegóły, przełącz na <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1303,7 +1311,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Informacje prawne"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Współautorzy"</string>
     <string name="manual" msgid="3025943393642974445">"Instrukcja"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Certyfikaty"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Etykiety prawne"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Informacje prawne i dot. bezpieczeństwa"</string>
     <string name="copyright_title" msgid="865906688917260647">"Prawa autorskie"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencja"</string>
     <string name="terms_title" msgid="7697580845616764642">"Warunki i zasady korzystania"</string>
@@ -2264,6 +2273,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Stały VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Brak dodanych sieci VPN."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Zawsze włączona – aktywne"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Nieobsługiwane przez tę aplikację"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Wybierz stały profil VPN. Ruch w sieci będzie możliwy tylko po połączeniu z tą siecią VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Brak"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"W przypadku stałej sieci VPN wymagany jest adres IP zarówno dla serwera, jak i dla DNS."</string>
@@ -2540,6 +2550,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"przesuń, by odblokować, hasło, wzór, kod PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"zadanie służbowe, praca, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"profil do pracy, profil zarządzany, ujednolicić, ujednolicenie, praca, profil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"gest"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Skonfiguruj tag NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapisz"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Kliknij tag, by zapisać..."</string>
@@ -3051,7 +3062,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Przesyłanie danych w tle działa tylko wtedy, gdy masz połączenie z Wi-Fi. Może to mieć wpływ na niektóre aplikacje i usługi, gdy sieć Wi-Fi jest niedostępna."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Profil do pracy jest wyłączony"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Aplikacje, synchronizacja w tle i inne funkcje związane z profilem do pracy są wyłączone."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Sugestie (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Sugestie"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Usuń"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Chłodna temperatura kolorów"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Używaj chłodniejszych kolorów na ekranie"</string>
@@ -3146,6 +3158,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Zresetować liczniki ograniczania szybkości w usłudze ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Skonfiguruj powiadomienia na ekranie blokady"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Pokaż lub ukryj informacje w powiadomieniach"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Wszystkie"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Pomoc"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Najmniejsza szerokość"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Żadna z zainstalowanych aplikacji nie prosiła o dostęp do SMS-ów specjalnych"</string>
@@ -3153,9 +3167,49 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Dostęp do SMS-ów specjalnych"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Wył."</string>
     <string name="demo_mode" msgid="2655748420527206870">"Tryb demonstracyjny"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Chętnie Ci pomożemy"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Pomożemy Ci każdego dnia o dowolnej porze"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Nasz zespół pomocy postara się rozwiązać każdy problem"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Nasz zespół pomocy jest dostępny codziennie przez całą dobę"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Pomoc telefoniczna jest dostępna w tych godzinach (czasu lokalnego)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Szukaj pomocy lub przeglądaj wskazówki i porady"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Kraj obsługi klienta:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> – <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Wyjeżdżasz za granicę?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Mogą zostać naliczone opłaty za połączenia międzynarodowe"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Czat"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Zobacz porady i wskazówki"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Przeszukaj pomoc i prześlij opinię"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Zaloguj się, by uzyskać pomoc"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Zaloguj się"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Nie masz dostępu do konta?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Wyślij informacje o systemie"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Aby zdiagnozować i szybko rozwiązać problem, potrzebujemy informacji o systemie."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Nie pokazuj ponownie"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Ustawienia profilu do pracy"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Wyszukiwanie kontaktów"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Zezwalaj na wyszukiwanie kontaktów do identyfikacji rozmówców i kontaktów przez Twoją organizację"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> godziny</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> godzin</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> godziny</item>
+      <item quantity="one">1 godzina</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> minuty</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> minut</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuty</item>
+      <item quantity="one">1 minuta</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> sekundy</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> sekund</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekundy</item>
+      <item quantity="one">1 sekunda</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Czas oczekiwania: około <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Komputer"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Zestaw słuchawkowy"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telefon"</string>
@@ -3163,4 +3217,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Słuchawki"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Peryferyjne urządzenie wejściowe"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Aby pomóc zwolnić miejsce, menedżer miejsca usuwa z urządzenia kopie zapasowe zdjęć i filmów."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Usuń zdjęcia i filmy"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Menedżer miejsca"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatyczne"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Instrukcja"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Gesty"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Uruchamianie aparatu"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Aby szybko uruchomić aparat, kliknij dwukrotnie przycisk zasilania. Możesz to zrobić na dowolnym ekranie."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Obrót aparatu"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Aby przełączyć się między aparatem przednim i tylnym, obróć dwukrotnie urządzenie."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Szybkie sprawdzanie ekranu"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Aby sprawdzić swój telefon bez pełnego wybudzania go, wystarczy, że go poruszysz lub podniesiesz."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Wyświetlanie powiadomień przez przesunięcie palcem"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Aby sprawdzić powiadomienia z dowolnego ekranu, przesuń palcem w dół na czytniku linii papilarnych."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Włączone"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Wyłączone"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Program rozruchowy jest już odblokowany"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Najpierw połącz się z internetem"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Niedostępne na urządzeniach zablokowanych przez operatora"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml
index d41c483..eeede29 100644
--- a/res/values-pt-rBR/arrays.xml
+++ b/res/values-pt-rBR/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Rosa"</item>
     <item msgid="6131821495505931173">"Vermelho"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Mais de 30 dias"</item>
+    <item msgid="2900554746706302178">"Mais de 60 dias"</item>
+    <item msgid="5692284879054004388">"Mais de 90 dias"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-pt-rBR/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-pt-rBR/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-pt-rBR/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 7ae3674..915f97c 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Ativar conexão de dados"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Desativar conexão de dados"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Provisionado VoLTE"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videochamadas aprovisionadas"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Chamadas por Wi-Fi aprovisionadas"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Alimentação do rádio celular"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Ver o catálogo de endereços do SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Visualizar números de chamada fixa"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloqueio com digital"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Basta tocar no sensor de impressão digital para desbloquear o smartphone, autorizar compras ou fazer login em apps. Tome cuidado com as impressões digitais que adicionar. Mesmo uma única digital adicionada pode realizar essas ações.\n\nObservação: sua impressão digital pode ser menos segura que um PIN ou padrão forte. "<annotation id="url">"Saiba mais"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Basta tocar no sensor de impressão digital para desbloquear seu smartphone, autorizar compras ou fazer login em apps. Tome cuidado com as impressões digitais que adicionar. Uma única digital adicionada pode realizar todas essas ações.\n\nObservação: sua impressão digital pode ser menos segura que um PIN ou padrão forte."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Pular"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Excluir"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Vamos começar!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Coloque seu dedo no sensor e levante após sentir uma vibração"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Repita o processo"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Mova o dedo levemente para adicionar todas as partes da sua impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Adicionada"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Sempre que esse ícone é exibido, você pode usar sua impressão digital para fins de identificação ou para autorizar uma compra."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Basta tocar no sensor de impressão digital para ativar e desbloquear seu dispositivo."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Sempre que esse ícone é exibido, você pode usar sua impressão digital."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Quando você vê este ícone, também pode autorizar compras ou fazer login em apps."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Pular configuração da impressão digital?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Você optou por usar a impressão digital como uma maneira de desbloquear seu smartphone. Se você pular agora, precisará fazer essa configuração mais tarde. A configuração demora apenas um minuto aproximadamente."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurar bloqueio de tela"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Atualizar endereço de emergência"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Endereço usado pelos serviços de emergência como sua localização se você ligar para a emergência usando o Wi-Fi"</string>
     <string name="home_settings" msgid="212375129455718176">"Início"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tela"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Ignorar"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Configurar"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Explorar"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Liberar espaço"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Gerenciar armazenamento"</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>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Dispositivo de mídia (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Áudio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Dados em cache"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Outros"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorar <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Outros incluem arquivos compartilhados salvos por apps, arquivos transferidos por download usando a Internet ou o Bluetooth, arquivos Android e assim por diante. \n\nPara ver todo o conteúdo desse <xliff:g id="NAME">^1</xliff:g>, toque em \"Explorar\"."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"O sistema inclui arquivos usados internamente pelo sistema operacional Android. \n\nEsses arquivos não podem ser vistos individualmente."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"É possível que <xliff:g id="USER_0">^1</xliff:g> tenha salvado fotos, músicas, filmes, apps ou outros dados que estão ocupando <xliff:g id="SIZE">^2</xliff:g> de armazenamento. \n\nPara ver os detalhes, alterne para <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Informações legais"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Colaboradores"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Informação regulamentar"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Informações regulatórias"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Informações regulatórias e de segurança"</string>
     <string name="copyright_title" msgid="865906688917260647">"Direitos autorais"</string>
     <string name="license_title" msgid="1990487604356037871">"Licença"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termos e Condições"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN sempre ativa"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Nenhuma VPN adicionada."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Opção \"Sempre ativada\" ativada"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Não compatível com este app"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecione um perfil de VPN para permanecer sempre conectado. O tráfego de rede somente será permitido quando conectado a esta VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Nenhuma"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"A VPN sempre ativa requer um endereço IP para o servidor e o DNS."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"deslizar para desbloquear, senha, padrão, pin"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"desafio de trabalho, trabalho, perfil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"perfil de trabalho, perfil gerenciado, unificar, unificação, trabalho, perfil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Gravar"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Toque em uma marca para gravar…"</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Os dados em segundo plano estão disponíveis apenas via Wi-Fi. Isso poderá afetar alguns apps ou serviços quando o Wi-Fi não estiver disponível."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Perfil de trabalho desativado"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Os apps, a sincronização em segundo plano e outros recursos relacionados com seu perfil de trabalho estão desativados."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Sugestões (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Sugestões"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Remover"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de cor fria"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Usar cores de tela mais frias"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Redefinir contadores de limite de taxa do ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notificações da tela de bloqueio"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar ou ocultar o conteúdo da notificação"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Todas as opções"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Suporte"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Menor largura"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nenhum app instalado solicitou acesso a SMS premium"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Acesso a SMS premium"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Desativado"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Modo de demonstração"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Estamos aqui para ajudar"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Estamos aqui para ajudar você 24 horas por dia, 7 dias por semana"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Nossa equipe de suporte está aqui para ajudar a resolver todos os problemas"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Nossa equipe de suporte está disponível o dia todo, todos os dias"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Horário do suporte por telefone (hora local)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Procure ajuda ou explore dicas e truques"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Suporte para:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Está no exterior?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Tarifas internacionais podem ser aplicadas"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefone"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Bate-papo"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Explorar dicas e truques"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Procurar ajuda e enviar feedback"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Fazer login para receber suporte"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Fazer login"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Não consegue acessar sua conta?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Enviar informações do sistema"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Para ajudar a resolver seu problema rapidamente, precisamos de informações do sistema para diagnóstico."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Não mostrar novamente"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Configurações do perfil de trabalho"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Pesquisa de contatos"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Permitir que sua organização pesquise contatos para identificar autores de chamadas e contatos"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> horas</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> horas</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Tempo aproximado de espera: <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Computador"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Fone de ouvido"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Smartphone"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Headphone"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Periférico de entrada"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Para ajudar a liberar espaço de armazenamento, o gerenciador de armazenamento remove fotos e vídeos do seu dispositivo salvos em backup."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Remover fotos e vídeos"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Gerenciador de armazenamento"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automáticas"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestos"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Ir para a Câmera"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Para abrir a câmera rapidamente, basta tocar duas vezes no botão liga/desliga. O recurso funciona a partir de qualquer tela."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Virar câmera"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Para alternar entre as câmeras frontal e traseira, gire duas vezes."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Verificação rápida de tela"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Para verificar seu smartphone sem ativá-lo completamente, desloque-o ou pegue-o."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Deslizar para ver as notificações"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Para verificar suas notificações a partir de qualquer tela, deslize para baixo no sensor de impressão digital."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Ativado"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Desativado"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"O bootloader já está desbloqueado"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Conecte-se à Internet primeiro"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Indisponível em dispositivos bloqueados pela operadora"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 423d9c0..ce3d14d 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Cor-de-rosa"</item>
     <item msgid="6131821495505931173">"Vermelho"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Mais de 30 dias"</item>
+    <item msgid="2900554746706302178">"Mais de 60 dias"</item>
+    <item msgid="5692284879054004388">"Mais de 90 dias"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-pt-rPT/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-pt-rPT/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-pt-rPT/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 08fdca1..109708b 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Ativar ligação de dados"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Desativar ligação de dados"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE fornecido"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videochamadas fornecidas"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Chamadas Wi-Fi fornecidas"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Potência do rádio celular"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Ver livro de endereços do SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Ver números de marcação fixos"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloq. c/ impressão digital"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Basta tocar no sensor de impressões digitais para desbloquear o telemóvel, autorizar compras ou iniciar sessão em aplicações. Quaisquer impressões digitais adicionadas ao telemóvel podem executar estas ações, pelo que deve ter cuidado com quem adiciona.\n\nNota: a impressão digital pode ser menos segura do que um padrão ou um PIN fortes. "<annotation id="url">"Saiba mais"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Basta tocar no sensor de impressões digitais para desbloquear o telemóvel, autorizar compras ou iniciar sessão em aplicações. Quaisquer impressões digitais adicionadas ao telemóvel podem executar estas ações, pelo que deve ter cuidado com quem adiciona.\n\nNota: a impressão digital pode ser menos segura do que um padrão ou um PIN fortes."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Ignorar"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Eliminar"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Vamos começar!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Coloque o dedo sobre o sensor e levante-o depois de sentir uma vibração"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Ótimo! Agora repita"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Desloque o dedo ligeiramente para adicionar as diferentes partes da sua impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Adicionada!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Quando vir este ícone, pode utilizar a sua impressão digital para identificação ou para autorizar uma compra."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Basta tocar no sensor de impressões digitais para ativar e desbloquear o dispositivo."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Quando vir este ícone, pode utilizar as impressões digitais."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Quando vir este símbolo, também pode autorizar compras ou iniciar sessão nas aplicações."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Ignorar configur. de impressão digital?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Optou por utilizar a sua impressão digital como uma forma de desbloquear o telemóvel. Se ignorar agora, terá de configurar esta opção mais tarde. A configuração demora apenas alguns minutos."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurar o bloqueio de ecrã"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Atualizar o endereço de emergência"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"O endereço utilizado pelos serviços de emergência como a sua localização se fizer uma chamada para o 112 através de Wi-Fi"</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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Esquecer"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Configurar"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Explorar"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Libertar espaço"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Gerir o armazenamento"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Ligação USB do computador"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Ligado como"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Aparelho multimédia (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Áudio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Dados em cache"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Outros"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorar <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Os outros ficheiros incluem ficheiros partilhados guardados por aplicações, ficheiros transferidos da Internet ou através do Bluetooth, ficheiros Android, etc. \n\nPara ver todos os conteúdos deste <xliff:g id="NAME">^1</xliff:g>, toque em Explorar."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"O sistema inclui ficheiros utilizados internamente pelo sistema operativo Android. \n\nNão é possível visualizar estes ficheiros individualmente."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> pode ter fotos, música, filmes, aplicações ou outros dados guardados que estejam a utilizar <xliff:g id="SIZE">^2</xliff:g> de armazenamento. \n\nPara ver detalhes, mude para <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Informações legais"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contribuintes"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Informações regulamentares"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Etiquetas regulamentares"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Informações regulamentares/de segurança"</string>
     <string name="copyright_title" msgid="865906688917260647">"Direitos de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licença"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termos e condições"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN sempre ativa"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Nenhuma VPN adicionada."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Opção Sempre ligada ativa"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Incompatível com esta aplicação"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecione um perfil de VPN para permanecer sempre ligado. O tráfego de rede só será permitido quando ligado a esta VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Nenhuma"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"A VPN sempre ativa requer um endereço IP de servidor e DNS."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"deslizar lentamente para desbloquear, palavra-passe, padrão, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"desafio de trabalho, trabalho, perfil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"perfil de trabalho, perfil gerido, unificar, unificação, trabalho, perfil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Config. etiqueta NFC p/ Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escrever"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Toque numa etiqueta para escrever..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Os dados de segundo plano só estão disponíveis através de Wi-Fi. Isto pode afetar algumas aplicações ou alguns serviços quando o Wi-Fi não estiver disponível."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Perfil de trabalho desativado"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"As aplicações, a sincronização em segundo plano e outras funcionalidades relacionadas com o seu perfil de trabalho estão desativadas."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Sugestões (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Sugestões"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Remover"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura da cor fria"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilizar cores de visualização mais frias"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Pretende repor os contadores do limite de taxa do ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notific. do ecrã de bloqueio"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar ou ocultar conteúdo de notificações"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Todas"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Apoio técnico"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"A menor largura"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nenhuma aplicação instalada solicitou acesso a SMS premium"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Acesso a SMS premium"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Desativado"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Modo de demonstração"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Estamos aqui para ajudar"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Estamos disponíveis 24 horas por dia, 7 dias por semana"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"A nossa equipa de apoio técnico está disponível para ajudar a resolver quaisquer problemas"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"A nossa equipa de apoio técnico está disponível o dia todo, todos os dias"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Horário de atendimento telefónico (hora local)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Procure ajuda ou explore sugestões e truques"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Compatibilidade para:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> – <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Vai viajar para o estrageiro?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Podem aplicar-se custos internacionais"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telemóvel"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Mensagem de chat"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Explorar sugestões e dicas"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Procurar ajuda e enviar comentários"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Inicie sessão para obter apoio técnico"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Iniciar sessão"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Não consegue aceder à sua conta?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Enviar informações do sistema"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Para ajudar a resolver o problema rapidamente, precisamos de informações do sistema para o diagnóstico."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Não mostrar novamente"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Definições do perfil de trabalho"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Pesquisa de contactos"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Permitir pesquisa de contactos por parte da sua entidade para identificar autores das chamadas e contactos"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> horas</item>
+      <item quantity="one">1 hora</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
+      <item quantity="one">1 minuto</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
+      <item quantity="one">1 segundo</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Tempo de espera de ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Computador"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Auscultadores com microfone integrado"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telemóvel"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Auricular"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Periférico de entrada"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Para ajudar a libertar espaço de armazenamento, o gestor de armazenamento remove cópias de segurança de fotos e vídeos do dispositivo."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Remover fotos e vídeos"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Gestor de armazenamento"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automático"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestos"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Aceder à câmara"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Para abrir rapidamente a câmara, toque duas vezes no botão ligar/desligar. Funciona a partir de qualquer ecrã."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Virar a câmara"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Para alternar entre as câmaras frontal e traseira, rode duas vezes."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Verificação rápida do ecrã"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Para consultar o telemóvel sem o ativar completamente, toque suavemente ou pegue no mesmo."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Deslizar rapidamente para consultar as notificações"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Para consultar as notificações a partir de qualquer ecrã, deslize rapidamente para baixo no sensor de impressões digitais."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Ativados"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Desativados"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"O carregador de arranque já está desbloqueado"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Ligar à Internet primeiro"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Indisponível em dispositivos vinculados ao operador"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index d41c483..eeede29 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Rosa"</item>
     <item msgid="6131821495505931173">"Vermelho"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Mais de 30 dias"</item>
+    <item msgid="2900554746706302178">"Mais de 60 dias"</item>
+    <item msgid="5692284879054004388">"Mais de 90 dias"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-pt/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-pt/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-pt/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 7ae3674..915f97c 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Ativar conexão de dados"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Desativar conexão de dados"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Provisionado VoLTE"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videochamadas aprovisionadas"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Chamadas por Wi-Fi aprovisionadas"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Alimentação do rádio celular"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Ver o catálogo de endereços do SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Visualizar números de chamada fixa"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloqueio com digital"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Basta tocar no sensor de impressão digital para desbloquear o smartphone, autorizar compras ou fazer login em apps. Tome cuidado com as impressões digitais que adicionar. Mesmo uma única digital adicionada pode realizar essas ações.\n\nObservação: sua impressão digital pode ser menos segura que um PIN ou padrão forte. "<annotation id="url">"Saiba mais"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Basta tocar no sensor de impressão digital para desbloquear seu smartphone, autorizar compras ou fazer login em apps. Tome cuidado com as impressões digitais que adicionar. Uma única digital adicionada pode realizar todas essas ações.\n\nObservação: sua impressão digital pode ser menos segura que um PIN ou padrão forte."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Pular"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Excluir"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Vamos começar!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Coloque seu dedo no sensor e levante após sentir uma vibração"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Repita o processo"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Mova o dedo levemente para adicionar todas as partes da sua impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Adicionada"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Sempre que esse ícone é exibido, você pode usar sua impressão digital para fins de identificação ou para autorizar uma compra."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Basta tocar no sensor de impressão digital para ativar e desbloquear seu dispositivo."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Sempre que esse ícone é exibido, você pode usar sua impressão digital."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Quando você vê este ícone, também pode autorizar compras ou fazer login em apps."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Pular configuração da impressão digital?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Você optou por usar a impressão digital como uma maneira de desbloquear seu smartphone. Se você pular agora, precisará fazer essa configuração mais tarde. A configuração demora apenas um minuto aproximadamente."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurar bloqueio de tela"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Atualizar endereço de emergência"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Endereço usado pelos serviços de emergência como sua localização se você ligar para a emergência usando o Wi-Fi"</string>
     <string name="home_settings" msgid="212375129455718176">"Início"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tela"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Ignorar"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Configurar"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Explorar"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Liberar espaço"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Gerenciar armazenamento"</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>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Dispositivo de mídia (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Áudio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Dados em cache"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Outros"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorar <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Outros incluem arquivos compartilhados salvos por apps, arquivos transferidos por download usando a Internet ou o Bluetooth, arquivos Android e assim por diante. \n\nPara ver todo o conteúdo desse <xliff:g id="NAME">^1</xliff:g>, toque em \"Explorar\"."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"O sistema inclui arquivos usados internamente pelo sistema operacional Android. \n\nEsses arquivos não podem ser vistos individualmente."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"É possível que <xliff:g id="USER_0">^1</xliff:g> tenha salvado fotos, músicas, filmes, apps ou outros dados que estão ocupando <xliff:g id="SIZE">^2</xliff:g> de armazenamento. \n\nPara ver os detalhes, alterne para <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Informações legais"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Colaboradores"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Informação regulamentar"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Informações regulatórias"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Informações regulatórias e de segurança"</string>
     <string name="copyright_title" msgid="865906688917260647">"Direitos autorais"</string>
     <string name="license_title" msgid="1990487604356037871">"Licença"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termos e Condições"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN sempre ativa"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Nenhuma VPN adicionada."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Opção \"Sempre ativada\" ativada"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Não compatível com este app"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecione um perfil de VPN para permanecer sempre conectado. O tráfego de rede somente será permitido quando conectado a esta VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Nenhuma"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"A VPN sempre ativa requer um endereço IP para o servidor e o DNS."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"deslizar para desbloquear, senha, padrão, pin"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"desafio de trabalho, trabalho, perfil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"perfil de trabalho, perfil gerenciado, unificar, unificação, trabalho, perfil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Gravar"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Toque em uma marca para gravar…"</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Os dados em segundo plano estão disponíveis apenas via Wi-Fi. Isso poderá afetar alguns apps ou serviços quando o Wi-Fi não estiver disponível."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Perfil de trabalho desativado"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Os apps, a sincronização em segundo plano e outros recursos relacionados com seu perfil de trabalho estão desativados."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Sugestões (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Sugestões"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Remover"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de cor fria"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Usar cores de tela mais frias"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Redefinir contadores de limite de taxa do ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notificações da tela de bloqueio"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar ou ocultar o conteúdo da notificação"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Todas as opções"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Suporte"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Menor largura"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nenhum app instalado solicitou acesso a SMS premium"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Acesso a SMS premium"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Desativado"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Modo de demonstração"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Estamos aqui para ajudar"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Estamos aqui para ajudar você 24 horas por dia, 7 dias por semana"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Nossa equipe de suporte está aqui para ajudar a resolver todos os problemas"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Nossa equipe de suporte está disponível o dia todo, todos os dias"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Horário do suporte por telefone (hora local)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Procure ajuda ou explore dicas e truques"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Suporte para:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Está no exterior?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Tarifas internacionais podem ser aplicadas"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefone"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Bate-papo"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Explorar dicas e truques"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Procurar ajuda e enviar feedback"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Fazer login para receber suporte"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Fazer login"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Não consegue acessar sua conta?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Enviar informações do sistema"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Para ajudar a resolver seu problema rapidamente, precisamos de informações do sistema para diagnóstico."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Não mostrar novamente"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Configurações do perfil de trabalho"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Pesquisa de contatos"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Permitir que sua organização pesquise contatos para identificar autores de chamadas e contatos"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> horas</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> horas</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Tempo aproximado de espera: <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Computador"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Fone de ouvido"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Smartphone"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Headphone"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Periférico de entrada"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Para ajudar a liberar espaço de armazenamento, o gerenciador de armazenamento remove fotos e vídeos do seu dispositivo salvos em backup."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Remover fotos e vídeos"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Gerenciador de armazenamento"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automáticas"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestos"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Ir para a Câmera"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Para abrir a câmera rapidamente, basta tocar duas vezes no botão liga/desliga. O recurso funciona a partir de qualquer tela."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Virar câmera"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Para alternar entre as câmeras frontal e traseira, gire duas vezes."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Verificação rápida de tela"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Para verificar seu smartphone sem ativá-lo completamente, desloque-o ou pegue-o."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Deslizar para ver as notificações"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Para verificar suas notificações a partir de qualquer tela, deslize para baixo no sensor de impressão digital."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Ativado"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Desativado"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"O bootloader já está desbloqueado"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Conecte-se à Internet primeiro"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Indisponível em dispositivos bloqueados pela operadora"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index 61968f2..4e5f5e5 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Roz"</item>
     <item msgid="6131821495505931173">"Roșu"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Vechi de peste 30 de zile"</item>
+    <item msgid="2900554746706302178">"Vechi de peste 60 de zile"</item>
+    <item msgid="5692284879054004388">"Vechi de peste 90 de zile"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-ro/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-ro/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-ro/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 1aac8d3..26c1d78 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -40,6 +40,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Activați conexiunea de date"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Dezactivați conexiunea de date"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Oferit de VoLTE"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Apelarea video este configurată"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Apelarea prin Wi-Fi este configurată"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Puterea semnalului radio al celulei"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Afișați agenda de pe SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Afișați numerele fixe de apelare"</string>
@@ -337,7 +339,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Deblocați cu amprenta"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Puteți să deblocați telefonul, să autorizați achiziții sau să vă conectați la aplicații atingând senzorul pentru amprente. Aveți grijă ce amprente adăugați. Aceste acțiuni sunt posibile folosind chiar și o singură amprentă adăugată.\n\nNotă: este posibil ca amprenta să fie mai puțin sigură decât un model sau un cod PIN puternic. "<annotation id="url">"Aflați mai multe"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Puteți să deblocați telefonul, să autorizați achiziții sau să vă conectați la aplicații atingând senzorul pentru amprente. Aveți grijă ce amprente adăugați. Aceste acțiuni sunt posibile folosind chiar și o singură amprentă adăugată.\n\nNotă: este posibil ca amprenta să fie mai puțin sigură decât un model sau un cod PIN puternic."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Anulați"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuați"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Omiteți"</string>
@@ -358,12 +360,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Ștergeți"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Să începem!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Puneți degetul pe senzor și ridicați-l după ce simțiți o vibrație"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Excelent! Încă o dată"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Atingeți în continuare"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Mișcați ușor degetul pentru a adăuga toate porțiunile amprentei"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Amprentă adăugată!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"De fiecare dată când vedeți această pictogramă, vă puteți folosi amprenta pentru identificare sau pentru a autoriza o achiziție."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Ca să activați și să deblocați dispozitivul, este suficient să atingeți senzorul pentru amprentă."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Când vedeți această pictogramă, vă puteți folosi amprenta."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"De asemenea, când se afișează această pictogramă, puteți autoriza achizițiile sau vă puteți conecta la aplicații."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Omiteți configurarea amprentei?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Ați ales ca amprenta să fie una dintre modalitățile de deblocare a telefonului. Dacă omiteți acum această etapă, va trebui să o configurați mai târziu. Configurarea durează în jur de un minut."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurați blocarea ecranului"</string>
@@ -844,6 +846,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Actualizați adresa de urgență"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Adresa folosită de serviciile de urgență ca locație a dvs. dacă apelați 911 prin Wi-Fi"</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>
@@ -1065,6 +1069,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Ștergeți"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Configurați"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Explorați"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Eliberați spațiu"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Gestionați spațiul de stocare"</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>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Dispozitiv media (MTP)"</string>
@@ -1101,8 +1107,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Datele memorate în cache"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Altele"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorați <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Pot fi incluse fișiere trimise care au fost salvate de aplicații, fișiere descărcate de pe internet sau prin Bluetooth, fișiere Android și altele. \n\nPentru a vedea întregul conținut al stocării <xliff:g id="NAME">^1</xliff:g>, atingeți Explorați."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Sistemul include fișiere folosite intern de sistemul de operare Android. \n\nAceste fișiere nu pot fi afișate individual."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Este posibil ca <xliff:g id="USER_0">^1</xliff:g> să fi salvat fotografii, muzică, filme, aplicați sau alte date care ocupă <xliff:g id="SIZE">^2</xliff:g> din spațiul de stocare. \n\nPentru a vedea detaliile, comutați la <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1293,7 +1301,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Informații de ordin juridic"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Colaboratori"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Informații reglementare"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Etichete de reglementări"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Informații despre siguranță/reglementări"</string>
     <string name="copyright_title" msgid="865906688917260647">"Drept de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licență"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termeni și condiții"</string>
@@ -2247,6 +2256,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Rețea VPN activată permanent"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Nicio rețea VPN adăugată."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Opțiunea Activă întotdeauna e activată"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Nu este acceptată de această aplicație"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selectați un profil VPN pentru a rămâne conectat întotdeauna la rețea. Traficul de rețea va fi permis numai atunci când sunteți conectat(ă) la această rețea VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Niciuna"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Activarea permanentă a rețelei VPN necesită o adresă IP, atât pentru server, cât și pentru DNS."</string>
@@ -2519,6 +2529,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"glisați pentru a debloca, parolă, model, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"provocare la serviciu, serviciu, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"profil de serviciu, profil gestionat, unificați, unificare, serviciu, profil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"gest"</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>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Atingeți o etichetă pentru a scrie..."</string>
@@ -3020,7 +3031,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Datele de fundal sunt disponibile doar prin Wi-Fi. Este posibil ca unele aplicații sau servicii să fie afectate când conexiunea Wi-Fi nu este disponibilă."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Profil de serviciu dezactivat"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Aplicațiile, sincronizarea în fundal și alte funcții asociate profilului de serviciu sunt dezactivate."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Sugestii (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Sugestii"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Eliminați"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura culorii: rece"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Folosiți culori mai reci pentru afișare"</string>
@@ -3114,6 +3126,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Resetați contoarele de limitare a frecvenței ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlați notificările pe ecranul de blocare"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Afișați sau ascundeți conținutul notificării"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Toate"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Asistență"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Cea mai mică lățime"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nicio aplicație instalată nu a solicitat accesul la SMS-urile premium"</string>
@@ -3121,9 +3135,46 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Acces la SMS-uri premium"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Dezactivat"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Modul demonstrativ"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Suntem aici pentru a vă ajuta"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Vă stăm la dispoziție non-stop"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Echipa de asistență vă stă la dispoziție pentru a se ocupa de orice problemă"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Echipa de asistență este disponibilă non-stop"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Programul de lucru pentru asistența telefonică (ora locală)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Căutați în secțiunea de ajutor sau explorați sfaturi și trucuri"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Asistență pentru:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> – <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Călătoriți în străinătate?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Se pot aplica taxe internaționale"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Explorați sfaturi și trucuri"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Căutați ajutor și trimiteți feedback"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Conectați-vă pentru asistență"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Conectați-vă"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Nu vă puteți accesa contul?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Trimiteți informațiile despre sistem"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Pentru a remedia problema rapid, avem nevoie de informații despre sistem pentru diagnosticare."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Nu mai afișa"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Setările profilului de serviciu"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Căutarea persoanelor de contact"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Permiteți căutările persoanelor de contact efectuate de organizația dvs. pentru a identifica apelanții și persoanele de contact"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> ore</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> de ore</item>
+      <item quantity="one">O oră</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> de minute</item>
+      <item quantity="one">Un minut</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> secunde</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> de secunde</item>
+      <item quantity="one">O secundă</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Așteptare: aproximativ <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Computer"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Set căști-microfon"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telefon"</string>
@@ -3131,4 +3182,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Căști"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Dispozitiv periferic de intrare"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Pentru a elibera spațiu de stocare, managerul spațiului de stocare elimină de pe dispozitiv fotografiile și videoclipurile cărora le-ați făcut backup."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Eliminați fotografii și videoclipuri"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Managerul spațiului de stocare"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automat"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuale"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Gesturi"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Accesați camera foto"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Pentru a deschide rapid camera foto, atingeți de două ori butonul de pornire. Funcționează din orice ecran."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Comutați camera foto"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Pentru a comuta între camera foto frontală și cea din spate, răsuciți de două ori."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Verificare rapidă a ecranului"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Pentru a verifica telefonul fără să îl activați complet, mișcați-l sau ridicați-l."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Glisați pentru notificări"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Pentru a verifica notificările din orice ecran, glisați în jos pe senzorul de amprentă."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Activat"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Dezactivat"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloaderul este deja deblocat"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Mai întâi, conectați-vă la internet"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Nu este disponibilă pe dispozitivele blocate de operator"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 4af3985..c1104b2 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Розовый"</item>
     <item msgid="6131821495505931173">"Красный"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Добавленные более 30 дней назад"</item>
+    <item msgid="2900554746706302178">"Добавленные более 60 дней назад"</item>
+    <item msgid="5692284879054004388">"Добавленные более 60 дней назад"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-ru/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-ru/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-ru/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 5015b5d..05ee8b1 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -41,6 +41,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Включить передачу данных"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Отключить передачу данных"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Синхронизация VoLTE включена"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Видеосвязь предоставлена"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Связь по Wi-Fi предоставлена"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Мощность радиосигнала"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Просмотреть адресную книгу на SIM-карте"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Просм. список разреш. номеров"</string>
@@ -340,7 +342,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Сканер отпечатков пальцев"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Чтобы разблокировать телефон, подтвердить покупку или войти в приложение, приложите палец к сканеру отпечатков. Сохраните на устройстве отпечатки тех, кому вы доверяете, и они тоже смогут это делать.\n\nУчтите, что распознавание отпечатков защищает не так надежно, как графический ключ или PIN-код. "<annotation id="url">"Подробнее…"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Чтобы разблокировать телефон, подтвердить покупку или войти в приложение, приложите палец к сканеру отпечатков. Сохраните на устройстве отпечатки тех, кому вы доверяете, и они тоже смогут это делать.\n\nУчтите, что распознавание отпечатков защищает не так надежно, как графический ключ или PIN-код."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Отмена"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Продолжить"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Пропустить"</string>
@@ -361,12 +363,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Удалить"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Начнем!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Приложите палец к сканеру и удерживайте, пока не почувствуете вибрацию."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Приложите палец снова"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Нажмите ещё раз"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Немного перемещайте палец, чтобы получить полный отпечаток."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Отпечаток добавлен!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Этот значок сообщает, что вы можете подтверждать покупки и проходить индентификацию с помощью отпечатка пальца."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Чтобы разблокировать устройство, приложите палец к сканеру."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Этот значок сообщает, что вы можете использовать отпечаток пальца."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Этот значок означает, что вы можете подтверждать покупки и входить в приложения."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Не настраивать доступ по отпечаткам?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Для разблокировки телефона вы выбрали сканирование отпечатка пальца. Настройка займет около минуты. Если вы пропустите ее сейчас, вам все равно придется сделать это позже."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Настроить блокировку экрана"</string>
@@ -853,6 +855,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Когда функция \"Звонки по Wi-Fi\" включена, для исходящих вызовов может использоваться как Wi-Fi, так и мобильная сеть (в зависимости от ваших предпочтений и уровня сигнала). Прежде чем включить эту функцию, свяжитесь со своим оператором и уточните детали."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"Изменение адреса для экстренных случаев"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Адрес, по которому будут направлены экстренные службы в случае вызова по номеру 112 через сеть 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>
@@ -1075,6 +1079,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Забыть устройство"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Настроить"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Открыть"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Освободить место"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Управление хранилищем"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-подключение к компьютеру"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Подключить как"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Медиа-устройство (MTP)"</string>
@@ -1111,8 +1117,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Аудио"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Данные кеша"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Другое"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Система"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Документы с общим доступом, сохраненные приложениями, контент, скачанный из Интернета или по Bluetooth, служебные файлы Android и т. д.\n\nЧтобы узнать, какие данные есть на устройстве (<xliff:g id="NAME">^1</xliff:g>), нажмите \"Открыть\"."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Система включает файлы, используемые операционной системой Android.\n\nОни недоступны для просмотра."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g>, возможно, хранит на запоминающем устройстве фотографии, музыку, приложения и другие данные общим объемом <xliff:g id="SIZE">^2</xliff:g>. \n\nЧтобы проверить это, войдите в аккаунт пользователя <xliff:g id="USER_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>
@@ -1303,7 +1311,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Юридическая информация"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Участники"</string>
     <string name="manual" msgid="3025943393642974445">"Руководство"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Сертификация"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Ярлыки сертификации"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Безопасность и сертификация"</string>
     <string name="copyright_title" msgid="865906688917260647">"Авторские права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лицензия"</string>
     <string name="terms_title" msgid="7697580845616764642">"Условия использования"</string>
@@ -2264,6 +2273,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Постоянная VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Сети VPN не добавлены."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Активная"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Не поддерживается в этом приложении"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Выберите постоянную сеть VPN: трафик будет разрешен только при подключении к этой сети."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Не использовать"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Укажите IP-адрес для сервера и DNS."</string>
@@ -2540,6 +2550,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"провести для разблокировки, пароль, графический ключ, PIN-код"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"защита рабочего профиля, рабочий, профиль"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"рабочий профиль, управляемый профиль, объединить, объединение, работа, профиль"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"жест"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Настройка NFC-метки"</string>
     <string name="write_tag" msgid="8571858602896222537">"Записать"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Нажмите на метку, чтобы начать запись..."</string>
@@ -3051,7 +3062,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Для обмена данными в фоновом режиме требуется подключение к сети Wi-Fi. Когда она недоступна, некоторые сервисы и приложения не будут работать."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Рабочий профиль отключен"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Приложения, фоновая синхронизация и другие функции, связанные с вашим рабочим профилем, отключены."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Подсказки (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Подсказки"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Убрать"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Холодные оттенки"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Использовать более холодные цвета на экране"</string>
@@ -3146,6 +3158,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Сбросить счетчики ограничения скорости для ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Управление уведомлениями на заблокированном экране"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Скрыть или показать содержание уведомлений"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Все"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Поддержка"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Минимальная ширина"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Нет приложений с доступом к платным SMS"</string>
@@ -3153,9 +3167,49 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Доступ к платным SMS"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Отключен"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Демонстрация"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Мы всегда рады помочь"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Служба поддержки работает круглосуточно"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Мы будем рады помочь вам"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Мы готовы помочь вам в любое время дня и ночи"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Позвоните нам в течение рабочего дня (указано местное время):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Выполните поиск по Справочному центру или изучите наши рекомендации"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Служба поддержки:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> – <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Вы за границей?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Может взиматься плата за международные звонки"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Позвонить"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Написать в чате"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Изучите наши рекомендации"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Выполните поиск по Справочному центру и отправьте отзыв"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Войдите в аккаунт, чтобы связаться со службой поддержки"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Войти"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Не удается войти в аккаунт?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Отправьте информацию о системе"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Чтобы быстрее диагностировать и решить проблему, нам нужна информация о системе."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Больше не показывать"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Настройки рабочего профиля"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Поиск контактов"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Разрешить поиск контактов в организации для определения вызывающих абонентов"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> час</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> часа</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> часов</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> часа</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> минута</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> минуты</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> минут</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> минуты</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> секунда</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> секунды</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> секунд</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> секунды</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Ожидание: примерно <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Компьютер"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Гарнитура"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Телефон"</string>
@@ -3163,4 +3217,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Наушники"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Периферийное устройство ввода"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Чтобы освободить место, менеджер хранилища удаляет с устройства фото и видео, для которых есть резервные копии."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Удалять фото и видео"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Менеджер хранилища"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Автоматически"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Вручную"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Жесты"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Быстрый доступ к камере"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Открывать камеру двойным нажатием кнопки питания на любом экране"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Быстрое переключение между камерами"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Переключаться между основной и фронтальной камерами движением запястья"</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Автоматическое включение экрана"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Показывать время и уведомления, когда вы берете устройство в руки, не снимая блокировку экрана"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Быстрый доступ к уведомлениям"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Показывать уведомления, когда вы проводите вниз по сканеру отпечатков пальцев на любом экране"</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Вкл."</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Выкл."</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Загрузчик ОС уже разблокирован"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Подключитесь к Интернету"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Недоступно на телефонах, привязанных к оператору"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-si-rLK/arrays.xml b/res/values-si-rLK/arrays.xml
index a0f8db6..9f52444 100644
--- a/res/values-si-rLK/arrays.xml
+++ b/res/values-si-rLK/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"රෝස"</item>
     <item msgid="6131821495505931173">"රතු"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"දින 30කට වඩා පැරණි"</item>
+    <item msgid="2900554746706302178">"දින 60කට වඩා පැරණි"</item>
+    <item msgid="5692284879054004388">"දින 90කට වඩා පැරණි"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-si-rLK/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-si-rLK/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-si-rLK/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index c10d200..434d480 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"දත්ත සබැඳුම සබල කරන්න"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"දත්ත සබැඳුම අබල කරන්න"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE ප්රතිපාදන ලත්"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"වීඩියෝ ඇමතුම් ප්‍රතිපාදනය"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi ඇමතුම් ප්‍රතිපාදනය"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"සෙලියුලර් රේඩියෝ බලය"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM ලිපින පොත බලන්න"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ස්ථිර ඇමතුම් අංක පෙන්වන්න"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"ඇඟිලි සලකුණ සමගින් අගුලු හරින්න"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"ඔබේ දුරකථනය අගුලු හැරීමට, මිලදී ගැනීම් අනුමත කිරීමට, හෝ යෙදුම් වෙත පිරීමට ඇඟිලි සලකුණු සංවේදකය ස්පර්ශ කරන්න. ඔබ එක් කරන ඇඟිලි සලකුණු පිළිබඳ සැලකිලිමත් වන්න. එක් කරන ලද එක් සලකුණකට පවා මෙම දේවල්වලින් ඕනෑම එකක් කිරීමට හැකිය.\n\nසටහන: ඔබේ ඇඟිලි සලකුණ ප්‍රබල රටාවකට හෝ PIN අංකයකට වඩා ආරක්ෂාකාරී බව අඩු විය හැකිය. "<annotation id="url">"තව දැන ගන්න"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"ඔබේ දුරකථනය අවදි කිරීමට සහ අගුලු හැරීමට, මිලදී ගැනීම් අනුමත කිරීමට, හෝ යෙදුම් වෙත පිරීමට ඇඟිලි සලකුණු සංවේදකය ස්පර්ශ කරන්න. ඔබ කාගේ ඇඟිලි සලකුණු එක් කරන්නේද යන්න ගැන සැලකිලිමත් වන්න. එක් කළ එක් සලකුණකට පවා මෙම දේවල්වලින් ඕනෑම එකක් කළ හැකිය.\n\nසටහන: ඔබේ ඇඟිලි සලකුණ ප්‍රබල රටාවකට හෝ PIN අංකයකට වඩා ආරක්ෂාකාරී බව අඩු විය හැකිය."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"අවලංගු කරන්න"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"දිගටම කර ගෙන යන්න"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"මඟ හරින්න"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"මකන්න"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"පටන් ගනිමු!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ඔබගේ ඇඟිල්ල සංවේදකය මත තබා කම්පනයක් දැනෙන විට ඔසවන්න"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"හොඳයි! දැන් නැවත කරන්න"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"දිගටම කර ගෙන යන්න"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"ඔබගේ ඇඟිලි සලකුණේ වෙනස් කොටස් සියල්ල එක් කිරීම සඳහා ඔබගේ ඇඟිල්ල යන්තමින් වෙනස් කරන්න"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"ඇඟිලි සලකුණ එකතු කරන ලදි."</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"මෙම නිරූපකය ඔබ දුටු විට, ඔබව හඳුනා ගැනීම සඳහා හෝ මිලදි ගැනීමක් සඳහා අනුමැතිය දීමට ඔබගේ ඇඟිලි සලකුණු යොදා ගත හැක."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"ඔබේ උපාංගය අවදි කර අගුලු හැරීමට ඇඟිලි සලකුණු සංවේදකය ස්පර්ශ කරන්න."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"ඔබ මෙම අයිකනය දකින විට, ඔබට ඔබේ ඇඟිලි සලකුණ භාවිත කළ හැකිය."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"ඔබ මෙම නිරූපකය දුටු විට, ඔබට මිලදී ගැනීම්වලට බලය දීමට හෝ යෙදුම්වලට පිරීමටද හැකිය."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ඇඟිලි සලකුණ පිහිටුවීම මග හරින්නද?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"ඔබ ඔබේ දුරකථනය අගුලු හැරීමේ එක් ක්‍රමයක් ලෙස ඔබේ ඇඟිලි සලකුණ භාවිත කිරීම තෝරා ඇත. ඔබ දැන් මග හැරියොත්, ඔබට මෙය පසුව පිහිටුවීමට අවශ්‍ය වනු ඇත. පිහිටුවීම මිනිත්තුවක් හෝ කිහිපයක් ගනු ඇත."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"තිර අගුළු දැමීම සකසන්න"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi ඇමතීම ක්‍රියාත්මකයි, ඔබේ දුරකථනයට ඔබේ මනාපය සහ සංඥා ප්‍රබලතාව අනුව, Wi-Fi ජාල හරහා හෝ ඔබේ වාහකයේ ජාලය හරහා ඇමතුම් ගමන් කරවිය හැකිය. මෙම විශේෂාංගය ක්‍රියාත්මක කිරීමට පෙර, ගාස්තු සහ අනෙකුත් විස්තර පිළිබඳව ඔබේ වාහකය සමගින් පරීක්ෂා කර බලන්න."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"හදිසි අවස්ථා ලිපිනය යාවත්කාලීන කරන්න"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"ඔබ WiFi භාවිත කර 911 වෙත ඇමතුමක් කළ විට හදිසි අවස්ථා සේවා විසින් භාවිත කරන ලිපිනය"</string>
     <string name="home_settings" msgid="212375129455718176">"මුල් පිටුව"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"දර්ශනය"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ශබ්ද"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"අමතක කරන්න"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"පිහිටුවන්න"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"ගවේෂණය කරන්න"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"ඉඩ නිදහස් කර ගන්න"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"ගබඩාව කළමනාකරණය කරන්න"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB පරිගණක සම්බන්ධය"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"ලෙස සම්බන්ධ වෙන්න"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"මාධ්‍ය උපාංගය (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"ශ්‍රව්‍යය"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"හැඹිලිගත දත්ත"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"වෙනත්"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"පද්ධතිය"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> ගවේෂණය කරන්න"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"වෙනත් ඒවාට යෙදුම් විසින් සුරැකි බෙදා ගන්නා ලද ගොනු, අන්තර්ජාලය හෝ බ්ලූටූත් වෙතින් බාගත් ගොනු, Android ගොනු සහ තවත් දේ ඇතුළත් විය හැකිය. \n\nමෙම <xliff:g id="NAME">^1</xliff:g>හි මුළු අන්තර්ගතය බැලීමට, ගවේෂණය කරන්න තට්ටු කරන්න."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"පද්ධතියට Android මෙහෙයුම් පද්ධතිය විසින් අභ්‍යන්තරව භාවිත කළ ගොනු ඇතුළත්ය. \n\nමෙම ගොනු තනි තනිව බැලීමට නොහැකිය."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> හට ගබඩාවෙන් <xliff:g id="SIZE">^2</xliff:g> ක් ගන්නා සුරැකි ඡායාරූප, සංගීතය, චිත්‍රපට, යෙදුම්, හෝ වෙනත් දත්ත තිබිය හැකිය. \n\nවිස්තර බැලීමට, <xliff:g id="USER_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>
@@ -1285,7 +1293,8 @@
     <string name="legal_information" msgid="5769301644270604095">"නීතිමය තොරතුරු"</string>
     <string name="contributors_title" msgid="5917703088825286504">"දායකයන්"</string>
     <string name="manual" msgid="3025943393642974445">"අත්පොත"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"යාමන තොරතුරු"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"නියාමන ලේබල"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"ආරක්ෂාව සහ නියාමන තොරතුරු"</string>
     <string name="copyright_title" msgid="865906688917260647">"ප්‍රකාශන හිමිකම"</string>
     <string name="license_title" msgid="1990487604356037871">"බලපත්‍රය"</string>
     <string name="terms_title" msgid="7697580845616764642">"නියමයන් සහ කොන්දේසි"</string>
@@ -2232,6 +2241,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"සැමවිට-සක්‍රිය VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"VPN එක් කර නැත."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"සැම විටම ක්‍රියාකාරීව ඇති"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"මෙම යෙදුම මගින් සහාය නොදක්වයි"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"සෑම විටම සම්බන්ධ වී පැවතීමට VPN පැතිකඩක් තෝරන්න. මෙම VPN හා සම්බන්ධවී ඇතිවිට පමණක් ජාල ගමනාගමනයට අවසර ඇත."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"කිසිවක් නැත"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"සේවාදායක සහ DNS සඳහා සෑම විටම සක්‍රිය VPN සඳහා IP ලිපිනයක් අවශ්‍ය වේ."</string>
@@ -2500,6 +2510,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"අගුලු හැරීමට ස්ලයිඩ කරන්න, මුරපදය, රටාව, pin"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"වැඩ අභියෝගය, වැඩ, පැතිකඩ"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"කාර්යාල පැතිකඩ, කළමනාකරණය කළ පැතිකඩ, ඒකාබද්ධ, ඒකාබද්ධ කිරීම, කාර්යාල, පැතිකඩ"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"ඉංගිතය"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ටැගයක් ස්ථාපනය කරන්න"</string>
     <string name="write_tag" msgid="8571858602896222537">"ලියනවා"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ලිවීමට ටැගයට තට්ටු කරන්න..."</string>
@@ -2991,7 +3002,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"පසුබිම් දත්ත Wi-Fi හරහා පමණක් ලබා ගත හැකිය. Wi-Fi ලබා ගත නොහැකි වූ විට මෙය සමහර යෙදුම් හෝ සේවා කෙරෙහි බලපෑ හැකිය."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"කාර්යාල පැතිකඩ අක්‍රියයි"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"යෙදුම්, පසුබිම් සමමුහුර්ත කිරීම, සහ ඔබේ වැඩ පැතිකඩ හා සම්බන්ධ අනෙකුත් විශේෂාංග ක්‍රියාවිරහිතයි."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"යෝජනා (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"යෝජනා"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"ඉවත් කරන්න"</string>
     <string name="color_temperature" msgid="2070126836910615605">"සිසිල් වර්ණ උෂ්ණත්වය"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"වඩා සිසිල් සංදර්ශක වර්ණ භාවිත කිරීම"</string>
@@ -3084,6 +3096,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager අගය-සීමා කිරීමේ ගණන් කිරීම් යළි සකසන්නද?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"අගුලු තිර දැනුම්දීම් පාලනය කරන්න"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"දැනුම්දීම් අන්තර්ගතය පෙන්වන්න නැතහොත් සඟවන්න"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"සියලු"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"සහාය"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"කුඩාම පළල"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"කිසිදු ස්ථාපනය කළ යෙදුමක් වාරික SMS ප්රවේශ ඉල්ලා නැත"</string>
@@ -3091,9 +3105,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"වාරික SMS ප්රවේශය"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"අබලයි"</string>
     <string name="demo_mode" msgid="2655748420527206870">"ආදර්ශන ප්‍රකාරය"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"උදවු කිරීමට අප මෙතැනය"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"අප දින 7 පැය 24 පුරා ඔබ වෙනුවෙන් මෙතැනය"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"අපගේ සහාය කණ්ඩායම කිනම් හෝ ගැටලු විසඳීමට මෙතැනය"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"අපගේ සහාය කණ්ඩායම සෑම දිනකම, දවස පුරා මෙහි සිටියි"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"දුරකථන සහාය ඇති පැය (දේශීය වේලාව)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"උදවු සොයන්න නැතහොත් ඉඟි සහ උපක්‍රම ගවේෂණය කරන්න"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"මෙය සඳහා සහාය:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"පිටරට සංචාරය කරන්නේද?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"ජාත්‍යන්තර ගාස්තු අදාළ විය හැකිය"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"දුරකථනය"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"කතාබහ"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"ඉඟි සහ උපක්‍රම ගවේෂණය කරන්න"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"උදවු සොයන්න සහ ප්‍රතිපෝෂණ යවන්න"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"සහාය සඳහා පුරන්න"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"පුරන්න"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"ඔබගේ ගිණුමට පිවිසීමට නොහැකිද?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"පද්ධති තොරතුරු යවන්න"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"ඔබගේ ගැටලුව ගැන ඉක්මනින් කටයුතු කිරීමට උදවු කිරීම සඳහා, අපට දෝෂ නිර්ණයට පද්ධති තොරතුරු අවශ්‍යයි."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"නැවත පෙන්වන්න එපා"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"කාර්යාල පැතිකඩ සැකසීම්"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"සම්බන්ධතා සෙවීම"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"අමතන්නන් හා සම්බන්ධතා හඳුනා ගැනීම සඳහා ඔබේ ආයතනයෙන් සම්බන්ධතා සෙවීම් ඉඩ දෙන්න"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one">පැය <xliff:g id="NUMBER">%s</xliff:g></item>
+      <item quantity="other">පැය <xliff:g id="NUMBER">%s</xliff:g></item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one">මිනිත්තු <xliff:g id="NUMBER">%s</xliff:g></item>
+      <item quantity="other">මිනිත්තු <xliff:g id="NUMBER">%s</xliff:g></item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one">තත්පර <xliff:g id="NUMBER">%s</xliff:g></item>
+      <item quantity="other">තත්පර <xliff:g id="NUMBER">%s</xliff:g></item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> රැඳී සිටීම"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"පරිගණකය"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"හෙඩ්සෙට්"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"දුරකථනය"</string>
@@ -3101,4 +3149,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"හෙඩ්ෆෝන්"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"ආදාන උපාංග"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"බ්ලූටූත්"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"ගබඩා ඉඩ නිදහස් කර ගැනීමට උදවු වීමට, ගබඩා කළමනාකරු ඔබේ උපාංගය වෙතින් උපස්ථ කළ ඡායාරූප සහ වීඩියෝ ඉවත් කරයි."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ඡායාරූප සහ වීඩියෝ ඉවත් කරන්න"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"ගබඩා කළමනාකරු"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"ස්වයංක්‍රිය"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"අත්පොත"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"ඉංගිත"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"කැමරා වෙත පනින්න"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"ඉක්මනින් කැමරාව විවෘත කිරීමට, හුදෙක් බලය බොත්තම දෙවරක් තට්ටු කරන්න. ඕනෑම තිරයක සිට ක්රියා කරයි."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ෆ්ලිප් කැමරාව"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"ඉදිරිපස සහ පසුපස කැමරා අතර මාරු වීමට, දෙවරක්-කරකවන්න."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"ඉක්මන් තිර පරීක්ෂාව"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"සම්පූර්ණයෙන් එය අවදි නොකොට ඔබගේ දුරකථනය පරික්ෂා කිරීමට එය සෙමින් අතුල්ලන්න නැතහොත් ඔසවන්න"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"දැනුම්දීම් සඳහා ස්වයිප් කරන්න"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"ඕනෑම තිරයකින් ඔබගේ දැනුම්දීම් පරීක්ෂා කිරීම සඳහා, ඇඟිලි සලකුණු සංවේදකය මත පහළට ස්වයිප් කරන්න."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"ක්‍රියාත්මකයි"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"ක්‍රියාවිරහිතයි"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader දැනටමත් අගුලු හැර ඇත"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"පළමුව අන්තර්ජාලයට සම්බන්ධ වන්න"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"වාහක-අගුලු දැමූ සමහර උපාංග මත ලබා ගත නොහැකිය"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 2658da2..186b3a2 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Ružová"</item>
     <item msgid="6131821495505931173">"Červená"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Staršie ako 30 dní"</item>
+    <item msgid="2900554746706302178">"Staršie ako 60 dní"</item>
+    <item msgid="5692284879054004388">"Staršie ako 90 dní"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-sk/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-sk/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-sk/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 00fe0fc..2d10300 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -41,6 +41,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Povoliť dátové pripojenie"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Zakázať dátové pripojenie"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Poskytované VoLTE"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Poskytované videohovory"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Poskytované volanie cez Wi-Fi"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Napájanie mobilného pripojenia"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Zobraziť adresár SIM karty"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Zobraziť povolené čísla"</string>
@@ -340,7 +342,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Odomknutie odtlačkom prsta"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Ak chcete odomknúť telefón, autorizovať nákupy alebo sa prihlásiť do aplikácií, stačí sa dotknúť senzora odtlačkov prstov. Dávajte pozor, čie odtlačky pridáte. Tieto operácie bude môcť vykonávať každý pridaný odtlačok.\n\nPoznámka: Odtlačok môže byť menej bezpečný ako silný bezpečnostný vzor alebo kód PIN. "<annotation id="url">"Ďalšie informácie"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Ak chcete odomknúť telefón, schváliť nákupy alebo sa prihlásiť do aplikácií, stačí sa dotknúť senzora odtlačkov prstov. Dobre zvážte, čie odtlačky pridáte. Tieto operácie bude totiž možné vykonávať pomocou každého pridaného odtlačku.\n\nPoznámka: Odtlačok môže byť menej bezpečný ako silný bezpečnostný vzor alebo kód PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Zrušiť"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Pokračovať"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Preskočiť"</string>
@@ -361,12 +363,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Odstrániť"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Začíname!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Priložte prst k senzoru a zdvihnite ho, keď zacítite vibráciu."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Skvelé! Zopakujte to"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Pokračujte"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Pohýbte zľahka prstom, aby ste pridali všetky odlišné časti vášho odtlačku"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Odtlačok bol pridaný!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kedykoľvek uvidíte túto ikonu, môžete na identifikáciu alebo povolenie nákupu použiť odtlačok prsta."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Ak chcete prebudiť a odomknúť svoje zariadenie, stačí sa dotknúť senzora odtlačkov prstov."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Keď uvidíte túto ikonu, môžete použiť odtlačok prsta."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Keď uvidíte túto ikonu, môžete tiež autorizovať nákupy alebo sa prihlásiť do aplikácií."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Preskočiť nastavenie odtlačkov prstov?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Vybrali ste, že chcete používať odtlačok prsta ako jeden zo spôsobov odomknutia telefónu. Ak tento krok preskočíte, budete musieť odtlačok nastaviť neskôr. Trvá to približne minútu."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Nastaviť zámku obrazovky"</string>
@@ -853,6 +855,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Aktualizácia núdzovej adresy"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Adresa, ktorej polohu použijú tiesňové služby, keď zavoláte linku 112 pomocou Wi-Fi"</string>
     <string name="home_settings" msgid="212375129455718176">"Domovská stránka"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Obrazovka"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
@@ -1075,6 +1079,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Odstrániť záznam"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Nastaviť"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Preskúmať"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Uvoľnite miesto"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Spravovať úložisko"</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>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Zariadenie pre médiá (MTP)"</string>
@@ -1111,8 +1117,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Zvuk"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Dáta vo vyrovnávacej pamäti"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Iné"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Systém"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Preskúmať položku <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Priečinok Iné obsahuje zdieľané súbory uložené aplikáciami, súbory stiahnuté z internetu alebo prostredníctvom rozhrania Bluetooth, súbory Androidu atď. \n\nAk si chcete zobraziť celý obsah úložiska <xliff:g id="NAME">^1</xliff:g>, klepnite na tlačidlo Preskúmať."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Systém obsahuje súbory interne používané operačným systémom Android. \n\nNemôžete si ich zobraziť individuálne."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Používateľ <xliff:g id="USER_0">^1</xliff:g> má pravdepodobne uložené fotky, hudbu, filmy, aplikácie alebo iné údaje, ktoré v úložisku zaberajú <xliff:g id="SIZE">^2</xliff:g>. \n\nAk si chcete zobraziť podrobné informácie, prepnite na používateľa <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1303,7 +1311,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Právne informácie"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Prispievatelia"</string>
     <string name="manual" msgid="3025943393642974445">"Príručka"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Regulačné informácie"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Regulačné štítky"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Bezpečnostné a regulačné pokyny"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autorské práva"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencia"</string>
     <string name="terms_title" msgid="7697580845616764642">"Zmluvné podmienky"</string>
@@ -2264,6 +2273,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Vždy zapnutá VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Neboli pridané žiadne siete VPN."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Vždy zapnuté VPN je aktívne"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Nepodporované touto aplikáciou"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Vyberte profil VPN, ku ktorému chcete mať vždy pripojenie. Sieťová premávka bude povolená len v prípade pripojenia k tejto sieti VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Žiadna"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Vždy zapnutá sieť VPN vyžaduje adresu IP pre server aj DNS."</string>
@@ -2540,6 +2550,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"odomknúť prejdením prstom, heslo, vzor, pin"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"pracovná výzva, práca, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"pracovný profil, spravovaný profil, zjednotiť, zjednotenie, práca, profil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavenie štítka NFC pre Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapísať"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Klepnutím na značku začnete zápis..."</string>
@@ -3051,7 +3062,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Dáta na pozadí sú dostupné iba prostredníctvom siete Wi-Fi. Môže to ovplyvniť niektoré aplikácie či služby, keď sieť Wi-Fi nie je dostupná."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Pracovný profil je vypnutý"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Aplikácie, synchronizácia na pozadí a ďalšie funkcie súvisiace s pracovným profilom sú vypnuté."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Návrhy (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Návrhy"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Odstrániť"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Studená teplota farby"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Používať studenšie farby obrazovky"</string>
@@ -3146,6 +3158,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Resetovať počítadlá na obmedzenie frekvencie žiadostí v službe ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Ovládajte upozornenia na zamk. obrazovke"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Zobrazujte si obsah upozornení alebo ho skryte"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Všetko"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Podpora"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Minimálna šírka"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Prístup k prémiovým správam SMS si nevyžiadali žiadne nainštalované aplikácie"</string>
@@ -3153,9 +3167,49 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Prístup k prémiovým správam SMS"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Vypnuté"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Režim ukážky"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Radi vám pomôžeme"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Sme tu pre vás nepretržite"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Náš tím podpory vám s radosťou pomôže vyriešiť akékoľvek problémy"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Náš tím podpory je k dispozícii nepretržite"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Pracovné hodiny podpory (miestny čas)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Vyhľadajte pomoc alebo preskúmajte tipy a triky"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Podpora pre:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> – <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Cestujete do zahraničia?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Môžu sa účtovať medzinárodné poplatky"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefón"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Četovať"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Preskúmať tipy a triky"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Hľadať v pomocníkovi a odoslať spätnú väzbu"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Ak chcete získať podporu, prihláste sa"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Prihlásiť sa"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Nemáte prístup k účtu?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Odoslanie informácií o systéme"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Ak vám máme čo najrýchlejšie pomôcť s vaším problémom, potrebujeme informácie o systéme na diagnózu."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Nabudúce nezobrazovať"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Nastavenia pracovného profilu"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Vyhľadávanie kontaktov"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Povoliť vašej organizácii hľadať kontakty na identifikáciu volajúcich a kontaktov"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> hodiny</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> hodiny</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> hodín</item>
+      <item quantity="one">1 hodina</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> minúty</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> minúty</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minút</item>
+      <item quantity="one">1 minúta</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> sekundy</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> sekundy</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekúnd</item>
+      <item quantity="one">1 sekunda</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Približné čakanie: <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Počítač"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Náhlavná súprava"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telefón"</string>
@@ -3163,4 +3217,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Slúchadlá"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Periférne vstupné zariadenie"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Správca úložiska odstraňuje zálohované fotky a videá z vášho zariadenia, čím pomáha uvoľniť miesto v úložisku."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Odstrániť fotky a videá"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Správca úložiska"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automaticky"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Ručne"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestá"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Prechod na Fotoaparát"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Fotoaparát rýchlo otvoríte dvojitým klepnutím na vypínač (funguje to na ľubovoľnej obrazovke)."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Prepnutie fotoaparátov"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Medzi predným a zadným fotoaparátom prepnete dvojitým pretočením."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Rýchla kontrola informácií na obrazovke"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Ak chcete skontrolovať informácie na telefóne bez toho, aby ste ho zobudili z režimu spánku, postrčte ho alebo ho zodvihnite."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Zobrazenie upozornení prejdením prstom"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Upozornenia zobrazíte na ľubovoľnej obrazovke prejdením prstom nadol po senzore odtlačkov prstov."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Zapnuté"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Vypnuté"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader je už odomknutý"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Najprv sa pripojte k internetu"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Nedostupné na zariadeniach s blokovaním operátora"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index f5bdfe3..80b5b87 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Rožnata"</item>
     <item msgid="6131821495505931173">"Rdeča"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Starejše od 30 dni"</item>
+    <item msgid="2900554746706302178">"Starejše od 60 dni"</item>
+    <item msgid="5692284879054004388">"Starejše od 90 dni"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-sl/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-sl/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-sl/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 6b20639..2670678 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -41,6 +41,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Omogočanje podatkovne povezave"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Onemogočanje podatkovne povezave"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Pripravljeno za uporabo tehnologije VoLTE"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videoklicanje je pripravljeno"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Klicanje prek Wi-Fi-ja je pripravljeno"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Moč radia mobilne naprave"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Prikaži imenik na kartici SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Prikaži številke za zaporo odhodnih klicev"</string>
@@ -340,7 +342,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Odklepanje s prstnim odtisom"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Preprosto dotaknite se tipala prstnega odtisa, da odklenete telefon, odobrite nakupe ali se prijavite v aplikacije. Pazite, čigave prstne odtise boste dodali. Ta dejanja bo mogoče izvesti že z enim dodanim prstnim odtisom.\n\nOpomba: prstni odtis bo morda manj varen kot zapleten vzorec ali koda PIN. "<annotation id="url">"Več o tem"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Dotaknite se tipala prstnih odtisov, če želite odkleniti telefon, odobriti nakupe ali se prijaviti v aplikacije. Pazite, čigave prstne odtise boste dodali. Ta dejanja bo mogoče izvesti že z enim dodanim prstnim odtisom.\n\nOpomba: prstni odtis bo morda manj varen kot zapleten vzorec ali koda PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Prekliči"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Naprej"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Preskoči"</string>
@@ -361,12 +363,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Izbriši"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Začnimo."</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Položite prst na tipalo in ga dvignite, ko začutite vibriranje"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Odlično! Ponovite to."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Kar tako naprej"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Rahlo premaknite prst, da dodate vse različne dele prstnega odtisa"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Prstni odtis dodan."</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Ko vidite to ikono, lahko za preverjanje istovetnosti ali odobritev nakupa uporabite prstni odtis."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Dotaknite se tipala za prstne odtise, da preklopite napravo iz stanja pripravljenosti in jo odklenete."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Ko je prikazana ta ikona, lahko uporabite prstni odtis."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Ko je prikazana ta ikona, lahko prav tako odobrite nakupe ali se prijavite v aplikacije."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Želite preskočiti nast. prstnega odtisa?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Za odklepanja telefona ste izbrali možnost prstnega odtisa. Če zdaj preskočite, boste to morali nastaviti pozneje. Nastavitev traja samo približno eno minuto."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Nastavi zaklepanje zaslona"</string>
@@ -853,6 +855,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Posodobitev naslova za nujne primere"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Naslov, ki ga službe za ukrepanje v sili uporabljajo kot vaš naslov, če prek Wi-Fi-ja pokličete na številko 911"</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>
@@ -1075,6 +1079,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Pozabi"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Nastavi"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Razišči"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Sprostitev prostora"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Upravljanje shrambe"</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>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Predstavnostna naprava (MTP)"</string>
@@ -1111,8 +1117,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Zvok"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Predpomnjeni podatki"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Drugo"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Razišči: <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Med drugimi datotekami so datoteke, ki jih shranijo aplikacije, datoteke, ki jih prenesete iz interneta ali prek Bluetootha, datoteke sistema Android in druge. \n\nČe si želite ogledati celotno vsebino te naprave za shranjevanje <xliff:g id="NAME">^1</xliff:g>, se dotaknite »Razišči«."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Sistem vključuje datoteke, ki jih interno uporablja operacijski sistem Android. \n\nTeh datotek si ne morete posamično ogledati."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Uporabnik <xliff:g id="USER_0">^1</xliff:g> je morda shranil fotografije, glasbo, filme, aplikacije ali druge podatke, ki zasedajo <xliff:g id="SIZE">^2</xliff:g> shrambe. \n\nČe si želite ogledati podrobnosti, preklopite na uporabnika <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1303,7 +1311,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Pravne informacije"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Sodelavci"</string>
     <string name="manual" msgid="3025943393642974445">"Ročno"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Zakonsko predpisani podatki"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Zakonsko predpisane oznake"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Varnostne in zakonsko predpisane informacije"</string>
     <string name="copyright_title" msgid="865906688917260647">"Avtorska pravica"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenca"</string>
     <string name="terms_title" msgid="7697580845616764642">"Določila in pogoji"</string>
@@ -2264,6 +2273,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Stalno vklopljen VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Dodano ni bilo nobeno omrežje VPN."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Vedno vklopljeno in aktivno"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Ta aplikacija tega ne podpira"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Izberite profil za navidezno zasebno omrežje (VPN), s katerim boste vedno povezani. Omrežni promet bo dovoljen samo prek tega omrežja VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Brez"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Za stalno vklopljeno navidezno zasebno omrežje je potreben naslov IP tako za strežnik kot za DNS."</string>
@@ -2540,6 +2550,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"podrsanje za odklepanje, geslo, vzorec, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"delovna preizkušnja, delo, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"delovni profil, upravljan profil, poenotiti, poenotenje, delo, profil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"poteza"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavitev brezžič. oznake NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapiši"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Dotaknite se oznake za zapisovanje ..."</string>
@@ -3051,7 +3062,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Prenos podatkov v ozadju je na voljo samo prek omrežja Wi-Fi. To morda vpliva na nekatere aplikacije ali storitve, ko omrežje Wi-Fi ni na voljo."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Delovni profil je izklopljen"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Aplikacije, sinhronizacija v ozadju in druge funkcije, povezane z delovnim profilom, so izklopljeni."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Predlogi (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Predlogi"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"in še <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Odstrani"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Hladnejša barvna temperatura"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Uporaba hladnejših barv zaslona"</string>
@@ -3146,6 +3158,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Želite ponastaviti števce omejevanja hitrosti za ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Nadzor obvestil na zaklenjenem zaslonu"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Prikaz ali skrivanje vsebine obvestil"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Vse"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Podpora"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Najmanjša širina"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nobena nameščena aplikacija ni zahtevala dostopa za plačljiva sporočila SMS."</string>
@@ -3153,9 +3167,49 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Dostop za plačljiva sporočila SMS"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Onemogočeno"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Predstavitveni način"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Tu smo, da vam pomagamo"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Na voljo smo vam 24 ur na dan vse dni v tednu"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Skupina za podporo je na voljo, da se posveti morebitnim težavam"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Skupina za podporo je na voljo vsak dan ob vsaki uri"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Delovni čas telefonske podpore (lokalni čas)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Iskanje po pomoči ali raziskovanje nasvetov in zvijač"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Podpora za:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> – <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Potujete po tujini?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Morda boste morali plačati stroške mednarodnih klicev"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Klepet"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Raziskovanje nasvetov in zvijač"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Iskanje po pomoči in pošiljanje povratnih informacij"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Če želite podporo, se prijavite."</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Prijava"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Ali nimate dostopa do računa?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Pošiljanje podatkov o sistemu"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Za hitro diagnosticiranje in odpravljanje težave potrebujemo podatke o sistemu."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Ne prikaži več"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Nastavitve delovnega profila"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Iskanje po stikih"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Organizaciji dovoli iskanje po stikih zaradi prepoznavanja klicateljev in stikov"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ura</item>
+      <item quantity="two"><xliff:g id="NUMBER">%s</xliff:g> uri</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> ure</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ur</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minuta</item>
+      <item quantity="two"><xliff:g id="NUMBER">%s</xliff:g> minuti</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minut</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> sekunda</item>
+      <item quantity="two"><xliff:g id="NUMBER">%s</xliff:g> sekundi</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> sekunde</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekund</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Približna čakalna doba: <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Računalnik"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Slušalke z mikrofonom"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telefon"</string>
@@ -3163,4 +3217,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Slušalka"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Zunanja dodatna oprema"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Upravitelj shrambe vam pomaga sprostiti prostor za shranjevanje, tako da iz naprave odstrani varnostno kopirane fotografije in videoposnetke."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Odstranjevanje fotografij in videoposnetkov"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Upravitelj shrambe"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Samodejno"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Ročno"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Poteze"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Preklop na fotoaparat"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Če želite hitro odpreti fotoaparat, se dvakrat dotaknite gumba za vklop. Deluje na vsakem zaslonu."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Obrat fotoaparata"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Če želite preklopiti med sprednjim in zadnjim fotoaparatom, dvakrat zasukajte."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Hitro preverjanje vsebine zaslonu"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Če želite preveriti vsebino zaslona, ne da bi telefon povsem preklopili iz stanja pripravljenosti, ga dregnite ali dvignite."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Vlečenje za obvestila"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Če si želite ogledati obvestila na katerem koli zaslonu, povlecite navzdol po tipalu prstnih odtisov."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Vklopljeno"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Izklopljeno"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Nalagalnik zagona je že odklenjen"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Najprej vzpostavite povezavo z internetom"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Ni na voljo v napravah, zaklenjenih na operaterja"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-sq-rAL/arrays.xml b/res/values-sq-rAL/arrays.xml
index 6f28424..cc36bc2 100644
--- a/res/values-sq-rAL/arrays.xml
+++ b/res/values-sq-rAL/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Rozë"</item>
     <item msgid="6131821495505931173">"E kuqe"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Mbi 30 ditë të vjetra"</item>
+    <item msgid="2900554746706302178">"Mbi 60 ditë të vjetra"</item>
+    <item msgid="5692284879054004388">"Mbi 90 ditë të vjetra"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-sq-rAL/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-sq-rAL/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-sq-rAL/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index cebf6f5..791a970 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Aktivizo lidhjen e të dhënave"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Çaktivizo lidhjen e të dhënave"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE e përgatitur"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Telefonata me video u parapërgatit"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Telefonata me Wifi u parapërgatit"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Fuqia e radios së rrjetit celular"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Shiko librin e adresave të kartës SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Shiko numrat me telefonim të përzgjedhur"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Shkyçe me gjurmën e gishtit"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Thjesht prek te sensori i gjurmës së gishtit për të shkyçur telefonin, për të autorizuar blerjet ose për t\'u identifikuar tek aplikacionet. Trego kujdes se gjurmët e kujt shton. Çdo gjurmë gishti e shtuar do të mund t\'i kryejë këto gjëra. \n\nShënim: Gjurma jote e gishtit mund të jetë më pak e sigurt se një motiv ose një kod PIN i fortë. "<annotation id="url">"Mëso më shumë"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Thjesht prek te sensori i gjurmës së gishtit për të shkyçur telefonin, për të autorizuar blerjet ose për t\'u identifikuar tek aplikacionet. Trego kujdes se gjurmët e kujt shton. Çdo gjurmë gishti e shtuar do të mund t\'i kryejë këto gjëra. \n\nShënim: Gjurma jote e gishtit mund të jetë më pak e sigurt se një motiv ose një kod PIN i fortë."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Anulo"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Vazhdo"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Kapërceje"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Fshi"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Fillojmë!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Vendose gishtin mbi sensor dhe ngrije pasi të ndjesh një dridhje"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Fantastike! Tani përsërite"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Vazhdo"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Lëvize pak gishtin për të shtuar të gjitha pjesët e ndryshme të gishtit tënd"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Gjurma u shtua!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Sa herë që shikon këtë ikonë, mund të përdorësh gjurmën e gishtit për identifikim ose për të autorizuar një blerje."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Mjafton të prekësh sensorin e gjurmës së gishtit për të zgjuar dhe shkyçur pajisjen."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Kur të shohësh këtë ikonë, mund të përdorësh gjurmën e gishtit."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Kur e sheh këtë ikonë, mund të autorizosh gjithashtu blerjet ose të identifikohesh në aplikacione."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Kapërce konfigurimin e gjurmës së gishtit?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Ke zgjedhur që të përdorësh gjurmën e gishtit si një mënyrë për ta shkyçur telefonin. Nëse e kapërcen teni, do të duhet ta konfigurosh këtë më vonë. Konfigurimi do të zgjasë vetëm afro një minutë."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Konfiguro kyçjen e ekranit"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Kur telefonata me Wi-Fi është e aktivizuar, telefoni mund t\'i kalojë telefonatat nëpërmjet rrjeteve Wi-Fi ose nëpërmjet rrjetit të operatorit celular, në varësi të preferencës dhe se cili sinjal është më i fortë. Para se të aktivizosh këtë funksion, kontakto me operatorin celular në lidhje me tarifat dhe detaje të tjera."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"Përditëso adresën e urgjencës"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Adresa përdoret nga shërbimet e urgjencës si vendndodhja jote nëse telefonon në 911 me WiFi"</string>
     <string name="home_settings" msgid="212375129455718176">"Ekrani kryesor"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Paraqitja"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Tingulli"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Harroje"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Konfiguro"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Eksploro"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Liro hapësirën"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Menaxho hapësirën e ruajtjes"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Lidhja e kompjuterit me USB-në"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Lidh si"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Pajisje e jashtme \"media\" (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Të dhënat e memories specifike"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Tjetër"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistemi"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Eksploro <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Përfshin po ashtu skedarët e ndarë që janë ruajtur nga aplikacionet, skedarët e shkarkuar nga interneti ose me Bluetooth, skedarët e Android e të tjera. \n\nPër të parë të gjitha përmbajtjet në këtë <xliff:g id="NAME">^1</xliff:g>, trokit tek \"Eksploro\"."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Sistemi përfshin skedarë që përdoren në nivel të brendshëm nga sistemi operativ Android. \n\nKëta skedarë nuk mund të shikohen individualisht."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> mund të ketë ruajtur fotografi, muzikë, filma, aplikacione ose të dhëna të tjera që po zënë <xliff:g id="SIZE">^2</xliff:g> nga hapësira ruajtëse. \n\npër të parë detajet, kalo te <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Konfiguro <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Përdore si hapësirë portative ruajtjeje"</string>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Informacioni ligjor"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Kontribuuesit"</string>
     <string name="manual" msgid="3025943393642974445">"Manuale"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Informacion për rregullat"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Etiketat rregullatore"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Informacionet rregullatore dhe të sigurisë"</string>
     <string name="copyright_title" msgid="865906688917260647">"Të drejtat e autorit"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenca"</string>
     <string name="terms_title" msgid="7697580845616764642">"Kushtet e përgjithshme"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Rrjeti VPN gjithmonë aktiv"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Nuk u shtua asnjë rrjet VPN."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Gjithnjë aktiv është aktiv"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Nuk mbështetet nga ky aplikacion"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Zgjidh një profil VPN-je për të qëndruar gjithmonë i lidhur. Trafiku i rrjetit do të lejohet vetëm kur të lidhet me këtë VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Asnjë"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"VPN-ja gjithnjë e aktivizuar kërkon një adresë IP-je për serverin dhe DNS-në."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"rrëshqit për ta shkyçur, fjalëkalim, motiv, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"sfidë në punë, punë, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"profili i punës, profili i menaxhuar, unifiko, unifikim, punë, profil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"gjesti"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Cakto një etiketë NFC për Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Shkruaj"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Trokit te një etiketë për të shkruar..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Të dhënat e sfondit janë të disponueshme vetëm përmes lidhjes Wi-Fi. Kjo mund të ndikojë te disa aplikacione ose shërbime kur lidhja Wi-Fi nuk është e disponueshme."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Profili i punës është i çaktivizuar"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Janë çaktivizuar aplikacionet, sinkronizimi në sfond dhe veçoritë e tjera që lidhen me profilin e punës."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Sugjerimet (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Sugjerime"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Hiqe"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura e ftohtë e ngjyrës"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Përdor ngjyra të ftohta të ekranit"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Të rivendosen matësit e kufizimit të normës së ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrollo njoftimet e ekranit të kyçjes"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Shfaq ose fshih përmbajtjet e njoftimeve"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Të gjitha"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Mbështetja"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Gjerësia më e vogël"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Asnjë aplikacion i instaluar nuk ka kërkuar qasje te mesazhet SMS premium"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Qasja te mesazhet SMS premium"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Çaktivizuar"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Modaliteti i demonstrimit"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Ne jemi këtu për të ndihmuar"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Ne jemi këtu për ty 24 orë në ditë"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Ekipi ynë i mbështetjes është këtu për t\'iu përgjigjur çdo problemi"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Ekipi ynë i mbështetjes është i disponueshëm gjatë të gjithë ditës, çdo ditë"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Orari i mbështetjes së telefonit (local time)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Kërko ndihmë ose kërko te këshillat dhe marifetet"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Mbështetje për:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Po udhëton jashtë vendit?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Mund të aplikohen tarifa ndërkombëtare"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefoni"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Biseda"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Eksploro këshillat dhe të fshehtat"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Kërko për ndihmë dhe dërgo komente"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Identifikohu për mbështetje"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Identifikohu"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Nuk mund të qasesh në llogarinë tënde?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Dërgo informacionet e sistemit"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Për të të ndihmuar në trajtimin e shpejtë të problemit tënd, na nevojiten informacione të sistemit për diagnostikim."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Mos e shfaq përsëri"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Cilësimet e profilit të punës"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kërkimi i kontakteve"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Lejo kërkimet e kontakteve nga organizata jote për të identifikuar telefonuesit dhe kontaktet"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> orë</item>
+      <item quantity="one">1 orë</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuta</item>
+      <item quantity="one">1 minutë</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekonda</item>
+      <item quantity="one">1 sekondë</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Pritja ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Kompjuteri"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Kufjet me mikrofon"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telefon"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Kufje"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Hyrje periferike"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth-i"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Për të ndihmuar në lirimin e hapësirës ruajtëse, menaxheri i hapësirës ruajtëse i heq fotografitë dhe videot e rezervuara nga pajisja jote."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Hiq fotografitë dhe videot"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Menaxheri i hapësirës ruajtëse"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatike"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Gjestet"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Kalo te kamera"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Për të hapur me shpejtësi kamerën, thjesht trokit dy herë te butoni i energjisë. Funksionon nga çdo ekran."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Rrotulloje kamerën"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Për të ndërruar mes kamerës së përparme dhe të pasme, përdridhe dy herë."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Kontrolli i shpejtë i ekranit"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Për ta kontrolluar telefonin pa e zgjuar plotësisht, shtyje lehtë ose merre në duar."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Rrëshqit shpejt për njoftimet"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Për të kontrolluar njoftimet nga çdo ekran, rrëshqit shpejt poshtë në sensorin e gjurmës së gishtit."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Aktiv"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Joaktiv"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Ngarkuesi i sistemit është i shkyçur tashmë"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Lidhu me internetin fillimisht"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Nuk ofrohet në pajisjet e kyçura për një operator celular"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 60816bc..5df8d0d 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Розе"</item>
     <item msgid="6131821495505931173">"Црвена"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Старије од 30 дана"</item>
+    <item msgid="2900554746706302178">"Старије од 60 дана"</item>
+    <item msgid="5692284879054004388">"Старије од 90 дана"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-sr/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-sr/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-sr/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 3146990..8b11f55 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -40,6 +40,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Омогући везу за пренос података"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Онемогући везу за пренос података"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Додељено за VoLTE"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Видео позивање је додељено"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Позивање преко Wifi везе је додељено"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Напајање за радио на мобилним уређајима"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Прикажи SIM адресар"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Прикажи бројеве за фиксно бирање"</string>
@@ -337,7 +339,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Откључајте отиском прста"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Само додирните сензор за отисак прста да бисте откључали телефон, овластили куповине или се пријавили на апликације. Ово ће бити могуће помоћу свих отисака прстију које додате, па будите опрезни кога додајете.\n\nНапомена: Отисак прста може да буде мање безбедан од јаког шаблона или PIN-а. "<annotation id="url">"Сазнајте више"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Само додирните сензор за отисак прста да бисте откључали телефон, овластили куповине или се пријавили на апликације Ово ће бити могуће помоћу свих отисака прстију које додате, па будите опрезни кога додајете.\n\nНапомена: Отисак прста може да буде мање безбедан од јаког шаблона или PIN-а."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Откажи"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Настави"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Прескочи"</string>
@@ -358,12 +360,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Избриши"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Да почнемо!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Ставите прст на сензор и подигните га када осетите вибрацију"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Одлично! Још једном"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Наставите даље"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Мало померите прст да бисте додали различите делове отиска прста"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Отисак прста је додат!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Када год видите ову икону, можете да користите отисак прста ради идентификације или да бисте одобрили куповину."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Само додирните сензор за отисак прста да бисте активирали и откључали уређај."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Када видите ову икону, можете да користите отисак прста."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Када видите ову икону, можете и да одобрите куповине или се пријављујете у апликације."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Прескочити подешавање отиска прста?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Изабрали сте да користите отисак прста као један начин за откључавање телефона. Ако сада прескочите, мораћете касније да обавите ово подешавање. За подешавање је потребно само око минут времена."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Подеси закључавање екрана"</string>
@@ -844,6 +846,8 @@
     <item msgid="6200207341126893791">"1."</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Када је Позивање преко Wi-Fi-ја укључено, телефон може да преусмерава позиве преко Wi-Fi мрежа или мреже мобилног оператера у зависности од тога које сте подешавање изабрали и који сигнал је јачи. Пре него што укључите ову функцију, информишите се код мобилног оператера о накнадама и другим детаљима."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"Ажурирајте адресу за хитне случајеве"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Адреса коју користе хитне службе као вашу локацију ако позовете такву службу помоћу 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>
@@ -1065,6 +1069,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Заборави"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Подеси"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Истражи"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Ослободите простор"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Управљај складиштењем"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB уређај је повезан са рачунаром"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Повежи као"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Медијски уређај (MTP)"</string>
@@ -1101,8 +1107,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Аудио"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Кеширани подаци"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Друго"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Систем"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Истражи уређај <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Одељак Друго обухвата дељене датотеке које чувају апликације, датотеке преузете са интернета или помоћу Bluetooth-а, Android датотеке и слично. \n\nДа бисте видели целокупан садржај уређаја <xliff:g id="NAME">^1</xliff:g>, додирните Истражите."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Систем обухвата датотеке које оперативни систем Android користи интерно. \n\nОве датотеке не могу да се прегледају засебно."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> је можда сачувао/ла слике, музику, филмове, апликације или друге податке који заузимају <xliff:g id="SIZE">^2</xliff:g> меморије. \n\nДа бисте прегледали детаље, пребаците на корисника <xliff:g id="USER_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>
@@ -1293,7 +1301,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Правне информације"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Сарадници"</string>
     <string name="manual" msgid="3025943393642974445">"Упутство"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Регулативне информације"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Регулаторне ознаке"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Безбедносне и регулаторне информације"</string>
     <string name="copyright_title" msgid="865906688917260647">"Ауторска права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лиценца"</string>
     <string name="terms_title" msgid="7697580845616764642">"Услови и одредбе"</string>
@@ -2247,6 +2256,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Стално укључени VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Нисте додали ниједан VPN."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Увек укључени VPN је активан"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Ове апликација не подржава"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Изаберите VPN профил са којим ћете увек бити повезани. Мрежни садржај ће бити дозвољен само када сте повезани са овим VPN-ом."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Ниједан"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Стално укључени VPN захтева IP адресу за сервер и DNS."</string>
@@ -2519,6 +2529,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"превлачење за откључавање, лозинка, шаблон, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"work изазов, work, профил"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"профил за Work, профил којим се управља, обједини, обједињавање, Work, профил"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"покрет"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Подесите Wi-Fi NFC ознаку"</string>
     <string name="write_tag" msgid="8571858602896222537">"Напиши"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Додирните ознаку да бисте писали..."</string>
@@ -3020,7 +3031,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Позадински подаци су доступни само преко Wi-Fi-ја. То може да утиче на неке апликације или услуге када Wi-Fi није доступан."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Профил за Work је искључен"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Апликације, синхронизација у позадини и друге функције повезане са профилом за Work су искључене."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Предлози (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Предлози"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Уклони"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Хладна температура боје"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Користи хладније боје екрана"</string>
@@ -3114,6 +3126,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Желите ли да ресетујете бројање за ограничавање броја у ShortcutManager-у?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Контролишите обавештења на закљ. екрану"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Прегледајте или сакријте садржај обавештења"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Све"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Подршка"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Најмања ширина"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ниједна инсталирана апликација није захтевала приступ премијум SMS-овима"</string>
@@ -3121,9 +3135,46 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Приступ премијум SMS-овима"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Онемогућено"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Режим демонстрације"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Ту смо да помогнемо"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Ту смо за вас нон-стоп"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Наш тим за подршку је ту да реши било који проблем"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Наш тим за подршку је доступан целог дана, сваког дана"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Радно време подршке телефоном (локално време)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Претражите помоћ или истражите савете и трикове"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Подршка за:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> – <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Путујете у иностранство?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Могу да важе међународне тарифе"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Телефон"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Ћаскај"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Истражи савете и трикове"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Претражи помоћ и пошаљи повратне информације"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Пријавите се да бисте добили подршку"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Пријави ме"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Не можете да приступите налогу?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Пошаљите информације о систему"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Да би се проблем што пре решио, за дијагностику су нам потребне информације о систему."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Не приказуј поново"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Подешавања пословног профила"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Претрага контаката"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Дозволите да претраживање контаката од стране ваше организације идентификује позиваоце и контакте."</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> сат</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> сата</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> сати</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> минут</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> минута</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> минута</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> секунда</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> секунде</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> секунди</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> чекања"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Рачунар"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Наглавне слушалице"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Позови"</string>
@@ -3131,4 +3182,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Слушалице"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Периферни уређај за унос"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Да би ослободио меморијски простор, менаџер меморијског простора уклања резервне копије слика и видео снимака са уређаја."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Уклоните слике и видео снимке"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Менаџер меморијског простора"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Аутоматска"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Ручна"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Покрети"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Прелазак на камеру"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Двапут додирните дугме за напајање да бисте брзо отворили камеру. Ово функционише на сваком екрану."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Окретање камере"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Заокрените двапут да бисте се пребацивали између предње и задње камере."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Брза провера екрана"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Гурните или узмите телефон да бисте га проверили не будећи га потпуно."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Превлачење прстом за обавештења"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Превуците прстом надоле по сензору за отисак прста да бисте проверили обавештења са било ког екрана."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Укључено"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Искључено"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Алатка за покретање оперативног система је већ откључана"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Прво се повежите са интернетом"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Није доступно на уређајима које је мобилни оператер закључао"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 97fcb35..4f75847 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Rosa"</item>
     <item msgid="6131821495505931173">"Röd"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Äldre än 30 dagar"</item>
+    <item msgid="2900554746706302178">"Äldre än 60 dagar"</item>
+    <item msgid="5692284879054004388">"Äldre än 90 dagar"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-sv/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-sv/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-sv/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index ccd871c..92898ed 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Aktivera dataanslutning"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Inaktivera dataanslutning"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE-administrerad"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videosamtal tillhandahålls"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi-samtal tillhandahålls"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Strömförsörjning för mobilradio"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Visa SIM-adressbok"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Visa Fasta nummer"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Lås upp med fingeravtryck"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Du behöver bara trycka på fingeravtryckssensorn när du vill låsa upp mobilen, auktorisera köp eller logga in i appar. Tänk efter innan du lägger till fingeravtryck, eftersom alla som du lägger till kan användas på det här sättet.\n\nObs! Fingeravtryck kan vara mindre säkra än en säkert grafiskt lösenord eller en pinkod. "<annotation id="url">"Läs mer"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Tryck bara på fingeravtryckssensorn när du vill låsa upp mobilen, auktorisera köp eller logga in i appar. Tänk efter innan du lägger till någons fingeravtryck, eftersom alla som du lägger till kan utföra alla dessa åtgärder.\n\nObs! Fingeravtryck kan vara mindre säkra än ett säkert grafiskt lösenord eller en pinkod."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Avbryt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Fortsätt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Hoppa över"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Radera"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Sätt igång!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Lägg fingret på sensorn och ta bort det när den vibrerar till"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Perfekt! Gör nu om det igen"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Fortsätt"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Rör lite på fingret så att hela fingeravtrycket läggs till"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Fingeravtrycket har lagts till!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"När du ser den här ikonen kan du identifiera dig eller auktorisera ett köp med hjälp av ditt fingeravtryck."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Väck och lås upp enheten genom att trycka på fingeravtryckssensorn."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"När den här ikonen visas kan du använda fingeravtryck."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"När den här ikonen visas kan du även auktorisera köp eller logga in i appar."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Hoppa över fingeravtryckskonfigurering?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Du har valt att låsa upp mobilen med hjälp av ditt fingeravtryck. Om du hoppar över konfigureringen nu måste du slutföra den senare. Konfigureringen tar bara en minut eller två."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Ställ in skärmlåset"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Uppdatera adressen för nödfall"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Adress som ska användas som din plats om du ringer 112 i en nödsituation med Wi-Fi"</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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Glöm"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Konfigurera"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Utforska"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Frigör utrymme"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Hantera lagring"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-anslutning till dator"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Anslut som"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Mediaenhet (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Ljud"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Cachelagrad data"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Övrigt"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Utforska <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Övrigt innehåller delade filer som har sparats av appar, filer som har laddats ned från internet eller via Bluetooth, Android-filer o.s.v. \n\nTryck på Utforska om du vill visa allt innehåll på <xliff:g id="NAME">^1</xliff:g>."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Systemet innehåller filer som används internt av operativsystemet Android \n\nDet går inte att visa dessa filer var och en för sig."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> kan ha sparade foton, musik, filmer, appar eller annan data som tar upp <xliff:g id="SIZE">^2</xliff:g> av lagringsutrymmet. \n\nByt till <xliff:g id="USER_1">^1</xliff:g> för mer information."</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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Juridisk information"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Medarbetare"</string>
     <string name="manual" msgid="3025943393642974445">"Handbok"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Föreskrifter"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Föreskriftsetiketter"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Säkerhet och föreskrifter"</string>
     <string name="copyright_title" msgid="865906688917260647">"Upphovsrätt"</string>
     <string name="license_title" msgid="1990487604356037871">"Licens"</string>
     <string name="terms_title" msgid="7697580845616764642">"Användarvillkor"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Always-on VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Inga VPN-nätverk har lagts till."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Always-on är aktiverat"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Stöds inte av den här appen"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Välj en VPN-profil som du alltid vill vara ansluten till. Nätverkstrafik tillåts bara när du är ansluten till detta VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Inga"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Funktionen Always-on VPN kräver en IP-adress för både server och DNS."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"dra för att låsa upp, lösenord, mönster, pinkod"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"jobbutmaning, jobb, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"jobbprofil, hanterad profil, koppla samman, sammankoppling, jobb, profil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"rörelse"</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>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tryck på en etikett för att skriva ..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Bakgrundsdata är endast tillgänglig via Wi-Fi. Det här kan påverka vissa appar eller tjänster när du inte har tillgång till Wi-Fi."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Jobbprofilen är inaktiverad"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Appar, bakgrundssynkronisering och andra funktioner som hör till din jobbprofil är inaktiverade."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Förslag (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Förslag"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Ta bort"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Sval färgtemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Använd svalare färger på skärmen"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Vill du återställa räknarna för anropsbegränsning i ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Hantera aviseringar på låsskärmen"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Visa eller dölja innehåll i aviseringar"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Alla"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Support"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Minsta bredd"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Inga installerade appar har begärt åtkomst till premium-sms"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Åtkomst till premium-sms"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Inaktiverat"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Demoläge"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Vi hjälper dig gärna"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Vi hjälper dig dygnet runt."</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Vårt supportteam hjälper dig med eventuella problem"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Vårt supportteam finns här dygnet runt, alla dagar"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Telefonsupportens öppettider (lokal tid)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Sök i hjälpen eller kika på våra tips och råd"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Stöd för:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> – <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Ska du utomlands?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Internationella avgifter kan tillkomma"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chatt"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Kika på våra tips och råd"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Sök i hjälp och skicka feedback"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Logga in om du vill ha support"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Logga in"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Kan du inte komma åt kontot?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Skicka systeminformation"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Vi kan hjälpa dig snabbare om vi får systeminformation för diagnosen."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Visa inte igen"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Inställningar för jobbprofilen"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaktsökning"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Tillåt att organisationen söker bland kontakter för att identifiera ringande och kontakter"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> timmar</item>
+      <item quantity="one">1 timme</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuter</item>
+      <item quantity="one">1 minut</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekunder</item>
+      <item quantity="one">1 sekund</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> väntetid"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Dator"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Headset"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Mobil"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Hörlur"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Inmatning från kringutrustning"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Lagringshanteraren tar bort säkerhetskopior av foton och videor från enheten för att frigöra lagringsutrymme."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Ta bort foton och videor"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Lagringshanteraren"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatiskt"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuellt"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Rörelser"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Hoppa till kameran"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Om du vill öppna kameran snabbt trycker du två gånger i snabb följd på strömknappen. Detta fungerar från alla skärmar."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Vänd kameran"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Vrid snabbt två gånger om du vill byta mellan den främre och den bakre kameran."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Snabbkolla skärmen"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Om du vill kolla mobilen utan att aktivera den helt kan du bara peta på den eller plocka upp den."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Svep för aviseringar"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Svep nedåt på fingeravtryckssensorn om du vill visa aviseringar. Detta fungerar på alla skärmar."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"På"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Av"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader har redan låsts upp"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Anslut först till internet"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Ej tillgängligt på operatörslåsta enheter."</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 376d32d..6496c89 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Waridi"</item>
     <item msgid="6131821495505931173">"Nyekundu"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Zilizokaa zaidi ya siku 30"</item>
+    <item msgid="2900554746706302178">"Zilizokaa zaidi ya siku 60"</item>
+    <item msgid="5692284879054004388">"Zilizokaa zaidi ya siku 90"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-sw/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-sw/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-sw/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 798bc20..d1f4133 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Washa Muunganisho wa Data"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Zima Muunganisho wa Data"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE Inayotumika"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Inaruhusu Hangout ya Video"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Inaruhusu Kupiga Simu kupitia Wi-Fi"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Nishati ya Redio ya Simu ya Mkononi"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Angalia Kitabu cha Anwani katika SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Ona nambari zilizopangwa za kupiga"</string>
@@ -336,7 +338,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Fungua kwa kitambulisho"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Gusa kitambua alama ya kidole ili ufungue simu yako, uidhinishe ununuzi au uingie katika akaunti za programu. Kuwa makini ni alama za vidole za nani unazoongeza. Hata alama moja ya kidole inayoongezwa inaweza kufanya shughuli hizi. \n\nKumbuka: Alama yako ya kidole inaweza kuwa yenye usalama mdogo kuliko mchoro  au PIN thabiti. "<annotation id="url">"Pata maelezo zaidi"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Gusa tu kitambua alama ya kidole ili ufungue simu yako, uthibitishe ununuzi au uingie katika akaunti za programu. Kuwa makini unapoongeza alama za vidole. Alama yoyote kidole unayoongeza inaweza kufanya shughuli hizi.\n\nKumbuka: Huenda PIN au mchoro thabiti ukawa salama zaidi kuliko alama ya kidole."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Ghairi"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Endelea"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Ruka"</string>
@@ -357,12 +359,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Futa"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Acha tuanze!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Weka kidole chako juu ya kihisi kisha ukiinue baada ya kuhisi mtetemo"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Vizuri! Rudia sasa"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Endelea"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Sogeza kidole chako taratibu ili uongeze sehemu zote za alama za kidole chako"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Kitambulisho kimeongezwa!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kila unapoona aikoni hii, unaweza kutumia kitambulisho chako kujitambulisha au kuidhinisha ununuzi."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Gusa tu kihisi cha alama za vidole ili uanzishe na kufungua kifaa chako."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Ukiona aikoni hii, unaweza kutumia alama yako ya kidole."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Unapoona aikoni hii, unaweza pia kuidhinisha ununuzi au kuingia katika akaunti za programu."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Ungependa kuruka kusanidi kitambulisho?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Umechagua kutumia kitambulisho kama njia ya kufungua simu yako. Ukiruka sasa, utahitajika kusanidi hii baadaye. Usanidi huchukua takriban dakika moja."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Weka mbinu ya kufunga skrini"</string>
@@ -839,6 +841,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Sasisha Anwani ya Dharura"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Anwani inayotumiwa na huduma za dharura kama mahali ulipo ikiwa utapiga simu ya 911 ukitumia Wi-Fi"</string>
     <string name="home_settings" msgid="212375129455718176">"Mwanzo"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skrini"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sauti"</string>
@@ -1059,6 +1063,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Sahau"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Weka mipangilio"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Gundua"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Ongeza nafasi"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Dhibiti hifadhi"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Kuunganishwa kwenye kompyuta kwa USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Unganisha kama"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Kifaa cha media (MTP)"</string>
@@ -1095,8 +1101,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Sauti"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Data iliyowekwa kwenye akiba"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Nyingine"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Mfumo"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Gundua <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Zingine ni pamoja na faili zinazoshirikiwa ambazo zimehifadhiwa na programu, faili zinazopakuliwa kutoka Intaneti au Bluetooth, faili za Android na zinginezo. \n\n Gonga Gundua ili uweze kuona maudhui yote ya <xliff:g id="NAME">^1</xliff:g> hii."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Mfumo unajumuisha faili zilizotumika ndani na mfumo wa uendeshaji wa Android. \n\nFaili hizi haziwezi kuangaliwa moja moja."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Huenda <xliff:g id="USER_0">^1</xliff:g> amehifadhi picha, muziki, filamu, programu, au data nyingine inayotumia nafasi ya <xliff:g id="SIZE">^2</xliff:g> ya hifadhi. \n\n Ili uweze kutazama maelezo, badilisha hadi <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1289,7 +1297,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Maelezo ya kisheria"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Wachangiaji"</string>
     <string name="manual" msgid="3025943393642974445">"Mwongozo"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Maelezo ya udhibiti"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Lebo za udhibiti"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Maelezo ya udhibiti na usalama"</string>
     <string name="copyright_title" msgid="865906688917260647">"Hakimiliki"</string>
     <string name="license_title" msgid="1990487604356037871">"Leseni"</string>
     <string name="terms_title" msgid="7697580845616764642">"Sheria na Masharti"</string>
@@ -2236,6 +2245,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN Iliyowashwa kila mara"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Hujaongeza VPN zozote."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Imewasha kipengee cha Iwe Imewashwa"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Haiwezi kutumia programu hii"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Chagua wasifu wa VPN ambapo utakuwa umeunganishwa kila mara. Trafiki ya mtandao itaruhusiwa tu unapounganishwa kwenye VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Hamna"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Kila mara VPN iliyowashwa inahitaji anwani ya Itifaki Wavuti za seva na DNS."</string>
@@ -2504,6 +2514,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"telezesha kidole ili ufungue, nenosiri, mchoro, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"mashindano kazini, kazi, wasifu"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"wasifu wa kazini, wasifu uliodhibitiwa, unganisha, uunganishaji, kazi, wasifu"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"ishara"</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>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Gonga tagi ya NFC ili uandike..."</string>
@@ -2995,7 +3006,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Data ya chini chini inapatikana tu kupitia Wi-Fi. Hii inaweza kuathiri baadhi ya programu au huduma wakati Wi-Fi haipatikani."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Wasifu wa kazini umezimwa"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Usawazishaji wa chini chini, programu na vipengele vingine vinavyohusiana na wasifu wako wa kazini vimezimwa."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Mapendekezo (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Mapendekezo"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Ondoa"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Halijoto ya rangi ya baridi"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Tumia rangi yenye halijoto ya baridi zaidi kwenye onyesho"</string>
@@ -3088,6 +3100,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Ungependa kuweka upya mipangilio ya vipengee vya hesabu ya udhibiti wa ukadiriaji katika Kidhibiti cha Njia za Mkato?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Dhibiti arifa za kufunga skrini"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Onyesha au ufiche maudhui ya arifa"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Zote"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Usaidizi"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"Dp <xliff:g id="ID_1">%d</xliff:g>"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Upana mdogo zaidi"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Hakuna programu zilizosakinishwa ambazo zimeomba kufikia huduma ya SMS zinazolipiwa"</string>
@@ -3095,9 +3109,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Ufikiaji wa huduma ya SMS zinazolipiwa"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Imezimwa"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Hali ya onyesho"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Tuko hapa kukuhudumia"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Tuko tayari kukuhudumia wakati wowote kila siku"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Timu yetu ya usaidizi iko tayari kushughulikia matatizo yoyote"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Timu yetu ya usaidizi iko tayari kukuhudumia wakati wowote, kila siku"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Saa za usaidizi kupitia simu (saa za nchini)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Tafuta katika sehemu ya usaidizi au ugundue vidokezo na mbinu"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Usaidizi nchini:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Je, unasafiri nje ya nchi?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Huenda ukatozwa kwa kupiga simu nje ya nchi yako"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Simu"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Gumzo"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Gundua vidokezo na mbinu"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Tafuta usaidizi na utume maoni"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Ingia katika akaunti ili upate usaidizi"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Ingia katika akaunti"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Je, umeshindwa kuingia katika akaunti yako?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Tuma maelezo ya mfumo"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Ili tuweze kutatua tatizo lako kwa haraka, tunahitaji maelezo ya mfumo kwa ajili ya uchunguzi."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Usionyeshe tena"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Mipangilio ya wasifu wa kazini"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Utafutaji wa anwani"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Ruhusu utafutaji wa anwani unaofanywa na shirika lako kutambua anwani na anayepiga simu"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other">Saa <xliff:g id="NUMBER">%s</xliff:g></item>
+      <item quantity="one">Saa 1</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other">Dakika <xliff:g id="NUMBER">%s</xliff:g></item>
+      <item quantity="one">Dakika 1</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other">Sekunde <xliff:g id="NUMBER">%s</xliff:g></item>
+      <item quantity="one">Sekunde 1</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Subiri kwa ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Kompyuta"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Vifaa vya sauti"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Simu"</string>
@@ -3105,4 +3153,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Kifaa cha sauti"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Vifaa vya Ziada vya Kuingiza Data"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Ili kuongeza nafasi ya hifadhi, kidhibiti cha hifadhi huondoa picha na video zilizohifadhiwa nakala kwenye kifaa chako."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Ondoa picha na video"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Kidhibiti cha hifadhi"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Otomatiki"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Mwongozo"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Ishara"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Nenda kwenye Kamera"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Ili kufungua kamera haraka, gonga mara mbili kitufe cha nishati. Hufanya kazi katika skrini yoyote."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Geuza kamera"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Ili kubadilisha kati ya kamera ya mbele na ya nyuma, geuza mkono ulioshika kifaa mara mbili."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Kuangalia skrini kwa haraka"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"IIli kuangalia simu yako bila kuwasha skrini kikamilifi, iguse au uichukue."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Telezesha kidole ili upate arifa"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Ili kuangalia arifa zako katika skrini yoyote, telezesha kidole kwenye kitambua alama ya kidole."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Imewashwa"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Imezimwa"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Tayari kipakiaji cha mfumo wa uendeshaji kimefunguliwa"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Unganisha kwenye Intaneti kwanza"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Haipatikani kwenye baadhi ya vifaa vilivyofungwa na mtoa huduma"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-sw600dp/aliases.xml b/res/values-sw600dp/aliases.xml
index 51ee5bc..163e97a 100644
--- a/res/values-sw600dp/aliases.xml
+++ b/res/values-sw600dp/aliases.xml
@@ -19,7 +19,6 @@
      <item name="fingerprint_enroll_find_sensor" type="layout">@layout/fingerprint_enroll_find_sensor_base</item>
      <item name="fingerprint_enroll_enrolling" type="layout">@layout/fingerprint_enroll_enrolling_base</item>
      <item name="fingerprint_enroll_finish" type="layout">@layout/fingerprint_enroll_finish_base</item>
-     <item name="setup_choose_lock_pattern" type="layout">@layout/setup_choose_lock_pattern_common</item>
-     <item name="setup_fingerprint_enroll_find_sensor" type="layout">@layout/setup_fingerprint_enroll_find_sensor_base</item>
+     <item name="choose_lock_pattern" type="layout">@layout/choose_lock_pattern_common</item>
 </resources>
 
diff --git a/res/values-ta-rIN/arrays.xml b/res/values-ta-rIN/arrays.xml
index 75902f4..b5e644d 100644
--- a/res/values-ta-rIN/arrays.xml
+++ b/res/values-ta-rIN/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"பிங்க்"</item>
     <item msgid="6131821495505931173">"சிவப்பு"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"30 நாட்களுக்கு மேல்"</item>
+    <item msgid="2900554746706302178">"60 நாட்களுக்கு மேல்"</item>
+    <item msgid="5692284879054004388">"90 நாட்களுக்கு மேல்"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-ta-rIN/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-ta-rIN/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-ta-rIN/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index c258fd9..384b4b4 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"தரவு இணைப்பை இயக்கு"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"தரவு இணைப்பை முடக்கு"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE ஒதுக்கீட்டுக் கொடி இயக்கத்தில்"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"வீடியோ அழைப்பு அமைக்கப்பட்டது"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"வைஃபை அழைப்பு அமைக்கப்பட்டது"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"செல்லுலார் ரேடியோ பவர்"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"சிம் முகவரிப் புத்தகத்தைக் காட்டு"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"நிலையான அழைப்பு எண்களைக் காட்டு"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"கைரேகை மூலம் திறக்கலாம்"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"ஃபோனைத் திறக்க, வாங்குவதை அங்கீகரிக்க அல்லது பயன்பாடுகளில் உள்நுழைய, கைரேகை உணர்வியைத் தொட்டால் போதும். யாருடைய கைரேகையைச் சேர்க்கிறீர்கள் என்பதில் கவனமாக இருக்கவும். சேர்க்கப்பட்ட எந்தக் கைரேகையைப் பயன்படுத்தியும் முன்னர் கூறிய எல்லா செயல்களையும் செய்ய முடியும்.\n\nகுறிப்பு: வலிமையான பேட்டர்ன் அல்லது பின்னை விட, கைரேகையானது பாதுகாப்பு குறைவானதாக இருக்கக்கூடும். "<annotation id="url">"மேலும் அறிக"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"மொபைலைத் திறக்க, வாங்குவதை அங்கீகரிக்க அல்லது பயன்பாடுகளில் உள்நுழைய, கைரேகை உணர்வியைத் தொட்டால் போதும். யாருடைய கைரேகையைச் சேர்க்கிறீர்கள் என்பதில் கவனமாக இருக்கவும். சேர்க்கப்பட்ட எந்தக் கைரேகையைப் பயன்படுத்தியும் முன்னர் கூறிய எல்லா செயல்களையும் செய்ய முடியும்.\n\nகுறிப்பு: வலிமையான பேட்டர்ன் அல்லது பின்னை விட, கைரேகையானது பாதுகாப்பு குறைவானதாக இருக்கக்கூடும்."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"ரத்துசெய்"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"தொடரவும்"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"தவிர்"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"நீக்கு"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"தொடங்கலாம்!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"விரலை உணர்வியில் வைத்து, அதிர்வை உணர்ந்த பின்னர் விரலை எடுக்கவும்"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"அருமை! அதையே மீண்டும் செய்யவும்"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"தொடரவும்"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"கைரேகையின் வெவ்வேறு பகுதிகளைச் சேர்க்க, விரலை சற்று நகர்த்தவும்"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"கைரேகை சேர்க்கப்பட்டது!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"இந்த ஐகானைப் பார்க்கும்போதெல்லாம், அடையாளப்படுத்தலுக்காக அல்லது வாங்குதலை அங்கீகரிக்க, நீங்கள் கைரேகையைப் பயன்படுத்தலாம்."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"சாதனத்தைச் செயல்படச் செய்து, அதைத் திறக்க, கைரேகை உணர்வியைத் தொட்டால் போதும்."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"இந்த ஐகானைப் பார்க்கும்போதெல்லாம், உங்கள் கைரேகையைப் பயன்படுத்தலாம்."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"இந்த ஐகானைப் பார்க்கும் போது, நீங்கள் வாங்குதல்களை அனுமதிக்கலாம் அல்லது பயன்பாடுகளில் உள்நுழையலாம்."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"கைரேகை அமைவைத் தவிர்க்கவா?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"கைரேகையை மட்டும் பயன்படுத்தி மொபைலைத் திறக்கும் முறையைத் தேர்வுசெய்துள்ளீர்கள். இப்போது தவிர்த்தால், இதைப் பின்னர் அமைக்க வேண்டியிருக்கும். அமைவுக்குத் தோராயமாக ஒரு நிமிடம் மட்டுமே எடுக்கும்."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"திரைப் பூட்டை அமை"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"வைஃபை அழைப்பு இயக்கத்தில் இருக்கும் போது, முன்னுரிமை மற்றும் வலிமையாக இருக்கிற சிக்னலைப் பொறுத்து வைஃபை நெட்வொர்க்குகள் அல்லது மொபைல் நிறுவன நெட்வொர்க்குக்கு அழைப்புகளை உங்கள் ஃபோன் திசைதிருப்பும். இந்த அம்சத்தை இயக்குவதற்கு முன், கட்டணங்கள் மற்றும் பிற விவரங்கள் குறித்து உங்கள் மொபைல் நிறுவனத்திடமிருந்து தெரிந்துகொள்ளவும்."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"எமர்ஜென்சி முகவரியை மாற்று"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"வைஃபையைப் பயன்படுத்தி 911 என்ற எண்ணிற்கு அழைத்தால், அவசர சேவைகள் உங்கள் இருப்பிடத்தை முகவரியாகப் பயன்படுத்தும்"</string>
     <string name="home_settings" msgid="212375129455718176">"முகப்பு"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"தோற்றம்"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ஒலி"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"அகற்று"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"அமை"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"உலாவு"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"இடத்தைக் காலியாக்கு"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"சேமிப்பகத்தை நிர்வகி"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB கணினி இணைப்பு"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"இவ்வாறு இணை"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"மீடியா சாதனம் (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"ஆடியோ"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"தற்காலிகத் தரவு"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"பிற"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"முறைமை"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> இல் உலாவு"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"பயன்பாடுகளால் சேமிக்கப்பட்ட பகிர்ந்த கோப்புகள், இணையம் அல்லது புளூடூத்திலிருந்து இறக்கிய கோப்புகள், Android கோப்புகள் போன்றவை மற்றவையில் அடங்கும். \n\n<xliff:g id="NAME">^1</xliff:g> இன் எல்லா உள்ளடக்கத்தையும் பார்க்க, உலாவுக என்பதைத் தட்டவும்."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"முறைமையில், Android இயக்க முறைமை பயன்படுத்திய கோப்புகளும் உள்ளன. \n\nஇந்தக் கோப்புகளைத் தனித்தனியாகப் பார்க்க முடியாது."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"சேமிப்பகத்தில் <xliff:g id="SIZE">^2</xliff:g> அளவைப் பயன்படுத்தும் படங்கள், இசை, திரைப்படங்கள், பயன்பாடுகள் அல்லது பிற தரவு போன்றவற்றை <xliff:g id="USER_0">^1</xliff:g> சேமித்து வைத்திருக்கலாம். \n\nவிவரங்களைப் பார்க்க, <xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"சட்டத் தகவல்"</string>
     <string name="contributors_title" msgid="5917703088825286504">"பங்களிப்பாளர்கள்"</string>
     <string name="manual" msgid="3025943393642974445">"கைமுறை"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"ஒழுங்குமுறைத் தகவல்"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"ஒழுங்குமுறை லேபிள்கள்"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"பாதுகாப்பு &amp; ஒழுங்குமுறைத் தகவல்"</string>
     <string name="copyright_title" msgid="865906688917260647">"பதிப்புரிமை"</string>
     <string name="license_title" msgid="1990487604356037871">"உரிமம்"</string>
     <string name="terms_title" msgid="7697580845616764642">"விதிமுறைகளும் நிபந்தனைகளும்"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN ஐ எப்போதும் இயக்கத்தில் வை"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"VPNகள் எதுவும் சேர்க்கப்படவில்லை."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"எப்போதும் இயக்கத்தில் விருப்பம் செயல்பாட்டில் உள்ளது"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"இந்தப் பயன்பாடு ஆதரிக்கவில்லை"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"எப்போதும் இணைந்திருக்க வேண்டிய VPN சுயவிவரத்தைத் தேர்ந்தெடுக்கவும். இந்த VPN உடன் இணைந்திருக்கும்போது மட்டுமே நெட்வொர்க்கின் டிராஃபிக் அனுமதிக்கப்படும்."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"ஏதுமில்லை"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"எப்போதும் இயக்கத்தில் இருக்கும் VPN க்கு சேவையகங்கள் மற்றும் DNS ஆகியவற்றின் IP முகவரி தேவைப்படுகிறது."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"திறப்பதற்கு ஸ்லைடு செய்தல், கடவுச்சொல், வடிவம், பின்"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"பணிச்சுமை, பணி, சுயவிவரம்"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"பணி சுயவிவரம், நிர்வகிக்கப்படும் சுயவிவரம், ஒருங்கிணை, ஒருங்கிணைத்தல், பணி, சுயவிவரம்"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"சைகை"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"வைஃபை NFC குறியை அமை"</string>
     <string name="write_tag" msgid="8571858602896222537">"எழுது"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"எழுத, குறியைத் தட்டவும்..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"வைஃபை மூலம் மட்டுமே பின்புலத் தரவு செயல்படும். இதனால் வைஃபை கிடைக்காத போது சில பயன்பாடுகள் அல்லது சேவைகள் பாதிக்கப்படலாம்."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"பணி சுயவிவரம் முடக்கப்பட்டது"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"உங்கள் பணி சுயவிவரத்துடன் தொடர்புடைய பயன்பாடுகள், பின்புல ஒத்திசைவு மற்றும் பிற அம்சங்கள் ஆகியவை முடக்கப்பட்டன."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"பரிந்துரைகள் (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"பரிந்துரைகள்"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"அகற்று"</string>
     <string name="color_temperature" msgid="2070126836910615605">"நீல நிற வெப்பநிலை"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"நீல வண்ணங்களைத் திரைக்குப் பயன்படுத்து"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager இன் மதிப்பீட்டு வரம்புக் கவுன்டர்களை மீட்டமைக்கவா?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"பூட்டு திரை அறிவிப்புகளை கட்டுப்படுத்து"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"அறிவிப்பு உள்ளடக்கத்தைக் காட்டும் அல்லது மறைக்கும்"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"எல்லாம்"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"ஆதரவு"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"மிகக் குறைந்த அகலம்"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"பிரீமிய SMS அணுகலைக் கோரும் பயன்பாடுகள் எதுவும் நிறுவப்படவில்லை"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"பிரீமிய SMS அணுகல்"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"முடக்கப்பட்டது"</string>
     <string name="demo_mode" msgid="2655748420527206870">"டெமோ பயன்முறை"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"உதவுவதற்காகக் காத்திருக்கிறோம்"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"உங்களுக்கு உதவுவதற்காக வாரத்தில் 7 நாட்களும் 24 மணிநேரமும் காத்திருக்கிறோம்"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"சிக்கல்களைத் தீர்க்க உதவ, எங்கள் ஆதரவுக் குழுவினர் காத்திருக்கின்றனர்"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"உங்களுக்கு உதவுவதற்காக எங்கள் ஆதரவுக் குழு என்றும், எப்பொழுதும் காத்திருக்கிறது"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"தொலைபேசி ஆதரவு நேரம் (உள்ளூர் நேரம்)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"உதவியில் தேடவும் அல்லது உதவிக்குறிப்புகளையும் உத்திகளையும் ஆராயவும்"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"இந்த நாட்டிற்கான ஆதரவு:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"வெளிநாட்டிற்குப் பயணிக்கிறீர்களா?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"சர்வதேசக் கட்டணங்கள் விதிக்கப்படலாம்"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"ஃபோன்"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"அரட்டை"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"உதவிக் குறிப்புகள் &amp; உத்திகள் ஆராய்க"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"உதவிக்குச் செல் &amp; கருத்து அனுப்பு"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"ஆதரவு பெற, உள்நுழையவும்"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"உள்நுழைக"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"உங்கள் கணக்கை அணுக முடியவில்லையா?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"முறைமை தகவலை அனுப்பு"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"சிக்கலுக்கு விரைவாகத் தீர்வு காண, அதன் காரணத்தைக் கண்டறிவதற்காக உங்கள் முறைமை தகவல் தேவை."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"மீண்டும் காட்டாதே"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"பணிச் சுயவிவர அமைப்புகள்"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"தொடர்புகளில் தேடு"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"எனது நிறுவனத்தின்படி அழைப்பாளர்களையும் தொடர்புகளையும் கண்டறிய, ”தொடர்புகளில் தேடு” அம்சத்தை அனுமதி"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> மணிநேரம்</item>
+      <item quantity="one">1 மணிநேரம்</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> நிமிடங்கள்</item>
+      <item quantity="one">1 நிமிடம்</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> வினாடிகள்</item>
+      <item quantity="one">1 வினாடி</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"காத்திருப்பு நேரம்: ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"கணினி"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"தலையணி"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"ஃபோன்"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"ஹெட்ஃபோன்"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"இன்புட் பெரிபெரல்"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"புளூடூத்"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"சேமிப்பக இடத்தைக் காலியாக்க உதவ, காப்புப் பிரதி எடுக்கப்பட்ட படங்களையும் வீடியோக்களையும் உங்கள் சாதனத்திலிருந்து சேமிப்பக நிர்வாகி அகற்றும்."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"படங்கள் &amp; வீடியோக்களை அகற்று"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"சேமிப்பக நிர்வாகி"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"தானியங்கு"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"கைமுறை"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"சைகைகள்"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"கேமராவிற்குச் செல்லுதல்"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"கேமராவை விரைவாகத் திறக்க, பவர் பொத்தானை இருமுறை தட்டினால் போதும். எந்தத் திரையிலிருந்தும் கேமரா இயங்கும்."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"கேமராவை மாற்றுதல்"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"முன்புற மற்றும் பின்புறக் கேமராவிற்கு இடையே மாற, இருமுறை திருப்பவும்."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"விரைவாகத் திரையைப் பார்த்தல்"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"உங்கள் மொபைலின் திரையை முழுவதுமாக இயக்காமல் நேரத்தையும் அறிவிப்புகளையும் பார்க்க, மொபைலை லேசாகத் தொடவும் அல்லது கையில் எடுக்கவும்."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"அறிவிப்புகளுக்கு ஸ்வைப் செய்தல்"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"எந்தத் திரையிலிருந்தும் உங்களுக்கான அறிவிப்புகளைப் பார்க்க, கைரேகை உணர்வியில் கீழே ஸ்வைப் செய்யவும்."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"இயக்கு"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"முடக்கு"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"பூட்லோடர் ஏற்கனவே திறந்துள்ளது"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"முதலில் இணையத்துடன் இணைக்கவும்"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"மொபைல் நிறுவன ஒப்பந்தத்தில் உள்ள சாதனங்களில் கிடைக்காது"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-te-rIN/arrays.xml b/res/values-te-rIN/arrays.xml
index 2c15d60..1673a09 100644
--- a/res/values-te-rIN/arrays.xml
+++ b/res/values-te-rIN/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"గులాబీ"</item>
     <item msgid="6131821495505931173">"ఎరుపు"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"30 రోజులు పైబడినవి"</item>
+    <item msgid="2900554746706302178">"60 రోజులు పైబడినవి"</item>
+    <item msgid="5692284879054004388">"90 రోజులు పైబడినవి"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-te-rIN/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-te-rIN/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-te-rIN/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 149b8c9..8a27b01 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"డేటా కనెక్షన్‌ను ప్రారంభించండి"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"డేటా కనెక్షన్‌ను నిలిపివేయండి"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE సదుపాయం ఉంది"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"వీడియో కాలింగ్ సదుపాయం ఉంది"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi కాలింగ్ సదుపాయం ఉంది"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"సెల్యులార్ రేడియో శక్తి"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM చిరునామా పుస్తకాన్ని వీక్షించండి"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ఫిక్స్‌డ్ డయలింగ్ నంబర్‌లను వీక్షించండి"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"వేలిముద్రతో అన్‌లాక్ చేయండి"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి, కొనుగోళ్లను ప్రామాణీకరించడానికి లేదా అనువర్తనాలకు సైన్ ఇన్ చేయడానికి వేలిముద్ర సెన్సార్‌ను తాకండి. మీరు ఎవరి వేలిముద్రలు జోడిస్తున్నారనే విషయంలో జాగ్రత్త వహించండి. వేలిముద్ర జోడించబడిన ఎవరైనా వీటిని చేయగలరు.\n\nగమనిక: మీ వేలిముద్ర శక్తివంతమైన నమూనా లేదా పిన్ కంటే తక్కువ సురక్షితం కావచ్చు. "<annotation id="url">"మరింత తెలుసుకోండి"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి, కొనుగోళ్లను ప్రామాణీకరించడానికి లేదా అనువర్తనాలకు సైన్ ఇన్ చేయడానికి వేలిముద్ర సెన్సార్‌ను తాకండి. మీరు ఎవరి వేలిముద్రలు జోడిస్తున్నారనే విషయంలో జాగ్రత్త వహించండి. వేలిముద్ర జోడించబడిన ఎవరైనా వీటిని చేయగలరు.\n\nగమనిక: మీ వేలిముద్ర శక్తివంతమైన నమూనా లేదా PIN కంటే తక్కువ సురక్షితం కావచ్చు."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"రద్దు చేయి"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"కొనసాగించు"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"దాటవేయి"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"తొలగించు"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"ప్రారంభిద్దాం!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"మీ వేలిని సెన్సార్‌పై ఉంచి, మీకు వైబ్రేషన్ అనుభూతి కలిగిన తర్వాత దాన్ని తీసివేయండి"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"అద్భుతం! ఇప్పుడు మళ్లీ చేయండి"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"కొనసాగించండి"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"మీ వేలిముద్రలోని వివిధ భాగాలన్నింటినీ జోడించడానికి మీ వేలిని కొద్దిగా అటూ ఇటూ జరపండి"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"వేలిముద్ర జోడించబడిం.!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"మీకు ఈ చిహ్నం కనిపించినప్పుడల్లా, మీరు గుర్తింపు కోసం లేదా కొనుగోలు ప్రామాణీకరణ కోసం మీ వేలిముద్రను ఉపయోగించవచ్చు."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"మీ పరికరం సక్రియం చేయడానికి మరియు అన్‌లాక్ చేయడానికి వేలిముద్ర సెన్సార్‌ను తాకితే సరిపోతుంది."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"మీకు ఈ చిహ్నం కనిపించినప్పుడు, మీరు మీ వేలిముద్రను ఉపయోగించవచ్చు."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"మీకు ఈ చిహ్నం కనిపించినప్పుడు, కొనుగోళ్లు చేయడానికి లేదా అనువర్తనాలకు సైన్ ఇన్ చేయడానికి కూడా మీకు అధికారం ఉంటుంది."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"వేలిముద్ర సెటప్‌ను దాటవేయాలా?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"మీరు మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి మీ వేలిముద్రను ఒక మార్గంగా ఎంచుకున్నారు. ఇప్పుడు దాటవేసినా, దీన్ని తర్వాత సెటప్ చేయాల్సి ఉంటుంది. కేవలం ఒక నిమిషంలో సెటప్‌ను పూర్తి చేయవచ్చు."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"స్క్రీన్ లాక్‌ను సెటప్ చేయి"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi కాలింగ్ ఆన్‌లో ఉన్నప్పుడు, మీ ఫోన్ మీ ప్రాధాన్యత మరియు ఏ సిగ్నల్ సామర్థ్యం ఎక్కువగా ఉంది వంటి అంశాల ఆధారంగా Wi-Fi నెట్‌వర్క్‌లు లేదా మీ క్యారియర్ నెట్‌వర్క్ ద్వారా కాల్‌లు వెళ్లేలా చేస్తుంది. ఈ లక్షణాన్ని ఆన్ చేయడానికి ముందు, రుసుములు మరియు ఇతర వివరాల గురించి తెలుసుకోవడానికి మీ క్యారియర్‌ను సంప్రదించండి."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"అత్యవసర చిరునామాను నవీకరించండి"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"మీరు WiFiని ఉపయోగించి 911 కాల్ చేస్తే, అత్యవసర సేవలు మీ స్థానంగా వినియోగించే చిరునామా"</string>
     <string name="home_settings" msgid="212375129455718176">"హోమ్"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ప్రదర్శన"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ధ్వని"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"విస్మరించు"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"సెటప్ చేయి"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"అన్వేషించు"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"స్థలాన్ని ఖాళీ చేయి"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"నిల్వను నిర్వహించు"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB కంప్యూటర్ కనెక్షన్"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"ఇలా కనెక్ట్ చేయండి"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"మీడియా పరికరం (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"ఆడియో"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"కాష్ చేసిన డేటా"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"ఇతరం"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"సిస్టమ్"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g>ని అన్వేషించండి"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"ఇతరంలో అనువర్తనాల ద్వారా సేవ్ చేయబడిన భాగస్వామ్య ఫైల్‌లు, ఇంటర్నెట్ లేదా బ్లూటూత్ నుండి డౌన్‌లోడ్ చేసిన ఫైల్‌లు, Android ఫైల్‌లు మొదలైనవి ఉంటాయి. \n\nఈ <xliff:g id="NAME">^1</xliff:g> మొత్తం కంటెంట్‌లను చూడటానికి, విశ్లేషించు నొక్కండి."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"సిస్టమ్‌లో Android ఆపరేటింగ్ సిస్టమ్ అంతర్గతంగా ఉపయోగించిన ఫైల్‌లు ఉన్నాయి. \n\nఈ ఫైల్‌లను ఒక్కొక్కటిగా వీక్షించలేరు."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> నిల్వలో <xliff:g id="SIZE">^2</xliff:g> పరిమాణాన్ని ఉపయోగిస్తున్నటువంటి సేవ్ చేయబడిన ఫోటోలు, సంగీతం, చలన చిత్రాలు, అనువర్తనాలు లేదా ఇతర డేటాను కలిగి ఉండవచ్చు. \n\nవివరాలను వీక్షించడానికి, <xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"చట్టబద్ధమైన సమాచారం"</string>
     <string name="contributors_title" msgid="5917703088825286504">"సహకారులు"</string>
     <string name="manual" msgid="3025943393642974445">"మాన్యువల్"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"నియంత్రిత సమాచారం"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"నియంత్రణ లేబుల్‌లు"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"భద్రత &amp; నియంత్రణ సమాచారం"</string>
     <string name="copyright_title" msgid="865906688917260647">"కాపీరైట్"</string>
     <string name="license_title" msgid="1990487604356037871">"లైసెన్స్"</string>
     <string name="terms_title" msgid="7697580845616764642">"నిబంధనలు మరియు షరతులు"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"ఎల్లప్పుడూ-ఆన్‌లో ఉండే VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"VPNలు ఏవీ జోడించబడలేదు."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"ఎల్లప్పుడూ ఆన్ ఎంపిక సక్రియంగా ఉంది"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"ఈ అనువర్తనం మద్దతు ఇవ్వదు"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"ఎల్లప్పుడూ కనెక్ట్ చేయబడి ఉండటానికి VPN ప్రొఫైల్‌ను ఎంచుకోండి. ఈ VPNకి కనెక్ట్ అయి ఉన్నప్పుడు మాత్రమే నెట్‌వర్క్ ట్రాఫిక్ అనుమతించబడుతుంది."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"ఏదీ వద్దు"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"ఎల్లప్పుడూ-ఆన్‌లో ఉండే VPNకి సర్వర్ మరియు DNS రెండింటి IP చిరునామా అవసరం."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"అన్‌లాక్ చేయడానికి స్లైడ్ చేయండి, పాస్‌వర్డ్, నమూనా, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"కార్యాలయ సవాలు, కార్యాలయం, ప్రొఫైల్"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"కార్యాలయ ప్రొఫైల్, నిర్వహించబడిన ప్రొఫైల్, ఏకీకరించు, ఏకీకరణ, కార్యాలయం, ప్రొఫైల్"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"సంజ్ఞ"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ట్యాగ్‌ను సెటప్ చేయండి"</string>
     <string name="write_tag" msgid="8571858602896222537">"వ్రాయి"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"వ్రాయడానికి ట్యాగ్‌ను నొక్కండి..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"నేపథ్య డేటా Wi-Fi ద్వారా మాత్రమే అందుబాటులో ఉంది. Wi-Fi అందుబాటులో లేనప్పుడు కొన్ని అనువర్తనాలు లేదా సేవలపై దీని ప్రభావం ఉండవచ్చు."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"కార్యాలయ ప్రొఫైల్ ఆఫ్‌లో ఉంది"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"మీ కార్యాలయ ప్రొఫైల్‌కి సంబంధించిన అనువర్తనాలు, నేపథ్య సమకాలీకరణ మరియు ఇతర లక్షణాలు ఆఫ్ చేయబడ్డాయి."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"సూచనలు (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"సూచనలు"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"తీసివేయి"</string>
     <string name="color_temperature" msgid="2070126836910615605">"ప్రశాంత వర్ణము ఉష్ణోగ్రత"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ప్రశాంత భావనను కలిగించే ప్రదర్శన రంగులను ఉపయోగిస్తుంది"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"సత్వరమార్గ నిర్వాహికి రేట్-పరిమిత కౌంటర్‌లను రీసెట్ చేయాలా?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"లాక్ స్క్రీన్ నోటిఫికేషన్‌లను నియంత్రించండి"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"నోటిఫికేషన్ కంటెంట్‌ను చూపు లేదా దాచు"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"అన్నీ"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"మద్దతు"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"అతితక్కువ వెడల్పు"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ఇన్‌స్టాల్ చేసిన అనువర్తనాలు ఏవీ ప్రీమియం SMS ప్రాప్యతను అభ్యర్థించలేదు"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"ప్రీమియం SMS ప్రాప్యత"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"నిలిపివేయబడింది"</string>
     <string name="demo_mode" msgid="2655748420527206870">"డెమో మోడ్"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"మేము సహాయం అందిస్తాము"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"మేము మీ కోసం 24/7 అందుబాటులో ఉంటాము"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"మా సహాయక బృందం ఎలాంటి సమస్యలకైనా అందుబాటులో ఉంటుంది"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"మా సహాయక బృందం ఎల్లవేళలా అందుబాటులో ఉంటుంది"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"ఫోన్ సహాయ వేళలు (స్థానిక సమయం)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"సహాయాన్ని శోధించండి లేదా చిట్కాలు &amp; సలహాలను విశ్లేషించండి"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"ఈ దేశాలకు మద్దతు:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"విదేశీ ప్రయాణం చేస్తున్నారా?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"అంతర్జాతీయ ఛార్జీలు వర్తించవచ్చు"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"ఫోన్"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"చాట్"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"చిట్కాలు &amp; ఉపాయాలను కనుగొనండి"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"సహాయాన్ని శోధించండి &amp; అభిప్రాయాన్ని పంపండి"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"మద్దతు పొందడానికి సైన్ ఇన్ చేయండి"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"సైన్ ఇన్ చేయి"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"మీ ఖాతాను ప్రాప్యత చేయలేకపోతున్నారా?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"సిస్టమ్ సమాచారాన్ని పంపండి"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"మీ సమస్యను శీఘ్రంగా విచారించడంలో సహాయకరంగా ఉండటానికి, మాకు సమస్య విశ్లేషణల కోసం సిస్టమ్ సమాచారం అవసరం."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"మళ్లీ చూపవద్దు"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"కార్యాలయ ప్రొఫైల్ సెట్టింగ్‌లు"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"పరిచయ శోధన"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"కాలర్‌లు మరియు పరిచయాలను గుర్తించడానికి మీ సంస్థ ద్వారా పరిచయ శోధనలను చేయడానికి అనుమతిస్తుంది"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> గంటలు</item>
+      <item quantity="one">1 గంట</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> నిమిషాలు</item>
+      <item quantity="one">1 నిమిషం</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> సెకన్లు</item>
+      <item quantity="one">1 సెకను</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> వేచి ఉండాలి"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"కంప్యూటర్"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"హెడ్‌సెట్"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"ఫోన్"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"హెడ్‌ఫోన్"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"ఇన్‌పుట్ అనుబంధ పరికరం"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"బ్లూటూత్"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"నిల్వ స్థలాన్ని ఖాళీ చేయడంలో సహాయపడటానికి, నిల్వ నిర్వాహికి మీ పరికరం నుండి బ్యాకప్ చేసిన ఫోటోలు మరియు వీడియోలను తీసివేస్తుంది."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ఫోటోలు &amp; వీడియోలను తీసివేయి"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"నిల్వ నిర్వాహికి"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"స్వయంచాలకం"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"మాన్యువల్"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"సంజ్ఞలు"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"కెమెరాకు వెళ్లు"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"కెమెరాను శీఘ్రంగా తెరవడానికి, పవర్ బటన్‌ను రెండుసార్లు నొక్కండి. ఏ స్క్రీన్ నుండి అయినా పని చేస్తుంది."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"కెమెరాను ముందు/వెనుకకు మార్చడం"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"ముందు మరియు వెనుక కెమెరాల మధ్య మారడానికి, పట్టుకున్న చేతిని రెండుసార్లు ముందుకు వెనుకకు కదపండి."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"శీఘ్ర స్క్రీన్ తనిఖీ"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"మీ ఫోన్‌ను పూర్తిస్థాయిలో నిద్రావస్థ నుండి మేల్కొలపకుండానే తరచి చూడటానికి, దానిపై అలా ఒకసారి తాకండి లేదా దాన్ని చేతుల్లోకి తీసుకోండి."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"నోటిఫికేషన్‌ల కోసం స్వైప్ చేయడం"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"మీ నోటిఫికేషన్‌లను ఏ స్క్రీన్ నుండి అయినా చూడటానికి, వేలిముద్ర సెన్సార్‌పై క్రిందికి స్వైప్ చేయండి."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"ఆన్"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"ఆఫ్"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"బూట్‌లోడర్ ఇప్పటికే అన్‌లాక్ చేయబడింది"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"ముందుగా ఇంటర్నెట్‌కు కనెక్ట్ చేయండి"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"క్యారియర్ ద్వారా లాక్ చేయబడిన పరికరాల్లో అందుబాటులో లేదు"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index f9facfb..05083a2 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"ชมพู"</item>
     <item msgid="6131821495505931173">"แดง"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"เกิน 30 วัน"</item>
+    <item msgid="2900554746706302178">"เกิน 60 วัน"</item>
+    <item msgid="5692284879054004388">"เกิน 90 วัน"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-th/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-th/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-th/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index d91603b..e79471b 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"เปิดใช้การเชื่อมต่ออินเทอร์เน็ต"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ปิดใช้การเชื่อมต่ออินเทอร์เน็ต"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE ที่จัดสรรแล้ว"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"จัดสรรแฮงเอาท์วิดีโอแล้ว"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"จัดสรรการโทรผ่าน Wi-Fi แล้ว"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"พลังวิทยุเครือข่ายมือถือ"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"ดูสมุดที่อยู่ของซิม"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ดูการจำกัดหมายเลขโทรออก"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"ปลดล็อกด้วยลายนิ้วมือ"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"เพียงแตะเซ็นเซอร์ลายนิ้วมือ ก็ปลดล็อกโทรศัพท์ อนุมัติการซื้อ หรือลงชื่อเข้าใช้แอปได้เลย โปรดดูให้ดีว่าคุณเพิ่มลายนิ้วมือของใคร ลายนิ้วมือที่เพิ่มแม้เพียงรายการเดียวจะทำสิ่งต่างๆ เหล่านี้ได้\n\nหมายเหตุ: ลายนิ้วมืออาจมีความปลอดภัยน้อยกว่ารูปแบบหรือ PIN ที่เดายาก "<annotation id="url">"เรียนรู้เพิ่มเติม"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"เพียงแตะเซ็นเซอร์ลายนิ้วมือเพื่อปลดล็อกโทรศัพท์ อนุมัติการซื้อ หรือลงชื่อเข้าใช้แอป โปรดใช้ความระมัดระวังในการเพิ่มลายนิ้วมือคนอื่น ลายนิ้วมือที่เพิ่มแม้เพียงลายเดียวก็สามารถทำสิ่งต่างๆ เหล่านี้ได้\n\nหมายเหตุ: ลายนิ้วมือของคุณอาจไม่ปลอดภัยเท่ารูปแบบหรือ PIN ที่เดายาก"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"ยกเลิก"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ต่อไป"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"ข้าม"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"ลบ"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"มาเริ่มกันเลย"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"วางนิ้วบนเซ็นเซอร์และยกขึ้นหลังจากรู้สึกถึงการสั่น"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"เยี่ยม! ทำซ้ำเลย"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"แตะเซ็นเซอร์ซ้ำ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"เลื่อนนิ้วเล็กน้อยเพื่อเพิ่มส่วนต่างๆ ทั้งหมดของลายนิ้วมือ"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"เพิ่มลายนิ้วมือแล้ว!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"เมื่อใดก็ตามที่คุณเห็นไอคอนนี้ คุณสามารถใช้ลายนิ้วมือเพื่อระบุตัวตนหรือเพื่ออนุญาตการซื้อได้"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"เพียงแค่แตะเซ็นเซอร์ลายนิ้วมือเพื่อปลุกและปลดล็อกอุปกรณ์"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"เมื่อเห็นไอคอนนี้ คุณสามารถใช้ลายนิ้วมือได้"</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"เมื่อเห็นไอคอนนี้ คุณยังให้สิทธิ์การซื้อหรือลงชื่อเข้าใช้แอปได้อีกด้วย"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ข้ามการตั้งค่าลายนิ้วมือไหม"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"คุณได้เลือกที่จะใช้ลายนิ้วมือเป็นวิธีการหนึ่งในการปลดล็อกโทรศัพท์ หากคุณข้ามในตอนนี้ คุณจะต้องตั้งค่าคุณลักษณะนี้ในภายหลัง การตั้งค่าจะใช้เวลาราว 1 นาทีเท่านั้น"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ตั้งค่าการล็อกหน้าจอ"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"เมื่อเปิดการโทรผ่าน Wi-Fi โทรศัพท์จะสามารถวางเส้นทางสายเรียกผ่านเครือข่าย Wi-Fi หรือเครือข่ายของผู้ให้บริการของคุณได้ ทั้งนี้ขึ้นอยู่กับค่ากำหนดของคุณและสัญญาณฝั่งที่แรงกว่า โปรดสอบถามค่าธรรมเนียมและรายละเอียดอื่นๆ กับผู้ให้บริการก่อนที่จะเปิดคุณลักษณะนี้"</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"อัปเดตที่อยู่ฉุกเฉิน"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"ที่อยู่ที่บริการฉุกเฉินจะใช้เป็นตำแหน่งของคุณถ้าคุณโทรหมายเลข 911 ด้วย 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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"ไม่จำ"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"ตั้งค่า"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"สำรวจ"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"เพิ่มพื้นที่ว่าง"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"จัดการพื้นที่เก็บข้อมูล"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"การเชื่อมต่อ USB ของคอมพิวเตอร์"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"เชื่อมต่อแบบ"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"อุปกรณ์สื่อ (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"เสียง"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"ข้อมูลในแคช"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"อื่นๆ"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"ระบบ"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"สำรวจ <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"ข้อมูลอื่นรวมถึงไฟล์ที่แชร์ซึ่งแอปบันทึกไว้, ไฟล์ที่ดาวน์โหลดจากอินเทอร์เน็ตหรือบลูทูธ, ไฟล์ Android และอื่นๆ \n\nหากต้องการดูเนื้อหาทั้งหมดของ <xliff:g id="NAME">^1</xliff:g> นี้ ให้แตะสำรวจ"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"ระบบจะรวมไฟล์ที่ใช้ภายในโดยระบบปฏิบัติการ Android \n\nไม่สามารถดูไฟล์เหล่านี้ทีละไฟล์"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> อาจบันทึกรูปภาพ เพลง ภาพยนตร์ แอป หรือข้อมูลอื่นๆ ที่ใช้พื้นที่เก็บข้อมูล <xliff:g id="SIZE">^2</xliff:g> \n\nหากต้องการดูรายละเอียด ให้สลับไปยัง <xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"ข้อมูลทางกฎหมาย"</string>
     <string name="contributors_title" msgid="5917703088825286504">"ผู้ร่วมให้ข้อมูล"</string>
     <string name="manual" msgid="3025943393642974445">"คู่มือ"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"ข้อมูลเกี่ยวกับกฎระเบียบ"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"ป้ายกำกับกฎข้อบังคับ"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"ข้อมูลความความปลอดภัยและกฎข้อบังคับ"</string>
     <string name="copyright_title" msgid="865906688917260647">"ลิขสิทธิ์"</string>
     <string name="license_title" msgid="1990487604356037871">"สัญญาอนุญาต"</string>
     <string name="terms_title" msgid="7697580845616764642">"ข้อกำหนดในการให้บริการ"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN แบบเปิดตลอดเวลา"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"ไม่ได้เพิ่ม VPN"</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"\"เปิดเสมอ\" ใช้งานอยู่"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"แอปนี้ไม่สนับสนุน"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"เลือกโปรไฟล์ VPN เพื่อคงการเชื่อมต่อเอาไว้ตลอดเวลา การเข้าใช้เครือข่ายจะได้รับอนุญาตเฉพาะเมื่อมีการเชื่อมต่อกับ VPN นี้เท่านั้น"</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"ไม่มี"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"VPN แบบเปิดตลอดเวลาจำเป็นต้องใช้ที่อยู่ IP ทั้งสำหรับเซิร์ฟเวอร์และ DNS"</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"เลื่อนเพื่อปลดล็อก, รหัสผ่าน, รูปแบบ, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"ความท้าทายในการทำงาน, งาน, โปรไฟล์"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"โปรไฟล์งาน, โปรไฟล์ที่มีการจัดการ, รวม, การรวม, งาน, โปรไฟล์"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"ท่าทางสัมผัส"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ตั้งค่าแท็ก NFC สำหรับ Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"เขียน"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"แตะแท็กเพื่อเขียน..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"สามารถใช้ข้อมูลแบ็กกราวด์ผ่าน Wi-Fi ได้เท่านั้น ซึ่งอาจส่งผลกระทบต่อแอปหรือบริการบางอย่างเมื่อไม่มี Wi-Fi"</string>
     <string name="condition_work_title" msgid="7293722361184366648">"โปรไฟล์งานปิดอยู่"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"ปิดใช้แอป การซิงค์ในแบ็กกราวด์ และคุณลักษณะอื่นๆ เกี่ยวกับโปรไฟล์งานของคุณอยู่"</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"รายการแนะนำ (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"คำแนะนำ"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"นำออก"</string>
     <string name="color_temperature" msgid="2070126836910615605">"อุณหภูมิสีเย็น"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ใช้สีแสดงผลที่เย็นกว่านี้"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"รีเซ็ตตัวนับการจำกัดอัตราของ ShortcutManager ไหม"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"ควบคุมการแจ้งเตือนบนหน้าจอล็อก"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"แสดงหรือซ่อนเนื้อหาการแจ้งเตือน"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"ทั้งหมด"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"การสนับสนุน"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"ความกว้างที่เล็กที่สุด"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ไม่มีแอปใดที่ติดตั้งไว้ขอเข้าถึง SMS แบบพรีเมียม"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"การเข้าถึง SMS แบบพรีเมียม"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"ปิดใช้แล้ว"</string>
     <string name="demo_mode" msgid="2655748420527206870">"โหมดสาธิต"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"เราพร้อมช่วยเหลือคุณ"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"เราพร้อมให้การสนับสนุนทุกวันตลอด 24 ชั่วโมง"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"ทีมสนับสนุนของเราพร้อมช่วยคุณแก้ทุกปัญหา"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"ทีมสนับสนุนของเราพร้อมช่วยคุณตลอดเวลาในทุกๆ วัน"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"เวลาการสนับสนุนทางโทรศัพท์ (เวลาท้องถิ่น)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"การค้นหาความช่วยเหลือหรือสำรวจกลเม็ดเคล็ดลับ"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"ประเทศที่สนับสนุน:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"หากคุณเดินทางไปต่างประเทศ"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"อาจมีการเรียกเก็บเงินค่าโทรระหว่างประเทศ"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"โทรศัพท์"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"แชท"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"สำรวจกลเม็ดและเคล็ดลับ"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"ค้นหาความช่วยเหลือและส่งความคิดเห็น"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"ลงชื่อเข้าใช้เพื่อรับการสนับสนุน"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"ลงชื่อเข้าใช้"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"ไม่สามารถเข้าถึงบัญชีใช่ไหม"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"ส่งข้อมูลของระบบ"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"ในการแก้ไขปัญหาของคุณได้อย่างรวดเร็ว เราต้องการข้อมูลของระบบเพื่อการวินิจฉัย"</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"ไม่ต้องแสดงอีก"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"การตั้งค่าโปรไฟล์งาน"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"ค้นหารายชื่อติดต่อ"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"อนุญาตให้องค์กรของคุณค้นหารายชื่อติดต่อเพื่อระบุผู้โทรและรายชื่อติดต่อ"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ชั่วโมง</item>
+      <item quantity="one">1 ชั่วโมง</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> นาที</item>
+      <item quantity="one">1 นาที</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> วินาที</item>
+      <item quantity="one">1 วินาที</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"รอ ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"คอมพิวเตอร์"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"ชุดหูฟัง"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"โทรศัพท์"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"หูฟัง"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"อุปกรณ์อินพุต"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"บลูทูธ"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"ตัวจัดการพื้นที่เก็บข้อมูลจะนำรูปภาพและวิดีโอที่สำรองไว้ออกจากอุปกรณ์ของคุณ เพื่อช่วยเพิ่มพื้นที่เก็บข้อมูล"</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"นำรูปภาพและวิดีโอออก"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"ตัวจัดการพื้นที่เก็บข้อมูล"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"อัตโนมัติ"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"คู่มือ"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"ท่าทางสัมผัส"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"ข้ามไปที่กล้อง"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"หากต้องการเปิดกล้องอย่างรวดเร็ว เพียงแค่แตะปุ่มเปิด/ปิดสองครั้ง ใช้ได้กับหน้าจอทุกรุ่น"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"พลิกกล้อง"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"สลับระหว่างกล้องหน้าและกล้องหลังโดยบิด 2 ครั้ง"</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"ตรวจสอบหน้าจออย่างรวดเร็ว"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"ตรวจสอบโทรศัพท์ของคุณโดยไม่ต้องให้เครื่อง ทำงานอย่างเต็มที่ เพียงแค่สะกิดหรือหยิบขึ้นมา"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"เลื่อนเพื่อดูการแจ้งเตือน"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"หากต้องการตรวจสอบการแจ้งเตือนจากหน้าจอใดก็ตาม เลื่อนลงบนเซ็นเซอร์ลายนิ้วมือ"</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"เปิด"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"ปิด"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"ปลดล็อก Bootloader แล้ว"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"เชื่อมต่ออินเทอร์เน็ตก่อน"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"ไม่พร้อมให้บริการสำหรับอุปกรณ์ที่ล็อกผู้ให้บริการไว้"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 9422035..a0d46c0 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Pink"</item>
     <item msgid="6131821495505931173">"Pula"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Higit sa 30 araw"</item>
+    <item msgid="2900554746706302178">"Higit sa 60 araw"</item>
+    <item msgid="5692284879054004388">"Higit sa 90 araw"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-tl/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-tl/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-tl/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 218cced..94ff980 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"I-enable ang Koneksyon sa Data"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"I-disable ang Koneksyon sa Data"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE Provisioned"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Naka-provision ang Pag-video Call"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Naka-provision ang Pagtawag gamit ang Wifi"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Power ng Cellular Radio"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Tingnan ang Address Book ng SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Tingnan ang Mga Fixed Dialing Number"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"I-unlock ng fingerprint"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Pindutin lang ang sensor para sa fingerprint upang i-unlock ang iyong telepono, pahintulutan ang mga pagbili o mag-sign in sa mga app. Huwag basta-basta magdagdag ng mga fingerprint ng ibang tao. Kahit isang fingerprint lang ang idagdag, magagawa ang alinman sa mga bagay na ito.\n\nTandaan: Maaaring mas hindi ligtas ang iyong fingerprint kaysa sa isang mahirap hulaang pattern o PIN. "<annotation id="url">"Matuto nang higit pa"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Pindutin lang ang sensor ng fingerprint upang i-unlock ang iyong telepono, pahintulutan ang mga pagbili, o mag-sign in sa mga app. Huwag basta-basta magdagdag ng mga fingerprint ng ibang tao. Kahit isang fingerprint lang ang idagdag, magagawa ang alinman sa mga bagay na ito.\n\nTandaan: Maaaring mas hindi ligtas ang iyong fingerprint kaysa sa isang mahirap hulaang pattern o PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Kanselahin"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Magpatuloy"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Laktawan"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"I-delete"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Magsimula na tayo!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Ilagay ang iyong daliri sa sensor at iangat pagkatapos mong makaramdam ng pag-vibrate"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Mahusay! Ulitin ito"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Magpatuloy"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Bahagyang ilipat ang iyong daliri upang idagdag ang lahat ng iba\'t ibang bahagi ng iyong fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Naidagdag fingerprint!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kapag nakikita mo ang icon na ito, maaari mong gamitin ang iyong fingerprint para sa pagkakakilanlan o upang pahintulutan ang isang pagbili."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Hawakan lang ang sensor ng fingerprint upang i-wake at i-unlock ang iyong device."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Kapag nakita mo ang icon na ito, maaari mong gamitin ang iyong fingerprint."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Kapag nakita mo ang icon na ito, maaari mo ring pahintulutan ang mga pagbili o pag-sign in sa mga app."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Laktawan ang pag-set up ng fingerprint?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Pinili mong gamitin ang iyong fingerprint bilang isang paraan upang i-unlock ang iyong telepono. Kung lalaktaw ka ngayon, kakailanganin mo itong i-set up sa ibang pagkakataon. Tumatagal lang nang isang minuto o higit pa ang pag-setup."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"I-set up ang screen lock"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"I-update ang Address na Pang-emergency"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Address na ginamit ng mga serbisyong pang-emergency bilang iyong lokasyon kung tumawag ka sa 911 gamit ang WiFi"</string>
     <string name="home_settings" msgid="212375129455718176">"Home"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ipakita"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Tunog"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Kalimutan"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"I-set up"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"I-explore"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Magbakante ng espasyo"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Pamahalaan ang storage"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Koneksyon ng computer ng USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Kumonekta bilang"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Media na device (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Naka-cache na data"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Iba Pa"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"I-explore ang <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Kabilang sa iba ang mga nakabahaging file na na-save ng mga app, mga file na na-download mula sa Internet o Bluetooth, mga file ng Android at marami pang iba. \n\nUpang makita ang lahat ng content ng <xliff:g id="NAME">^1</xliff:g> na ito, i-tap ang I-explore."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Kasama sa system ang mga file na ginagamit nang internal ng Android operating system. \n\nHindi matitingnan ang mga file na ito nang paisa-isa."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Maaaring may mga naka-save na larawan, musika, pelikula, app o iba pang data si <xliff:g id="USER_0">^1</xliff:g> na gumagamit ng <xliff:g id="SIZE">^2</xliff:g> ng storage. \n\nUpang makita ang mga detalye, lumipat kay <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Legal na impormasyon"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Mga Taga-ambag"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Impormasyon sa regulasyon"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Mga pangkontrol na label"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Info na pangkaligtasan at pangkontrol"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisensya"</string>
     <string name="terms_title" msgid="7697580845616764642">"Mga Tuntunin at kondisyon"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Always-on VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Walang naidagdag na mga VPN."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Aktibo ang palaging naka-on"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Hindi sinusuportahan ng app na ito"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Pumili ng VPN profile kung saan palaging mananatiling nakakonekta. Papayagan lang ang trapiko ng network kapag nakakonekta sa VPN na ito."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Wala"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Nangangailangan ang Always-on VPN ng IP address para sa parehong server at DNS."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"i-slide upang i-unlock, password, pattern, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"hamon sa trabaho, trabaho, profile"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"profile sa trabaho, pinamamahalaang profile, pagsamahin, pagsasama, trabaho, profile"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"galaw"</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>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Mag-tap ng tag upang magsulat..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Available lang ang data ng background kapag may Wi-Fi. Maaari itong makaapekto sa ilang app o serbisyo kapag hindi available ang Wi-Fi."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Naka-off, profile sa trabaho"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Naka-off ang mga app, pag-sync sa background at iba pang mga feature na may kaugnayan sa iyong profile sa trabaho."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Mga Suhestyon (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Mga Suhestyon"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Alisin"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Malamig na temperatura ng kulay"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gumamit ng mas malalamig na kulay ng display"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"I-reset ang mga counter ng ShortcutManager na naglilimita ng rate?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrolin ang notification sa lockscreen"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Ipakita o itago ang content ng notification"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Lahat"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Suporta"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> (na) dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Pinakamaliit na lapad"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Walang mga naka-install na app ang humiling ng access sa Premium SMS"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Access sa Premium SMS"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Naka-disable"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Demo mode"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Narito kami upang tumulong"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Narito kami para sa iyo 24/7"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Narito ang aming team ng suporta upang tumulong na matugunan ang anumang mga isyu"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Available ang aming team ng suporta buong araw, araw-araw"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Mga oras ng suporta sa telepono (lokal na oras)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Maghanap ng tulong o mag-explore ng mga tip at trick"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Suporta para sa:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Magbibiyahe ka ba patungo sa ibang bansa?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Maaaring may mga mga singilin mula sa ibang bansa"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telepono"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Makipag-chat"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Mag-explore ng mga tip at trick"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Maghanap ng tulong at magpadala ng feedback"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Mag-sign in para sa suporta"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Mag-sign in"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Hindi mo ba ma-access ang iyong account?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Magpadala ng impormasyon ng system"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Upang tumulong na matugunan nang mabilis ang iyong isyu, kailangan namin ng impormasyon ng system para sa diagnosis."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Huwag nang ipakitang muli"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Mga setting ng profile sa trabaho"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Paghahanap ng contact"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Payagan ang iyong organisasyon na maghanap ng contact upang makilala ang mga tumatawag at contact"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> oras</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> na oras</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minuto</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> na minuto</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> segundo</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> na segundo</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> na paghihintay"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Computer"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Headset"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telepono"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Headphone"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Input Peripheral"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Upang tumulong na magbakante ng space sa storage, inaalis ng storage manager ang mga naka-back up na larawan at video mula sa iyong device."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Alisin ang mga larawan at video"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Storage manager"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Awtomatiko"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manu-mano"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Mga Galaw"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Pumunta sa Camera"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Upang mabilis na mabuksan ang iyong camera, i-double tap lang ang power button. Gumagana sa kahit saang screen."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Lumipat ng camera"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Upang magpalipat-lipat sa camera sa likod at harap, mag-double twist."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Mabilis na pagtingin sa screen"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Upang tingnan ang iyong telepono nang hindi ito ganap na binubuksan, i-tap o kunin ito."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Mag-swipe upang makita ang mga notification"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Upang makita ang iyong mga notification mula sa kahit saang screen, mag-swipe pababa sa sensor ng fingerprint."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"I-on"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"I-off"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Naka-unlock na ang bootloader"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Kumonekta muna sa Internet"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Hindi available sa mga naka-lock sa carrier na device"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index 56fbf74..361b33a 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Pembe"</item>
     <item msgid="6131821495505931173">"Kırmızı"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"30 günden eski"</item>
+    <item msgid="2900554746706302178">"60 günden eski"</item>
+    <item msgid="5692284879054004388">"90 günden eski"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-tr/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-tr/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-tr/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index c721079..7761ddd 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Veri Bağlantısını Etkinleştir"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Veri Bağlantısını Devre Dışı Bırak"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE Temel Hazırlığı Yapıldı"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Video Görüşmesi Temel Hazırlığını Yap"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Kablosuz Ağ Üzerinden Görüşme Temel Hazırlığını Yap"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Hücresel Radyo Gücü"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM Adres Defterini Görüntüle"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Sabit Arama Numaralarını Görüntüle"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Parmak iziyle kilit açma"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Telefonunuzun kilidini açmak, satın alma işlemlerini yetkilendirmek veya uygulamalarda oturum açmak için parmak izi sensörüne dokunun. Kimin parmak izini eklediğinize dikkat etmeniz gerekir. Parmak izi eklenen tek bir kişi bile bu işlemlerin tümünü yapabilir.\n\nNot: Parmak iziniz, güçlü bir desene veya PIN\'e göre daha az güvenlik sağlayabilir. "<annotation id="url">"Daha fazla bilgi edinin"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Telefonunuzun kilidini açmak, satın alma işlemlerini yetkilendirmek veya uygulamalarda oturum açmak için parmak izi sensörüne dokunmanız yeterli. Kimin parmak izini eklediğinize dikkat etmeniz gerekir. Eklenen tek bir parmak iziyle bile bu işlemlerin tümü yapılabilir.\n\nNot: Parmak iziniz, güçlü bir desenden veya PIN\'den daha az güvenli olabilir."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"İptal"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Devam"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Atla"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Sil"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Başlayalım!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Parmağınızı sensörün üzerine koyun ve bir titreşim hissettiğinizde kaldırın"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Harika! Şimdi tekrarlayın"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Devam edin"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Parmak izinizin tüm farklı noktalarını eklemek için parmağınızı çok az hareket ettirin."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Parmak izi eklendi!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Bu simgeyi her gördüğünüzde, kimlik belirlemek veya bir satın alma işlemine onay vermek için parmak izinizi kullanabilirsiniz."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Cihazınızı uyandırmak ve kilidini açmak için parmak izi sensörüne dokunmanız yeterli."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Bu simgeyi gördüğünüzde parmak izinizi kullanabilirsiniz."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Bu simgeyi gördüğünüzde ayrıca satın alma işlemlerini yetkilendirebilir veya uygulamalarda oturum açabilirsiniz"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Parmak izi ayarlama atlansın mı?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Telefonunuzun kilidini açmak için tek yöntem olarak parmak izinizi kullanmayı seçtiniz. Şimdi atlarsanız bunu daha sonra ayarlamanız gerekecek. Ayarlama işlemi yalnızca bir veya birkaç dakika sürer."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Ekran kilidini ayarla"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Acil Durum Adresini Güncelle"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Kablosuz bağlantı kullanarak 911\'i ararsanız, acil durum hizmetleri tarafından konumunuz olarak kullanılan adres"</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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Unut"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Kur"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Keşfet"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Yer aç"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Depolamayı yönet"</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>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Medya cihazı (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Ses"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Önbelleğe alınan veriler"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Diğer"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> birimini keşfet"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Diğer seçeneği, uygulamalar tarafından kaydedilmiş paylaşılan dosyaları, İnternet\'ten veya Bluetooth\'tan indirilen dosyaları, Android dosyalarını vb. içerir. \n\nBu <xliff:g id="NAME">^1</xliff:g> içeriğinin tamamını görmek için Keşfet\'e hafifçe dokunun."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Sistem, Android işletim sistemi tarafından dahili olarak kullanılan dosyaları içerir. \n\nBu dosyalar ayrı ayrı görüntülenemez."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g>, en fazla <xliff:g id="SIZE">^2</xliff:g> depolama alanı kaplayan kaydedilmiş fotoğraflar, müzik, film, uygulama veya diğer verileri içerebilir. \n\nAyrıntıları görmek için <xliff:g id="USER_1">^1</xliff:g> kullanıcısına geçiş yapın."</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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Yasal bilgiler"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Katkıda bulunanlar"</string>
     <string name="manual" msgid="3025943393642974445">"Manuel"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Düzenleme bilgileri"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Yönetmelik etiketleri"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Güvenlik ve yönetmelik bilgileri"</string>
     <string name="copyright_title" msgid="865906688917260647">"Telif Hakkı"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisans"</string>
     <string name="terms_title" msgid="7697580845616764642">"Şartlar ve koşullar"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Her zaman açık VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"VPN eklenmedi."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Her zaman açık ayarı etkin"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Bu uygulama tarafından desteklenmiyor"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Her zaman bağlı kalacak bir VPN profili seçin. Ağ trafiğine yalnızca bu VPN\'ye bağlanıldığında izin verilir."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Yok"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Her zaman açık VPN seçeneğinde hem sunucu hem de DNS için bir IP adresi gerekir."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"kilidini açmak için kaydırma, şifre, desen, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"iş güvenlik sorusu, iş, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"iş profili, yönetilen profil, birleştir, birleştirme, iş, profil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"hareket"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Kablosuz NFC Etiketini ayarla"</string>
     <string name="write_tag" msgid="8571858602896222537">"Yaz"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Yazmak için bir etikete hafifçe dokunun..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Arka plan veriler yalnızca kablosuz bağlantı üzerinden kullanılabilir. Bu durum, kablosuz bağlantı mevcut olmadığında bazı uygulamaları veya hizmetleri etkileyebilir."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"İş profili kapalı"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"İş profilinizle ilgili uygulamalar, arka planda senkronizasyon ve diğer özellikler kapalı."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Öneriler (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Öneriler"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Kaldır"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Soğuk renk sıcaklığı"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Daha soğuk ekran renkleri kullan"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager hız sınırlama sayaçları sıfırlansın mı?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kilit ekranı bildirimlerini kontrol edin"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Bildirim içeriğini gösterin veya gizleyin"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Tümü"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Destek"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"En küçük genişlik"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Yüklü hiçbir uygulama, Premium SMS erişimi isteğinde bulunmadı"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium SMS erişimi"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Devre dışı"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Demo modu"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Yardımcı olmak için buradayız"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Sizin için 7/24 buradayız"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Destek ekibimiz her tür sorunu çözmenize yardımcı olmak için yanınızdadır"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Destek ekibimiz her gün, tüm gün boyunca yanınızda"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Telefonla destek saatleri (yerel saat)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Yardımda arama yapın veya ipuçları ve püf noktalarını keşfedin"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Şu ülke için destek:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Yurt dışına mı seyahat ediyorsunuz?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Uluslararası kullanım ücretleri alınabilir"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Sohbet"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"İpuçlarını ve püf noktalarını keşfedin"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Yardım\'da arama yapın ve geri bildirim gönderin"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Destek için oturum açın"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Oturum aç"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Hesabınıza erişemiyor musunuz?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Sistem bilgilerini gönder"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Sorununuzu hızlı şekilde çözmenize yardımcı olmak için teşhis amacıyla kullanmak üzere sistem bilgilerine ihtiyacımız var."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Bir daha gösterme"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"İş profili ayarları"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kişi arama"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Arayanların ve kişilerin kimliğini belirlemek için kuruluşunuz tarafından yapılan kişi aramalarına izin verin"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> saat</item>
+      <item quantity="one">1 saat</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> dakika</item>
+      <item quantity="one">1 dakika</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> saniye</item>
+      <item quantity="one">1 saniye</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> bekleme"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Bilgisayar"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Mikrofonlu kulaklık"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telefon"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Kulaklık"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Giriş Çevre Birimi"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Depolama alanında yer açmaya yardımcı olmak için depolama yöneticisi, yedeklenen fotoğrafları ve videoları cihazınızdan kaldırır."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Fotoğrafları ve videoları kaldır"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Depolama yöneticisi"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Otomatik"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuel"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Hareketler"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Kameraya geç"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Kamerayı hızlıca açmak için güç düğmesine iki kez hafifçe dokunmanız yeterli. Tüm ekranlarda çalışır."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Kamerayı çevir"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Ön ve arka kameralar arasında geçiş yapmak için iki kez döndürün."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Ekranı hızlıca kontrol etme"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Telefonunuzu tamamen uyandırmadan kontrol etmek için hafifçe sallayın veya elinize alın."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Bildirimler için hızlıca kaydırın"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Herhangi bir ekrandan bildirimlerinizi kontrol etmek için parmak izi sensöründe hızlıca aşağı kaydırın."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Açık"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Kapalı"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Önyükleyici kilidi zaten açık"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Önce İnternet\'e bağlanın"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Operatör tarafından kilitlenmiş cihazlarda kullanılamaz"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 75bde41..c248629 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Рожевий"</item>
     <item msgid="6131821495505931173">"Червоний"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Старіші за 30 днів"</item>
+    <item msgid="2900554746706302178">"Старіші за 60 днів"</item>
+    <item msgid="5692284879054004388">"Старіші за 90 днів"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-uk/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-uk/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-uk/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index fb8bbf0..30cc92d 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -41,6 +41,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Увімкнути передавання даних"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Вимкнути передавання даних"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Ініціалізація VoLTE"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Відеодзвінки дозволено"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Виклики через Wi-Fi дозволено"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Потужність мобільного радіо"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Переглянути адресну книгу SIM-карти"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Перегл. фікс. номери набору"</string>
@@ -340,7 +342,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Розблокування відбитком"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Щоб розблокувати телефон, дозволити покупку або ввійти в додаток, просто торкніться сканера відбитків пальців. Приймається будь-який відбиток, доданий на телефон. Тож будьте обачні.\n\nПримітка. Відбиток пальця може бути менш надійним, ніж ключ або PIN-код. "<annotation id="url">"Докладніше"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Щоб розблокувати телефон, дозволити покупку або ввійти в додаток, просто торкніться сканера відбитків пальців. Будьте обачні, оскільки приймається будь-який відбиток, доданий на телефон.\n\nПримітка. Відбиток пальця може бути менш надійним, ніж ключ або PIN-код."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Скасувати"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Далі"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Пропустити"</string>
@@ -361,12 +363,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Видалити"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Розпочнімо"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Покладіть палець на датчик і заберіть його, коли відчуєте вібрацію"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Чудово! Повторіть"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Продовжуйте"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Плавно переміщуйте палець, щоб відсканувати відбиток повністю"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Відбиток додано."</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Цей значок означає, що ви можете підтвердити свою особу або покупку за допомогою цифрового відбитка."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Щоб активувати та розблокувати пристрій, просто торкніться датчика відбитків пальців."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Коли з’явиться цей значок, ви можете прикласти палець."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Коли ви бачите цей значок, ви також можете дозволяти покупки або входити в додатки."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Пропустити налаштування відбитка?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Ви вибрали відбиток пальця як один зі способів розблокування телефона. Якщо пропустити цей крок зараз, потрібно буде налаштувати відбиток пізніше. Це займає близько хвилини."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Налаштувати блокування екрана"</string>
@@ -853,6 +855,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Якщо ввімкнути Wi-Fi, ваш телефон зможе спрямовувати дзвінки через мережі Wi-Fi або мережу вашого оператора, залежно від вибраних налаштувань і потужності сигналу мережі. Перш ніж увімкнути цю функцію, уточніть в оператора, скільки коштує ця послуга, та інші деталі."</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"Оновити екстрену адресу"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Адреса, яку знатимуть екстрені служби, якщо ви зателефонуєте 112 через 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>
@@ -1075,6 +1079,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Забути"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Налаштувати"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Переглянути"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Звільнити місце"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Керувати сховищем"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-з’єднання комп’ютера"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Під’єднати як"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Пристрій зберігання даних (MTP)"</string>
@@ -1111,8 +1117,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Аудіо"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Кешовані дані"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Інше"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Система"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Переглянути файли, які містить <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Інше – це файли, збережені додатками чи завантажені з Інтернету, файли Bluetooth, Android тощо. \n\nЩоб побачити всі файли, які містить <xliff:g id="NAME">^1</xliff:g>, торкніться опції \"Переглянути\"."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Система містить файли, які внутрішньо використовує ОС Android. \n\nЦі файли не можна переглядати окремо."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Можливо, <xliff:g id="USER_0">^1</xliff:g> зберігає фотографії, музику, фільми, додатки або інші дані, які займають <xliff:g id="SIZE">^2</xliff:g> пам’яті. \n\nЩоб переглянути деталі, увійдіть як <xliff:g id="USER_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>
@@ -1303,7 +1311,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Правова інформація"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Співавтори"</string>
     <string name="manual" msgid="3025943393642974445">"Посібник"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Нормативна інформація"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Регулятивні мітки"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Безпекова та нормативна інформація"</string>
     <string name="copyright_title" msgid="865906688917260647">"Автор. право"</string>
     <string name="license_title" msgid="1990487604356037871">"Ліцензія"</string>
     <string name="terms_title" msgid="7697580845616764642">"Заг. положення й умови"</string>
@@ -2264,6 +2273,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Постійна мережа VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Мереж VPN не додано."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Вибрано опцію \"Завжди ввімкнено\""</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Цей додаток не підтримує"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Виберіть профіль мережі VPN і не від’єднуйтесь від неї. Мережевий трафік дозволятиметься лише за умови під’єднання до цієї VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Не використовувати"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Для постійної мережі VPN потрібна IP-адреса як для сервера, так і для DNS."</string>
@@ -2540,6 +2550,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"розблокувати проведенням пальця, пароль, ключ, PIN-код"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"робоче завдання, робочий, профіль"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"робочий профіль, керований профіль, об’єднати, об’єднання, робота, профіль"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"жест"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Налаштувати NFC-тег для Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Записати"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Торкніться тегу, у який потрібно записати дані…"</string>
@@ -3051,7 +3062,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Фоновий режим доступний лише через Wi-Fi. Це може вплинути на роботу деяких додатків і служб, коли мережа Wi-Fi недоступна."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Робочий профіль вимкнено"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Вимкнено додатки, фонову синхронізацію й інші функції, пов’язані з вашим робочим профілем."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Пропозиції (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Пропозиції"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Видалити"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Холодна температура кольорів"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Використовувати холодніші кольори дисплея"</string>
@@ -3146,6 +3158,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Скинути лічильники обмеження швидкості в ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Керуйте сповіщеннями на заблок. екрані"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Показуйте або приховуйте вміст сповіщень"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Усі"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Підтримка"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"Точок: <xliff:g id="ID_1">%d</xliff:g>"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Найменша ширина"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Установлені додатки не запитували доступ до платних SMS"</string>
@@ -3153,9 +3167,49 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Доступ до платних SMS"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Вимкнено"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Демонстраційний режим"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Ми готові допомогти"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Ми працюємо цілодобово та без вихідних"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Наша служба підтримки допоможе вам вирішити будь-які проблеми"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Наша команда підтримки працює цілодобово та без вихідних"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Години роботи служби підтримки телефоном (за місцевим часом):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Шукайте в довідці або читайте поради та підказки"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Підтримується:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> – <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Подорожуєте за кордоном?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Може стягуватися плата за дзвінок в іншу країну"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Телефон"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Чат"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Переглянути поради та підказки"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Шукати в довідковому центрі/надіслати відгук"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Щоб попросити підтримку, увійдіть в обліковий запис"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Увійти"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Не можете ввійти в обліковий запис?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Надіслати інформацію про систему"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Щоб швидко вирішити вашу проблему, нам потрібна інформація про систему для діагностики."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Більше не показувати"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Налаштування робочого профілю"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Пошук контактів"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Дозволити вашій організації шукати контакти, щоб визначати абонентів і контактних осіб"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> година</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> години</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> годин</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> години</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> хвилина</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> хвилини</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> хвилин</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> хвилини</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> секунда</item>
+      <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> секунди</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> секунд</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> секунди</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Очікування ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Комп’ютер"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Гарнітура"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Телефон"</string>
@@ -3163,4 +3217,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Навушники"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Периферійне введення"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Щоб звільнити місце, диспетчер пам’яті видаляє з пристрою резервні копії фото й відео."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Видалити фото й відео"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Диспетчер пам’яті"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Автоматично"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Вручну"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Жести"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Як перейти до камери"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Щоб швидко відкрити камеру, двічі натисніть кнопку живлення. Працює на будь-якому екрані."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Як змінити камеру"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Щоб переключитися між передньою та задньою камерами, двічі покрутіть пристроєм."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Як швидко перевірити екран"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Щоб перевірити телефон, не виводячи з режиму сну, посуньте його або візьміть у руки."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Як переглянути сповіщення"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Щоб переглянути сповіщення на будь-якому екрані, проведіть пальцем униз на сканері відбитків пальців."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Увімкнено"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Вимкнено"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Завантажувач уже розблоковано"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Спершу під’єднайтеся до Інтернету"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Недоступно на пристроях, які заблокував оператор"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-ur-rPK/arrays.xml b/res/values-ur-rPK/arrays.xml
index 6553f1b..125d728 100644
--- a/res/values-ur-rPK/arrays.xml
+++ b/res/values-ur-rPK/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"گلابی"</item>
     <item msgid="6131821495505931173">"سرخ"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"30 دن سے زیادہ پرانا"</item>
+    <item msgid="2900554746706302178">"60 دن سے زیادہ پرانا"</item>
+    <item msgid="5692284879054004388">"90 دن سے زیادہ پرانا"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-ur-rPK/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-ur-rPK/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-ur-rPK/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index d8ea827..f9d9417 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"ڈیٹا کنکشن فعال کریں"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ڈیٹا کنکشن غیر فعال کریں"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"‏VoLTE سے لیس"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"ویڈیو کالنگ فراہم کردہ"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"‏WiFi کالنگ فراہم کردہ"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"سیلولر ریڈیو پاور"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"‏SIM ایڈریس بک دیکھیں"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"فکسڈ ڈائلنگ نمبرز دیکھیں"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"فنگر پرنٹ کے ساتھ غیر مقفل کریں"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"‏اپنا فون غیر مقفل کرنے، خریداریوں کی اجازت دینے یا ایپس میں سائن ان کرنے کیلئے بس فنگر پرنٹ سنسر کو ٹچ کریں۔ کسی کے فنگر پرنٹس شامل کرتے وقت احتیاط برتیں۔ ایک شامل کردہ فنگر پرنٹ سے بھی یہ کام کئے جا سکتے ہیں۔\n\nنوٹ: ایک طاقتور پیٹرن یا PIN کی نسبت آپ کا فنگر پرنٹ شاید کم محفوظ ہو۔"<annotation id="url">"مزید جانیں"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"‏اپنا فون غیر مقفل کرنے، خریداریوں کی اجازت دینے یا ایپس میں سائن ان کرنے کیلئے بس فنگر پرنٹ سنسر کو ٹچ کریں۔ کسی کے فنگر پرنٹس شامل کرتے وقت احتیاط برتیں۔ بس ایک شامل کردہ فنگر پرنٹ سے یہ سارے کام کئے جا سکتے ہیں۔\n\nنوٹ: ایک طاقتور پیٹرن یا PIN کی نسبت آپ کا فنگر پرنٹ شاید کم محفوظ ہو۔"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"منسوخ کریں"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"جاری رکھیں"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"نظر انداز کریں"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"حذف کریں"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"آئیے شروع کریں!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"اپنی انگلی سنسر پر رکھیں اور ارتعاش محسوس ہونے کے بعد اٹھا لیں"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"زبردست! اب دہرائیں"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"جاری رکھیں"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"اپنے فنگرپرنٹ کے تمام حصوں کو شامل کرنے کیلئے اپنی انگلی کو تھوڑی سی حرکت دیں"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"فنگر پرنٹ شامل ہو گیا!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"آپ کو جب بھی یہ آئیکن دکھائی دیتا ہے تو آپ شناخت کرنے یا خریداری کی توثیق کرنے کیلئے اپنا فنگر پرنٹ استعمال کر سکتے ہیں۔"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"اپنے آلے کو جگانے اور غیر مقفل کرنے کیلئے بس فنگرپرنٹ سنسر کو ٹچ کریں۔"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"جب آپ اس آئیکن کو دیکھیں تو آپ اپنا فنگرپرنٹ استعمال کر سکتے ہیں۔"</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"جب آپ اس آئیکن کو دیکھیں، آپ خریداریوں کی اجازت بھی دے سکتے ہیں یا ایپس میں سائن ان ہو سکتے ہیں۔"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"فنگر پرنٹ سیٹ اپ نظر انداز کریں؟"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"آپ نے اپنا فون غیر مقفل کرنے کیلئے ایک طریقہ اپنے فنگرپرنٹ کا استعمال منتخب کیا ہے۔ اگر آپ اب نظر انداز کرتے ہیں تو آپ کو اسے بعد میں سیٹ اپ کرنا ہوگا۔ سیٹ اپ میں کم و بیش ایک منٹ کا وقت لگتا ہے۔"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"اسکرین لاک کو ترتیب دیں"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"‏Wi-Fi کالنگ آن ہونے پر، آپ کا فون آپ کی ترجیح اور زیادہ مضبوط سگنل کی بنیاد پر کالز کا روٹ Wi-Fi یا آپ کے کیریئر نیٹ ورک کے ذریعہ کر سکتا ہے۔ اس خصوصیت کو آن کرنے سے پہلے، فیس اور دیگر تفصیلات کیلئے اپنے کیریئر سے رابطہ کریں۔"</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"ہنگامی پتہ اپ ڈیٹ کریں"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"‏اگر آپ WiFi استعمال کرکے 911 پر کال کریں تو ایمرجنسی سروسز کی جانب سے پتہ آپ کے مقام کے طور پر استعمال ہوتا ہے"</string>
     <string name="home_settings" msgid="212375129455718176">"ہوم"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ڈسپلے"</string>
     <string name="sound_settings" msgid="5534671337768745343">"آواز"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"بھول جائیں"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"سیٹ اپ کریں"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"دریافت کریں"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"‏Space خالی کریں"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"اسٹوریج کا نظم کریں"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"‏USB کمپیوٹر کنکشن"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"مربوط ہوں بطور"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"‏میڈیا آلہ (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"آڈیو"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"کیش شدہ ڈیٹا"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"دیگر"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"سسٹم"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> دریافت کریں"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"‏دیگر میں شامل ہے ایپس کی جانب سے محفوظ کردہ اشتراک کردہ فائلیں، انٹرنیٹ یا بلوٹوتھ سے ڈاؤن لوڈ کی گئی فائلیں، Android فائلیں وغیرہ وغیرہ۔ \n\nاس <xliff:g id="NAME">^1</xliff:g> کا تمام مواد دیکھنے کیلئے دریافت کریں پر کلک کریں۔"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"‏سسٹم میں وہ فائلز شامل ہیں جو Android آپریٹنگ سسٹم داخلی طور پر استعمال کرتا ہے۔ \n\nیہ فائلز انفرادی طور پر نہیں دیکھی جا سکتیں۔"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> نے شاید تصاویر، موسیقی، موویز، ایپس یا کوئی اور ڈیٹا محفوظ کیا ہو جو اسٹوریج کی <xliff:g id="SIZE">^2</xliff:g> جگہ لے رہا ہے۔ \n\nتفصیلات دیکھنے کیلئے <xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"قانونی معلومات"</string>
     <string name="contributors_title" msgid="5917703088825286504">"معاونین"</string>
     <string name="manual" msgid="3025943393642974445">"مینوئل"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"انضباطی معلومات"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"انضباطی لیبلز"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"حفاظت اور انضباطی معلومات"</string>
     <string name="copyright_title" msgid="865906688917260647">"کاپی رائٹ"</string>
     <string name="license_title" msgid="1990487604356037871">"لائسنس"</string>
     <string name="terms_title" msgid="7697580845616764642">"شرائط و ضوابط"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"‏ہمیشہ آن VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"‏کوئی VPN شامل نہیں ہوا۔"</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"\'ہمیشہ آن\' فعال ہے"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"اس ایپ سے تعاون یافتہ نہیں"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"‏ہمیشہ مربوط رہنے کیلئے ایک VPN پروفائل منتخب کریں۔ صرف اس VPN سے مربوط ہونے پر ہی نیٹ ورک ٹریفک کی اجازت ہو گی۔"</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"کوئی نہیں"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"‏ہمیشہ آن VPN کو سرور اور DNS دونوں کیلئے ایک IP پتہ کی ضرورت ہے۔"</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"‏غیر مقفل کرنے کیلئے سلائیڈ کریں، پاس ورڈ، پیٹرن، PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"کام کا چیلنج، کام، پروفائل"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"دفتری پروفائل، منظم پروفائل، یکجا کریں، یکجا کرنا، کام، پروفائل"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"اشارہ"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏Wi-Fi NFC ٹیگ ترتیب دیں"</string>
     <string name="write_tag" msgid="8571858602896222537">"تحریر کریں"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"لکھنے کیلئے ایک ٹیگ کو تھپتھپائیں…"</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"‏پس منظر ڈیٹا صرف بذریعہ Wi-Fi دستیاب ہے۔ جب Wi-Fi دستیاب نہ ہو تو کچھ ایپس یا سروسز متاثر ہو سکتی ہیں۔"</string>
     <string name="condition_work_title" msgid="7293722361184366648">"دفتری پروفائل آف ہے"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"آپ کے دفتری پروفائل سے متعلق ایپس، پس منظر کی مطابقت پذیری اور دیگر خصوصیات آف ہیں۔"</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"تجاویز (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"تجاویز"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"<xliff:g id="ID_1">%1$d</xliff:g>+"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"ہٹائیں"</string>
     <string name="color_temperature" msgid="2070126836910615605">"سرد رنگ کا درجہ حرارت"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ڈسپلے کیلئے سرد رنگ استعمال کریں"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"‏ShortcutManager کے شرح محدود بندی کاؤنٹرز ری سیٹ کریں؟"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"قفل اسکرین کی اطلاعات کنٹرول کریں"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"اطلاعی مواد دکھائیں یا چھپائیں"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"تمام"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"اعانت"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"سب سے چھوٹی چوڑائی"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"‏کسی انسٹال کردہ ایپ نے پریمیم SMS تک رسائی کی درخواست نہیں کی"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"‏پریمیم SMS رسائی"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"غیر فعال"</string>
     <string name="demo_mode" msgid="2655748420527206870">"ڈیمو موڈ"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"ہم مدد کیلئے ہیں نا"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"ہم 24/7 آپ کیلئے یہاں موجود ہیں"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"ہماری سپورٹ ٹیم کسی بھی قسم کے مسائل حل کرنے میں مدد کرنے کیلئے موجود ہے"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"ہماری سپورٹ ٹیم ہر وقت، سارا دن آپ کی مدد کیلئے موجود ہوتی ہے"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"‏فون سپورٹ کے اوقات (مقامی وقت)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"مدد تلاش کریں یا تجاویز اور تراکیب دریافت کریں"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"سپورٹ برائے:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"بیرون ملک کا سفر کر رہے ہیں؟"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"بین الاقوامی چارجز لاگو ہو سکتے ہیں"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"فون"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"چیٹ کریں"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"تجاویز اور تراکیب دریافت کریں"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"مدد تلاش کریں اور تاثرات بھیجیں"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"سپورٹ کیلئے سائن ان کریں"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"سائن ان کریں"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"اپنے اکاوئنٹ تک رسائی حاصل نہیں ہو رہی؟"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"سسٹم کی معلومات بھیجیں"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"آپ کا مسئلہ فوری طور پر حل کرنے کیلئے، ہمیں تشخیص کیلئے سسٹم کی معلومات درکار ہے۔"</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"دوبارہ مت دکھائیں"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"دفتری پروفائل کی ترتیبات"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"رابطہ تلاش"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"کالرز اور رابطوں کی شناخت کیلئے اپنی تنظیم کی جانب سے رابطہ تلاشیوں کی اجازت دیں"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> گھنٹے</item>
+      <item quantity="one">1 گھنٹہ</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> منٹ</item>
+      <item quantity="one">1 منٹ</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> سیکنڈ</item>
+      <item quantity="one">1 سیکنڈ</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"<xliff:g id="ESTIMATE">%1$s</xliff:g>~ انتظار"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"کمپیوٹر"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"ہیڈ سیٹ"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"فون"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"ہیڈ فون"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"ان پٹ پیریفرل"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"بلوٹوتھ"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"اسٹوریج کی جگہ خالی کرنے میں مدد کیلئے، اسٹوریج مینیجر آپ کے آلہ سے بیک اپ شدہ تصاویر اور ویڈیوز ہٹا دیتا ہے۔"</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"تصاویر اور ویڈیوز ہٹائیں"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"اسٹوریج مینیجر"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"خودکار"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"مینوئل"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"اشارے"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"کیمرا پر جائیں"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"کیمرہ کو تیزی سے کھولنے کیلئے بس پاور بٹن کو دو بار تھپتھپائیں۔ یہ کسی بھی اسکرین سے کام کرتا ہے۔"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"کیمرا پلٹیں"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"سامنے اور پیچھے کے کیمروں کے درمیان سوئچ کرنے کیلئے دو بار مروڑیں۔"</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"فوری اسکرین چیک"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"اپنے فون کو پوری طرح فعال کیے بغیر چیک کرنے کیلئے اسے ہلائیں یا اٹھائیں۔"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"اطلاعات کیلئے سوائپ کریں"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"کسی بھی اسکرین سے اپنی اطلاعات چیک کرنے کیلئے فنگر پرنٹ سینسر پر نیچے سوائپ کریں۔"</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"آن"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"آف"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"بوٹ لوڈر پہلے سے غیر مقفل ہے"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"پہلے انٹرنیٹ سے منسلک ہوں"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"کیریئر کے ذریعہ مقفل آلات پر غیر دستیاب ہے"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-uz-rUZ/arrays.xml b/res/values-uz-rUZ/arrays.xml
index 7854c7d..3ee0f62 100644
--- a/res/values-uz-rUZ/arrays.xml
+++ b/res/values-uz-rUZ/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Pushti"</item>
     <item msgid="6131821495505931173">"Qizil"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"30 kundan ko‘proq"</item>
+    <item msgid="2900554746706302178">"60 kundan ko‘proq"</item>
+    <item msgid="5692284879054004388">"90 kundan ko‘proq"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-uz-rUZ/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-uz-rUZ/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-uz-rUZ/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 135c1b9..02eb57e 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Mobil internetni yoqish"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Mobil internetni o‘chirish"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE sinxronizatsiyasi yoqilgan"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Video qo‘ng‘iroqlar ta’minoti yoniq"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi qo‘ng‘iroqlar ta’minoti yoniq"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Mobil aloqa ta’minoti"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM kartadagi manzillar kitobini ko‘rish"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Ruxsat etilgan raqamlarni ko‘rish"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Barmoq izi skaneri"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Telefonni qulfdan chiqarish, xaridlarni amalga oshirish yoki ilovalarga kirish uchun shunchaki barmoq izi skaneriga tegining. Telefoningizga qo‘shilgan har qanday barmoq izi yordamida bularni bajarish mumkin, shuning uchun ehtiyot undan bo‘lib foydalaning.\n\nEslatma: Barmoq izining xavfsizlik darajasi grafik kalit yoki PIN kodnikiga qaraganda pastroq. "<annotation id="url">"Batafsil ma’lumot"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Telefon qulfini ochish, xaridlarni amalga oshirish yoki ilovalarga kirish uchun shunchaki barmoq izi skaneriga tegining. Telefoningizga qo‘shilgan har qanday barmoq izi yordamida bularni bajarish mumkin, shuning uchun undan ehtiyot bo‘lib foydalaning.\n\nEslatma: Barmoq izining himoya darajasi grafik kalit yoki PIN kodga qaraganda kuchsizroq."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Bekor qilish"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Davom etish"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"O‘tkazib yuborish"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"O‘chirish"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Boshladik!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Barmog‘ingizni skaner ustiga qo‘yib, tebranishni his qilguncha bosib turing"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Ajoyib! Endi yana takrorlang"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Davom eting"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Barmoq izi to‘liq olinishi uchun barmog‘ingizni sekin harakatlantiring."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Barmoq izi qo‘shildi!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Quyidagi belgi identifikatsiyadan o‘tish yoki xaridlarni tasdiqlash uchun barmoq izidan foydalanish mumkinligini bildiradi."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Qurilmani uyg‘otish va uni qulfdan chiqarish uchun shunchaki barmoq izi skaneriga tegining."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Agar shu belgi ko‘rinsa, barmoq izidan foydalanish mumkin."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Agar shu ikonka ko‘rinsa, xaridlarni tasdiqlashingiz yoki ilovalarga kirishingiz ham mumkin."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Barmoq izini sozlash o‘tkazib yuborilsinmi?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Siz telefoningizni qulfdan chiqarishning bir usuli sifatida barmoq izini tanlagansiz. Agar buni hozir o‘tkazib yuborsangiz, uni keyinroq sozlashga to‘g‘ri keladi. Sozlash atigi bir daqiqa atrofida vaqt oladi."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Ekranni qulfini sozlash"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Favqulodda holatlar uchun manzilni o‘zgartirish"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"WiFi orqali 112 raqamiga qo‘ng‘iroq qilganingizda, favqulodda xizmatlar foydalanadigan manzilingiz"</string>
     <string name="home_settings" msgid="212375129455718176">"Uyga"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekran"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ovoz"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Qurilmani unutish"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Sozlash"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Ochish"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Joy bo‘shatish"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Xotirani boshqarish"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Kompyuter bilan USB ulanish"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Quyidagicha ulanish"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Media qurilma (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Kesh ma’lumotlari"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Boshqa"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Tizim"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Boshqa fayllarga ilovalar tomonidan saqlangan umumiy fayllar, Internetdan yuklab olingan yoki Bluetooth orqali olingan fayllar, Android fayllari va boshqalar kiradi. \n\nUshbu SD karta (<xliff:g id="NAME">^1</xliff:g>) ichidagi narsalarni ko‘rish uchun “Ko‘rib chiqish” tugmasini bosing."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Tizim fayllari Android operatsion tizimi tomonidan ishlatiladi. \n\nMazkur fayllarni alohida ko‘rib bo‘lmaydi."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> rasm, musiqa, film, ilova yoki <xliff:g id="SIZE">^2</xliff:g> xotirani egallagan boshqa ma’lumotlarni saqlagan bo‘lishi mumkin. \n\nTafsilotlarni ko‘rish uchun <xliff:g id="USER_1">^1</xliff:g> profiliga o‘ting."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> kartasini sozlang"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Ko‘chma xotira sifatida foydalanish"</string>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Huquqiy ma’lumotlar"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Hissa qo‘shganlar"</string>
     <string name="manual" msgid="3025943393642974445">"Qo‘llanma"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Sertifikat ma’lumotlari"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Sertifikat yorliqlari"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Xavfsizlik va sertifikat ma’lumotlari"</string>
     <string name="copyright_title" msgid="865906688917260647">"Mualliflik huquqi"</string>
     <string name="license_title" msgid="1990487604356037871">"Litsenziya"</string>
     <string name="terms_title" msgid="7697580845616764642">"Foydalanish shartlari"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Doimiy VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Hech qanday VPN qo‘shilmagan."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Har doim faol"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Bu ilova tomonidan qo‘llab-quvvatlanmaydi"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Doimiy VPN tarmog‘ini tanlang: faqat ushbu tarmoqqa ulanganda trafik sarflanishiga ruxsat beriladi."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Ishlatilmasin"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Server va DNS uchun IP manzilini ko‘rsating."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"qulfni ochish uchun surish, parol, grafik kalit, PIN kod"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"ish vazifasi, ish, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"ishchi profil, boshqariluvchi profil, birlashtirish, birlashuv, ish, profil"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"imo-ishora orqali matn kiritish"</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>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Yozish uchun yorliq ustiga bosing…"</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Fondagi internet faqat Wi-Fi orqali ishlaydi. Agar Wi-Fi o‘chiq bo‘lsa, bu bir qancha ilovalar va xizmatlarning ishlashiga ta’sir qilishi mumkin."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Ishchi profil o‘chirilgan"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Ishchi profil bilan bog‘liq ilovalar, fonda sinxronlash va boshqa funksiyalar o‘chirib qo‘yildi."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Tavsiyalar (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Tavsiyalar"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Olib tashlash"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Salqin rang harorati"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Salqin displey ranglaridan foydalanish"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"ShortcutManager uchun tezlikni cheklash hisoblagichi qaytadan boshlansinmi?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Ekran qulfi bildirishnomalarini boshqaring"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Bildirishnomani ko‘rsatish yoki berkitish"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Hammasi"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Ko‘mak"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Eng kichik eni"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"O‘rnatilgan ilovalardan hech biri SMSdan foydalanish uchun ruxsat so‘ramagan."</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"SMSdan foydalanish"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"O‘chiq"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Demo rejim"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Sizga yordam berish uchun shu yerdamiz"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Biz kecha-yu kunduz xizmatingizdamiz"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Bizning ko‘mak jamoamiz har qanday masalani hal qilish uchun xizmatingizda"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Ko‘mak markazimiz jamoasi kecha-yu kunduz xizmatingizda"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Ko‘mak xizmatining ish soatlari (mahalliy vaqt bilan):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Muammolar yechimini qidiring yoki maslahat va tavsiyalar bilan tanishib chiqing"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Ko‘mak xizmati:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> – <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Sayohat qilyapsizmi?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Xalqaro qo‘ng‘iroqlar uchun to‘lov olinishi mumkin"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Maslahat va tavsiyalar bilan tanishib chiqish"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Muammolar yechimini qidirish va fikr-mulohaza yuborish"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Ko‘mak olish uchun hisobingizga kiring"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Kirish"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Hisobingizga kira olmayapsizmi?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Tizim haqida ma’lumotlarni yuborish"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Muammolarni tezroq hal qilishda tashxis qo‘yish uchun tizim haqida ma’lumotlar zarur."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Boshqa ko‘rsatilmasin"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Ishchi profil sozlamalari"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaktlarni qidirish"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Tashkilot nomi bo‘yicha qidiruvda qo‘ng‘iroq qiluvchi abonent va uning kontaktini aniqlashga ruxsat berish"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> soat</item>
+      <item quantity="one">1 soat</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> daqiqa</item>
+      <item quantity="one">1 daqiqa</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> soniya</item>
+      <item quantity="one">1 soniya</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Kutish: taxminan <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Kompyuter"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Audio moslama"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telefon"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Quloqchin"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Kiritish qurilmasi"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Xotiradan joy bo‘shatishga yordamlashish uchun xotira boshqaruvi qurilmangizdan zaxiralangan rasm va videolarni o‘chirib tashlaydi."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Rasm va videolarni o‘chirib tashlash"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Xotira boshqaruvi"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Avtomatik"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Qo‘llanma"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Imo-ishoralar"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Kameraga o‘tish"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Kamerani tez ochish uchun quvvat tugmasini ikki marta bosing. Har qanday ekranda ishlaydi."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Kamerani almashtirish"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Oldingi va orqa kameralarni almashtirish uchun qurilmangizni ikki marta silkiting."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Ekranni tezkor tekshirish"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Telefoningizni to‘liq yoqmagan holda tekshirish uchun ekranini ohista bosing yoki uni qo‘lingizga oling."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Bildirishnomalarni ochish uchun suring"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Bildirishnomalarni har qanday ekrandan ko‘rish uchun barmoq izi skanerida barmog‘ingizni pastga suring."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Yoniq"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"O‘chiq"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"OT yuklagich allaqachon qulfdan chiqarilgan"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Avval internetga ulaning"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Operator tomonidan qulflangan qurilmalarda ishlamaydi"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index bd36b15..1ae911b 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Hồng"</item>
     <item msgid="6131821495505931173">"Đỏ"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Hơn 30 ngày"</item>
+    <item msgid="2900554746706302178">"Hơn 60 ngày"</item>
+    <item msgid="5692284879054004388">"Hơn 90 ngày"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-vi/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-vi/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-vi/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index e5dd8e5..320c724 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Bật kết nối dữ liệu"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Tắt kết nối dữ liệu"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Đã cấp phép VoLTE"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Đã cấp phép gọi điện video"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Đã cấp phép gọi điện qua Wi-Fi"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Cường độ của sóng di động"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Xem sổ địa chỉ trên SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Xem Số quay định sẵn"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Mở khóa bằng vân tay"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Chỉ cần chạm vào cảm biến vân tay để mở khóa điện thoại của bạn, ủy quyền mua hàng hoặc đăng nhập vào ứng dụng. Hãy cẩn trọng với vân tay mà bạn thêm. Thậm chí một vân tay được thêm cũng có thể làm tất cả những việc này.\n\nLưu ý: Vân tay của bạn có thể kém an toàn hơn so với hình mở khóa hoặc mã PIN mạnh. "<annotation id="url">"Tìm hiểu thêm"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Chỉ cần chạm vào cảm biến vân tay để mở khóa điện thoại của bạn, ủy quyền mua hàng hoặc đăng nhập vào ứng dụng. Hãy cẩn trọng với vân tay mà bạn thêm. Thậm chí một vân tay được thêm cũng có thể làm tất cả những việc này.\n\nLưu ý: Vân tay của bạn có thể kém an toàn hơn so với hình mở khóa hoặc mã PIN mạnh."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Hủy"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Tiếp tục"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Bỏ qua"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Xóa"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Hãy bắt đầu!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Đặt ngón tay của bạn lên cảm biến và nhấc lên sau khi bạn cảm thấy rung"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Tốt lắm! Hãy làm lại"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Tiếp tục"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Di chuyển ngón tay của bạn một chút để thêm tất cả các phần khác nhau của dấu vân tay"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Đã thêm vân tay!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Bất cứ khi nào nhìn thấy biểu tượng này, bạn có thể sử dụng vân tay của mình để nhận dạng hoặc ủy quyền mua hàng."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Chỉ cần chạm vào cảm biến dấu vân tay để đánh thức và mở khóa thiết bị của bạn."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Khi nhìn thấy biểu tượng này, bạn có thể sử dụng dấu vân tay của mình."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Khi thấy biểu tượng này, bạn cũng có thể ủy quyền đơn mua hàng hoặc đăng nhập vào ứng dụng."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Bỏ qua thiết lập vân tay?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Bạn đã chọn sử dụng vân tay là cách mở khóa điện thoại của mình. Nếu bỏ qua ngay bây giờ, bạn sẽ cần thiết lập cài đặt này sau. Thiết lập sẽ chỉ mất ít phút."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Thiết lập khóa màn hình"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Cập nhật địa chỉ khẩn cấp"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Địa chỉ được các dịch vụ khẩn cấp sử dụng làm vị trí của bạn nếu bạn gọi cho 911 bằng WiFi"</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>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Bỏ qua"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Thiết lập"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Khám phá"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Giải phóng dung lượng"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Quản lý bộ nhớ"</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>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Thiết bị phương tiện (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Âm thanh"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Dữ liệu đã lưu vào bộ nhớ cache"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Dữ liệu khác"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Hệ thống"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Khám phá <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Tệp khác bao gồm tệp chia sẻ được ứng dụng lưu, tệp đã tải xuống từ Internet hoặc Bluetooth, tệp Android, v.v. \n\nĐể xem toàn bộ nội dung của <xliff:g id="NAME">^1</xliff:g> này, hãy nhấn vào Khám phá."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Hệ thống bao gồm các tệp mà hệ điều hành Android sử dụng nội bộ. \n\nKhông thể xem các tệp này riêng lẻ."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> có thể đã lưu ứng dụng, phim, nhạc, ảnh hoặc dữ liệu khác chiếm <xliff:g id="SIZE">^2</xliff:g> bộ nhớ. \n\nĐể xem chi tiết, hãy chuyển sang <xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Thông tin pháp lý"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Người đóng góp"</string>
     <string name="manual" msgid="3025943393642974445">"Hướng dẫn sử dụng"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Thông tin về quy định"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Nhãn theo quy định"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Thông tin về quy định và an toàn"</string>
     <string name="copyright_title" msgid="865906688917260647">"Bản quyền"</string>
     <string name="license_title" msgid="1990487604356037871">"Giấy phép"</string>
     <string name="terms_title" msgid="7697580845616764642">"Điều khoản và điều kiện"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN luôn bật"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Chưa thêm VPN nào."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Luôn bật đang hoạt động"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Không được ứng dụng này hỗ trợ"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Chọn một cấu hình VPN để luôn giữ kết nối. Lưu lượng truy cập mạng sẽ chỉ được cho phép khi kết nối với VPN này."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Không có"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"VPN luôn bật yêu cầu có địa chỉ IP cho cả máy chủ và DNS."</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"trượt để mở khóa, mật khẩu, hình mở khóa, mã PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"thách thức công việc, công việc, hồ sơ"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"hồ sơ công việc, hồ sơ được quản lý, thống nhất, hợp nhất, làm việc, hồ sơ"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"cử chỉ"</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>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Nhấn vào một thẻ để ghi..."</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Dữ liệu nền chỉ khả dụng qua Wi-Fi. Điều này có thể ảnh hưởng đến một số ứng dụng hoặc dịch vụ khi không có Wi-Fi."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Hồ sơ công việc đã tắt"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Ứng dụng, đồng bộ hóa dưới nền và các tính năng khác có liên quan đến hồ sơ công việc của bạn bị tắt."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Đề xuất (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Đề xuất"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Xóa"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Nhiệt độ màu lạnh"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Sử dụng màu hiển thị lạnh hơn"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Đặt lại bộ đếm giới hạn tốc độ trong ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kiểm soát thông báo trên màn hình khóa"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Hiển thị hoặc ẩn nội dung thông báo"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Tất cả"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Hỗ trợ"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Độ rộng nhỏ nhất"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Không có ứng dụng đã cài đặt nào yêu cầu quyền truy cập SMS cao cấp"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Quyền truy cập SMS cao cấp"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Đã tắt"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Chế độ trình diễn"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Chúng tôi sẵn sàng trợ giúp"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Chúng tôi sẵn sàng trợ giúp bạn 24/7"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Nhóm hỗ trợ của chúng tôi luôn có mặt để giải quyết mọi vấn đề"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Nhóm hỗ trợ của chúng tôi làm việc cả ngày, mọi ngày trong tuần"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Điện thoại hỗ trợ giờ (giờ địa phương)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Tìm kiếm trợ giúp hoặc khám phá mẹo và thủ thuật"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Hỗ trợ cho:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Bạn muốn du lịch nước ngoài?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Có thể áp dụng phí quốc tế"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Điện thoại"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Trò chuyện"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Khám phá các mẹo và thủ thuật"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Tìm kiếm trợ giúp và gửi phản hồi"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Đăng nhập để được hỗ trợ"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Đăng nhập"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Không thể truy cập tài khoản của bạn?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Gửi thông tin hệ thống"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Để giúp giải quyết nhanh vấn đề của bạn, chúng tôi cần thông tin hệ thống để chẩn đoán."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Không hiển thị lại"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Cài đặt hồ sơ công việc"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Tìm kiếm liên hệ"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Cho phép tìm kiếm liên hệ theo tổ chức để xác định người gọi và liên hệ"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> giờ</item>
+      <item quantity="one">1 giờ</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> phút</item>
+      <item quantity="one">1 phút</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> giây</item>
+      <item quantity="one">1 giây</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Đợi ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Máy tính"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Tai nghe"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Điện thoại"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Tai nghe"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Thiết bị ngoại vi vào"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Để giúp giải phóng dung lượng lưu trữ, trình quản lý bộ nhớ sẽ xóa ảnh và video đã sao lưu khỏi thiết bị của bạn."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Xóa ảnh và video"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Trình quản lý bộ nhớ"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Tự động"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Hướng dẫn sử dụng"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Cử chỉ"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Chuyển đến Máy ảnh"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Để mở nhanh máy ảnh, chỉ cần nhấn đúp vào nút nguồn. Hoạt động từ mọi màn hình."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Chuyển máy ảnh"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Để chuyển đổi giữa máy ảnh trước và sau, hãy xoay hai lần."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Kiểm tra nhanh màn hình"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Để kiểm tra điện thoại mà không cần đánh thức thiết bị hoàn toàn, hãy nhích hoặc nhấc điện thoại lên."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Vuốt để xem thông báo"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Để kiểm tra thông báo của bạn từ một màn hình bất kỳ, hãy vuốt xuống từ cảm biến vân tay."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Bật"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Tắt"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Đã mở khóa trình khởi động"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Trước tiên, hãy kết nối với Internet"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Không khả dụng trên thiết bị do nhà cung cấp dịch vụ khóa"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 8ae84eb..887f949 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"粉红色"</item>
     <item msgid="6131821495505931173">"红色"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"超过 30 天"</item>
+    <item msgid="2900554746706302178">"超过 60 天"</item>
+    <item msgid="5692284879054004388">"超过 90 天"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-zh-rCN/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-zh-rCN/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-zh-rCN/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2fea251..a01f401 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"启用数据网络连接"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"停用数据网络连接"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"已配置 VoLTE"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"已配置视频通话"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"已配置 WLAN 通话"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"移动无线装置电源"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"查看 SIM 卡通讯录"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"查看固定拨号号码"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"使用指纹解锁"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"只需触摸指纹传感器即可解锁您的手机、对购买交易进行授权或登录应用。请务必谨慎添加指纹，因为添加的任何指纹都能够用来执行上述操作。\n\n请注意：指纹识别的安全性可能不及安全系数高的图案或 PIN 码。"<annotation id="url">"了解详情"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"只需触摸指纹传感器即可解锁您的手机、对购买交易进行授权或登录应用。请务必谨慎添加指纹，因为添加的任何指纹都能够用来执行上述操作。\n\n请注意：指纹识别的安全性可能不及安全系数高的图案或 PIN 码。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"取消"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"继续"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"跳过"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"删除"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"我们开始吧！"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"将您的手指放在指纹传感器上，感觉到振动后移开手指"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"很好！现在重复此操作"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"继续触摸"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"略微移动手指，以便传感器更完整地记录下您的指纹"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"指纹已添加！"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"只要您看见此图标，就可以使用指纹进行身份验证或对购买交易进行授权。"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"只需触摸指纹传感器即可唤醒并解锁设备。"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"当您看到此图标时，就可以使用指纹。"</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"当您看到此图标时，您还可以对购买交易进行授权或登录应用。"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"要跳过指纹设置？"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"您已选择使用指纹作为解锁手机的方式之一。如果您现在跳过这项设置，则以后还需要再进行设置。设置过程只需大约一分钟的时间。"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"设置屏幕锁定"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"开启“WLAN 通话”功能后，您的手机可根据您的偏好设置，通过 WLAN 网络或您的运营商网络通话（具体取决于哪个网络信号较强）。开启此功能之前，请先向您的运营商咨询收费情况及其他详情。"</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"更新紧急地址"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"当您使用 WLAN 拨打 911 时，紧急服务会将此地址视为您所在位置的地址"</string>
     <string name="home_settings" msgid="212375129455718176">"主屏幕"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"显示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"声音"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"取消保存"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"设置"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"浏览"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"释放空间"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"管理存储空间"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB计算机连接"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"连接方式"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"媒体设备(MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"音频"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"缓存数据"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"其他"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"系统"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"浏览<xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"其他文件包括应用所保存的共享文件，通过互联网或蓝牙下载的文件，Android 文件等。\n\n要查看此<xliff:g id="NAME">^1</xliff:g>中的全部内容，请点按“浏览”。"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"“系统”中包含 Android 操作系统内部使用的文件。\n\n您无法逐个查看这些文件。"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g>所保存的照片、音乐、电影、应用或其他数据可能占用了 <xliff:g id="SIZE">^2</xliff:g> 的存储空间。\n\n要查看详细信息，请切换到<xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"法律信息"</string>
     <string name="contributors_title" msgid="5917703088825286504">"活动提供商"</string>
     <string name="manual" msgid="3025943393642974445">"手册"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"监管信息"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"监管标签"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"安全与监管信息"</string>
     <string name="copyright_title" msgid="865906688917260647">"版权"</string>
     <string name="license_title" msgid="1990487604356037871">"许可"</string>
     <string name="terms_title" msgid="7697580845616764642">"条款"</string>
@@ -2230,6 +2239,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"始终开启的 VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"尚未添加任何 VPN。"</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"始终处于开启状态"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"此应用不支持这项功能"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"选择要始终保持连接的VPN配置文件。只有在连接到此VPN之后才可以使用网络。"</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"无"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"始终开启的 VPN 需要服务器和 DNS 的 IP 地址。"</string>
@@ -2498,6 +2508,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"滑动解锁, 密码, 图案, PIN 码"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"工作验证, 工作, 资料"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"工作资料, 托管资料, 汇整, 统一, 工作, 资料"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"手势"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"设置WLAN NFC标签"</string>
     <string name="write_tag" msgid="8571858602896222537">"写入"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"点按标签即可写入…"</string>
@@ -2989,7 +3000,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"您必须连接 WLAN 网络才能使用后台数据。如果无法连接 WLAN 网络，则部分应用或服务可能会受影响。"</string>
     <string name="condition_work_title" msgid="7293722361184366648">"工作资料已关闭"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"与您的工作资料相关的应用、后台同步功能和其他功能均已关闭。"</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"建议 (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"建议"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"移除"</string>
     <string name="color_temperature" msgid="2070126836910615605">"冷色温"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"使用较冷的显示颜色"</string>
@@ -3082,6 +3094,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"要重置 ShortcutManager 调用频率限制计数器吗？"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"控制锁定屏幕通知"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"显示或隐藏通知内容"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"全部"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"支持"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"最小宽度"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"没有任何已安装的应用申请付费短信权限"</string>
@@ -3089,9 +3103,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"付费短信权限"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"已停用"</string>
     <string name="demo_mode" msgid="2655748420527206870">"演示模式"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"我们会随时为您提供帮助"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"我们可全天候为您提供服务"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"我们的支持团队会协助您解决任何问题"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"我们的支持团队可全天候为您提供服务"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"电话支持服务时段（当地时间）&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"搜索帮助或发现更多提示与技巧"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"支持的国家/地区："</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"您目前人在国外吗？"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"可能需要支付国际通话费用"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"电话"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"聊天"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"探索更多提示和技巧"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"搜索帮助与发送反馈"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"请登录以获取支持服务"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"登录"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"无法访问您的帐号？"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"发送系统信息"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"为了快速帮您解决问题，我们需要您提供系统信息以进行诊断。"</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"不再显示"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"工作资料设置"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"联系人搜索"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"允许您的单位搜索联系人，以便识别来电者和联系人的身份"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 小时</item>
+      <item quantity="one">1 小时</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 分钟</item>
+      <item quantity="one">1 分钟</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 秒</item>
+      <item quantity="one">1 秒</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"大约需等待 <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"计算机"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"耳麦"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"手机"</string>
@@ -3099,4 +3147,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"耳机"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"外围输入设备"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"蓝牙"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"存储空间管理器会从您的设备中移除已备份的照片和视频，从而释放存储空间。"</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"移除照片和视频"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"存储空间管理器"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"自动"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"手动"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"手势"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"快速打开相机"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"要快速打开相机，只需按两次电源按钮即可（适用于任何屏幕）。"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"切换相机模式"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"要在前置和后置相机之间切换，请转动手腕两次。"</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"快速查看屏幕内容"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"要在不完全唤醒手机的情况下查看时间和通知，请轻推或拿起手机。"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"滑动查看通知"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"要在任何屏幕上查看通知，请在指纹传感器上向下滑动手指。"</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"开启"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"关闭"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"引导加载程序已解锁"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"请先连接到互联网"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"在与运营商绑定的设备上无法使用"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index d2f9e9a..79b8f58 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"粉紅色"</item>
     <item msgid="6131821495505931173">"紅色"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"超過 30 天"</item>
+    <item msgid="2900554746706302178">"超過 60 天"</item>
+    <item msgid="5692284879054004388">"超過 90 天"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-zh-rHK/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-zh-rHK/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-zh-rHK/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 741d83b..3ce2035 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"啟用數據連線"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"停用數據連線"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"已佈建 VoLTE"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"已佈建視像通話"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"已佈建 Wi-Fi 通話"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"流動無線電"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"查看 SIM 卡通訊錄"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"查看固定撥號"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"指紋解鎖"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"只需輕觸指紋感應器，即可解鎖手機、授權購物或登入應用程式。任何指紋加入手機後均可執行這些操作，因此請審慎決定要加入的指紋。\n\n請注意：相對於複雜的上鎖圖形或 PIN，指紋識別的安全性較低。"<annotation id="url">"瞭解詳情"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"輕觸指紋感應器即可解鎖手機、授權購物或登入應用程式。任何指紋加入手機後均可執行這些操作，因此請審慎決定要加入的指紋。\n\n請注意：相對於複雜的上鎖圖案或 PIN，指紋識別的安全性較低。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"取消"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"繼續"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"略過"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"刪除"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"開始加入指紋！"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"將手指放在感應器上，直至感到震動時放開"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"很好！請再做一次"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"請繼續"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"輕輕移動您的手指，以加入指紋的所有部分"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"已加入指紋！"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"每當看見這個圖示，即表示您可以使用指紋識別身分或授權購買。"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"只需輕觸指紋感應器即可喚醒裝置或為裝置解鎖。"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"只要看到這個圖示，即可使用指紋。"</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"看到此圖示後，您便可授權購物或登入應用程式。"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"略過指紋設定？"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"您已選擇使用指紋作為唯一的手機解鎖方式。如果您現在略過，將需要稍後設定。設定過程只需約一分鐘。"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"設定螢幕鎖定"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"當開啟 Wi-Fi 通話時，您的手機可根據偏好設定及訊號強弱，選擇使用 Wi-Fi 網絡或流動網絡供應商的網絡安排來電轉接。開啟此功能前，請向您的流動網絡供應商查詢收費及其他詳情。"</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"更新緊急地址"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"當您使用 Wi-Fi 致電 911 時，緊急服務使用的地址將會作為您的地點"</string>
     <string name="home_settings" msgid="212375129455718176">"主畫面"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音效"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"忘記"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"設定"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"探索"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"釋放空間"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"管理儲存空間"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB 電腦連接"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"已連結為"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"媒體裝置 (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"音效"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"快取資料"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"其他"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"系統"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"探索 <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"其他檔案包括由應用程式儲存的共用檔案、從互聯網或藍牙下載的檔案和 Android 檔案等。\n\n如要查看這個「<xliff:g id="NAME">^1</xliff:g>」的完整內容，請輕按 [探索]。"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"系統包含 Android 作業系統內部使用的檔案。\n\n使用者無法個別查看這些檔案。"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> 可能已儲存佔用 <xliff:g id="SIZE">^2</xliff:g> 儲存空間的相片、音樂、影片、應用程式或其他資料。\n\n如要查看詳細資料，請切換至 <xliff:g id="USER_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>
@@ -1284,7 +1292,8 @@
     <string name="legal_information" msgid="5769301644270604095">"法律資訊"</string>
     <string name="contributors_title" msgid="5917703088825286504">"作者"</string>
     <string name="manual" msgid="3025943393642974445">"手動"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"監管資訊"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"監管標籤"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"安全及監管資訊"</string>
     <string name="copyright_title" msgid="865906688917260647">"版權"</string>
     <string name="license_title" msgid="1990487604356037871">"授權"</string>
     <string name="terms_title" msgid="7697580845616764642">"條款及細則"</string>
@@ -2235,6 +2244,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"永久連線的 VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"尚未建立 VPN。"</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"永遠啟用"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"此應用程式不支援這項功能"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"選取要永久保持連線的 VPN 設定檔。只在連線至這個 VPN 時才允許網絡流量。"</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"無"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"永久連線的 VPN 需要同時具備伺服器和 DNS 的 IP 位址。"</string>
@@ -2503,6 +2513,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"滑動解鎖、密碼、上鎖圖形、PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"工作挑戰, 工作, 設定檔"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"工作設定檔, 受管理的設定檔, 整合, 整合, 工作, 設定檔"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"手勢"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"設定 Wi-Fi NFC 標籤"</string>
     <string name="write_tag" msgid="8571858602896222537">"寫入"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"輕按標籤即可寫入…"</string>
@@ -2994,7 +3005,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"您必須連接 Wi-Fi 才能使用背景數據。在沒有 Wi-Fi 的情況下，使用背景數據可能會影響部分應用程式或服務。"</string>
     <string name="condition_work_title" msgid="7293722361184366648">"已停用工作設定檔"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"應用程式、背景同步，以及與您工作設定檔相關的其他功能已經關閉。"</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"建議 (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"建議"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"還有 <xliff:g id="ID_1">%1$d</xliff:g> 個建議"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"移除"</string>
     <string name="color_temperature" msgid="2070126836910615605">"冷色色溫"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"使用較冷的顯示器顏色"</string>
@@ -3087,6 +3099,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"要重設 ShortcutManager 的速率限制計算器嗎？"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"控制上鎖畫面通知"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"顯示或隱藏通知內容"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"全部"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"支援"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"最小寬度"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"沒有已安裝的應用程式要求發送付費短訊的權限"</string>
@@ -3094,9 +3108,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"發送付費短訊的權限"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"已停用"</string>
     <string name="demo_mode" msgid="2655748420527206870">"示範模式"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"我們樂意為您提供協助"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"我們隨時為您提供協助"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"我們的支援團隊會協助您解決任何問題"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"我們的支援團隊全天候為您提供服務"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"手機支援時間 (當地時間)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"搜尋說明，或探索提示和技巧"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"支援的國家/地區："</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"正在外遊嗎？"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"可能需要支付國際通話費用"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"電話"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"即時通訊"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"探索提示和技巧"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"搜尋說明和傳送意見反映"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"登入以取得支援"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"登入"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"無法存取帳戶嗎？"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"傳送系統資料"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"為協助您迅速解決問題，我們需要系統資料以作診斷。"</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"不要再顯示"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"工作設定檔設定"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"聯絡人搜尋"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"允許您的機構搜尋聯絡人，以識別來電者和聯絡人"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 小時</item>
+      <item quantity="one">1 小時</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 分鐘</item>
+      <item quantity="one">1 分鐘</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 秒</item>
+      <item quantity="one">1 秒</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"大約等候 <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"電腦"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"耳機"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"電話"</string>
@@ -3104,4 +3152,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"耳機"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"輸入周邊設備"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"藍牙"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"儲存空間管理員會從您的裝置移除備份相片和影片，以釋放儲存空間。"</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"移除相片和影片"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"存儲空間管理員"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"自動"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"手動"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"手勢"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"啟動相機"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"如要快速啟動相機，只需輕按兩下開關按鈕 (適用於任何畫面)。"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"切換相機"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"如要切換至前置或後置鏡頭，請轉動兩下。"</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"快速查看螢幕"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"如要查看手機，但不完全喚醒手機，可輕輕移動或拿起手機。"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"快速滑動即可查看通知"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"如要在任何畫面上查看通知，請向下快速滑動指紋感應器。"</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"開啟"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"關閉"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"載入器已解鎖"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"請先連線至互聯網"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"無法在已遭流動網絡供應商鎖定的裝置上啟用"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index bee77f4..a86804e 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"粉紅色"</item>
     <item msgid="6131821495505931173">"紅色"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"超過 30 天"</item>
+    <item msgid="2900554746706302178">"超過 60 天"</item>
+    <item msgid="5692284879054004388">"超過 90 天"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-zh-rTW/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-zh-rTW/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-zh-rTW/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index fd7b9ce..463fc70 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"啟用數據連線"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"停用數據連線"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"已佈建 VoLTE"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"已建立視訊通話"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"已建立 Wi-Fi 通話"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"行動無線電電源"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"查看 SIM 通訊錄"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"查看固定撥號"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"使用指紋解鎖"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"輕觸指紋感應器即可將手機解鎖、授權購物交易或登入應用程式。您在手機上新增的任何指紋都能用來進行前述操作，因此請慎選要加入的指紋。\n\n注意：使用複雜的圖案或 PIN 碼會比感應指紋來得安全。"<annotation id="url">"瞭解詳情"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"只要輕觸指紋感應器，即可將手機解鎖、授權購物交易或登入應用程式。您在手機上新增的任何指紋都能用來進行前述操作，因此請慎選要加入的指紋。\n\n注意：使用複雜的圖形或 PIN 碼會比感應指紋來得安全。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"取消"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"繼續"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"略過"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"刪除"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"開始註冊！"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"將您的手指放在感應器上，感到震動即可移開"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"很好！現在再重複一次"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"繼續輕觸"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"稍微移動您的手指以新增完整的指紋"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"指紋新增成功！"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"只要看到這個圖示，就表示您可以使用指紋來驗證身分或授權進行購物交易。"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"輕觸指紋感應器即可將裝置喚醒及解鎖。"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"只要看到這個圖示，就表示您可以使用指紋。"</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"當畫面顯示這個圖示時，您也可以授權購物交易或登入應用程式。"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"要略過指紋設定程序嗎？"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"您已選擇使用指紋做為其中一種手機解鎖方式。如果現在略過這項程序，您必須在稍後完成設定。設定程序只需要一分鐘左右。"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"設定螢幕鎖定"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"開啟 Wi-Fi 通話功能之後，您的手機可依據您的偏好設定，透過 Wi-Fi 網路或您的行動通訊網路通話 (選擇訊號較強者)。開啟這項功能前，請先與您的行動通訊業者詢問費用與其他細節。"</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"更新緊急地址"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"如果您使用 Wi-Fi 撥打 119，緊急服務會判定您位在這個地址"</string>
     <string name="home_settings" msgid="212375129455718176">"主螢幕"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音效"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"清除"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"設定"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"探索"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"釋出儲存空間"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"管理儲存空間"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB 電腦連線"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"連線方式"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"媒體裝置 (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"音訊"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"快取資料"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"其他"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"系統"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"探索「<xliff:g id="NAME">^1</xliff:g>」"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"其他檔案包括應用程式所儲存的共用檔案、透過網際網路或藍牙下載的檔案以及 Android 檔案等。\n\n如要查看這個「<xliff:g id="NAME">^1</xliff:g>」的完整內容，請輕觸 [探索]。"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"系統包括 Android 作業系統內部使用的檔案。\n\n您無法個別查看這些檔案。"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"「<xliff:g id="USER_0">^1</xliff:g>」所儲存的相片、音樂、電影、應用程式或其他資料使用了 <xliff:g id="SIZE">^2</xliff:g> 的儲存空間。\n\n如要查看詳細資料，請切換為「<xliff:g id="USER_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>
@@ -1283,7 +1291,8 @@
     <string name="legal_information" msgid="5769301644270604095">"法律資訊"</string>
     <string name="contributors_title" msgid="5917703088825286504">"貢獻者"</string>
     <string name="manual" msgid="3025943393642974445">"說明書"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"法規資訊"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"法規標籤"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"安全和法規資訊"</string>
     <string name="copyright_title" msgid="865906688917260647">"版權"</string>
     <string name="license_title" msgid="1990487604356037871">"授權"</string>
     <string name="terms_title" msgid="7697580845616764642">"條款及細則"</string>
@@ -2234,6 +2243,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"永久連線的 VPN"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"尚未新增任何 VPN。"</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"永久連線模式已啟用"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"不受這個應用程式支援"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"選取要永久連線的 VPN 設定檔。只有在連線到這個 VPN 後才能使用網路。"</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"無"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"永久連線的 VPN 需要同時具備伺服器和 DNS 的 IP 位址。"</string>
@@ -2502,6 +2512,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"滑動解鎖, 密碼, 圖案, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"Work 驗證、Work、設定檔"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"Work 設定檔, 受管理設定檔, 整合, 整合, Work, 設定檔"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"手勢"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"設定 Wi-Fi NFC 標記"</string>
     <string name="write_tag" msgid="8571858602896222537">"寫入"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"輕觸標記即可寫入..."</string>
@@ -2993,7 +3004,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"您必須連上 Wi-Fi 才能使用背景資料功能。如果無法連上 Wi-Fi，部分應用程式或服務可能會受到影響。"</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Work 設定檔已停用"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"應用程式、背景同步處理以及其他與您的 Work 設定檔相關的功能已停用。"</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"建議 (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"建議"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"移除"</string>
     <string name="color_temperature" msgid="2070126836910615605">"冷色溫"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"使用較冷的顯示器色溫"</string>
@@ -3086,6 +3098,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"要重設 ShortcutManager 速率限制計數器嗎？"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"管理螢幕鎖定通知"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"顯示或隱藏通知內容"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"全部"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"支援"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"最小寬度"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"沒有任何已安裝的應用程式要求「付費簡訊」存取權"</string>
@@ -3093,9 +3107,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"付費簡訊存取權"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"已停用"</string>
     <string name="demo_mode" msgid="2655748420527206870">"示範模式"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"我們很樂意為您提供協助"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"我們隨時可為您提供服務"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"我們的支援小組會協助您解決任何問題"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"我們的支援小組全年無休，隨時為您提供服務"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"電話支援服務時間 (當地時間)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"搜尋相關說明，或是探索實用提示及秘訣"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"電話支援服務："</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"您目前人在國外嗎？"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"可能需要支付國際通話費用"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"電話"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"即時通訊"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"探索實用提示及秘訣"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"搜尋說明及提供意見"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"請登入以便聯絡客服人員"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"登入"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"無法登入帳戶嗎？"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"傳送系統資訊"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"為快速解決問題，我們需要您提供系統資訊以利診斷。"</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"不要再顯示"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Work 設定檔設定"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"聯絡人搜尋"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"允許您的機構搜尋聯絡人，以便識別來電者和聯絡人的身分"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 小時</item>
+      <item quantity="one">1 小時</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 分鐘</item>
+      <item quantity="one">1 分鐘</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 秒</item>
+      <item quantity="one">1 秒</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"大約需等候 <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"電腦"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"免持耳機"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"電話"</string>
@@ -3103,4 +3151,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"頭戴式耳機"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"周邊輸入裝置"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"藍牙"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"儲存空間管理員會將已備份的相片和影片從裝置中移除，藉此釋出儲存空間。"</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"移除相片和影片"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"儲存空間管理員"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"自動"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"手動"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"手勢"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"快速開啟相機"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"只要在任何畫面中輕觸兩下電源按鈕，即可快速開啟相機。"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"快速切換鏡頭"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"只要扭動裝置兩下，即可切換使用前置與後置鏡頭。"</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"快速查看畫面"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"只要輕推或拿起手機，即可在不將手機完全喚醒的情況下查看手機。"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"滑動查看通知"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"只要將手指放在指紋感應器上並向下滑動，即可在任何畫面中查看通知。"</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"開啟"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"關閉"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"開機載入器已解除鎖定"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"請先連上網際網路"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"綁定特定行動通訊業者服務的裝置無法使用"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 5e4984c..9093907 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -472,4 +472,9 @@
     <item msgid="4608643045752965568">"Ophinki"</item>
     <item msgid="6131821495505931173">"Okubomvu"</item>
   </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Ngaphezulu kobudala obuyizinsuku ezingu-30"</item>
+    <item msgid="2900554746706302178">"Ngaphezulu kobudala obuyizinsuku ezingu-60"</item>
+    <item msgid="5692284879054004388">"Ngaphezulu kobudala obuyizinsuku ezingu-90"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw360dp/aliases.xml b/res/values-zu/config.xml
similarity index 64%
copy from res/values-sw360dp/aliases.xml
copy to res/values-zu/config.xml
index a10585b..f4894d2 100644
--- a/res/values-sw360dp/aliases.xml
+++ b/res/values-zu/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
      WITHOUT 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>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_backup_settings_intent" msgid="2383280299096508774"></string>
 </resources>
-
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 5137a7c..7d540de 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -39,6 +39,8 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Vumela uxhumano lwedatha"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Khubaza uxhumano lwedatha"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Okunikeziwe kwe-VoLTE"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Kugunyazwe ukushaya kwevidiyo"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Kugunyazwe ukushaya kwe-Wifi"</string>
     <string name="radio_info_radio_power" msgid="1208229437948820417">"Amandla erediyo yeselula"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Buka incwadi yekheli le-SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Buka Izinombolo Zokudayela Okungaguquki"</string>
@@ -334,7 +336,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Vula ngezigxivizo zeminwe"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6931554430739074640">"Vele uthinte inzwa yezigxivizo zeminwe ukuze uvule ifoni yakho, ugunyaze ukuthenga, noma ungene ngemvume kuzinhlelo zokusebenza. Qaphela ukuthi ungeza izigxivizo zeminwe zikabani. Nezigxivizo zeminwe ezizodwa ezingeziwe zingenza noma yini kulezi zinto.\n\nYazi: Izigxivizo zakho zeminwe zingavikeleka kancane kunephethini eqinile noma iphinikhodi. "<annotation id="url">"Funda kabanzi"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Vele uthinte inzwa yezigxivizo zeminwe ukuze uvule ifoni yakho, ugunyaze ukuthenga, noma ungene ngemvume kuzinhlelo zokusebenza. Qaphela ukuthi ungeza izigxivizo zeminwe zakabani. Nezigxivizo ezizodwa ezingeziwe zingenza zonke lezi zinto.\n\nYazi: Izigxivizo zakho zeminwe zingavikeleka kancane kunephethini eqinile noma i-PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Khansela"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Qhubeka"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Yeqa"</string>
@@ -355,12 +357,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Susa"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Asiqalise!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Beka umunwe wakho kunzwa uphinde uphakamise ngemuva kokuthi uzwe ukudlidliza"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Kuhle! Manje phinda"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Qhubeka"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Hambisa umunwe wakho kancane ukuze ungeze zonke izingxenye ezihlukile zezigxivizo zeminwe yakho"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Izigxivizo zeminwe zingeziwe!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Noma kunini lapho ubona khona lesi sithonjana, ungasebenzisa izigxivizo zakho zeminwe noma ugunyaze ukuthenga."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Vele uthinte inzwa yezigxivizo zeminwe uphinde uvule idivayisi yakho."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Uma ubona lesi sithonjana, ungasebenzisa izigxivizo zakho zeminwe."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Uma ubona lesi sithonjana, ungaphinda ugunyaze ukuthenga noma ukungena ngemvume kuzinhlelo zokusebenza."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Yeqa ukusethwa kwezigxivizo zeminwe?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Ukhethe ukusebenzisa izigxivizo zakho zeminwe njengendlela eyodwa yokuvula ifoni yakho. Uma weqa manje, kuzomele usethe lokhu ngemuva kwesikhathi. Ukusetha kuthatha iminithi noma isikhathi esingalapho."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Hlela ukuvala isikrini"</string>
@@ -835,6 +837,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="emergency_address_title" msgid="3571902448699714454">"Buyekeza ikheli lesimo esiphuthumayo"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Ikheli elisetshenziswa amasevisi ezimo eziphuthumayo endaweni yakho uma wenza ikholi ye-911 usebenzisa i-WiFi"</string>
     <string name="home_settings" msgid="212375129455718176">"Ikhaya"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ukubukeka"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Umsindo"</string>
@@ -1055,6 +1059,8 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Khohlwa"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Setha"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Hlola"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Khulula isikhala"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Phatha isitoreji"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Uxhumano lwekhompyutha ye-USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Xhuma njenge"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Idivaysi yemidiya (MTP)"</string>
@@ -1091,8 +1097,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Umsindo"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Idatha yenqolobane"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Okunye"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Isistimu"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Hlola i-<xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Okunye kufaka phakathi amafayela abiwe alondolozwe izinhlelo zokusebenza, amafayela alandwe kusuka ku-inthanethi noma i-Bluetooth, amafayela e-Android, kanjalo. \n\nUkuze ubone konke okuqukethwe kwale <xliff:g id="NAME">^1</xliff:g>, thepha okuthi Hlola."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Isistimu ifaka amafayela asetshenziswa ngaphakathi kwesistimu yokusebenza ye-Android. \n\nLawa mafayela awakwazi ukubukwa ngawodwana."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> ingahle ilondoloze izithombe, umculo, ama-movie, izinhlelo zokusebenza, nenye idatha ethatha u-<xliff:g id="SIZE">^2</xliff:g> wesitoreji. \n\nUkuze ubuke imininingwane, shintshela ku-<xliff:g id="USER_1">^1</xliff:g>."</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>
@@ -1284,7 +1292,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Uwazi olusemthethweni"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Abanikeli"</string>
     <string name="manual" msgid="3025943393642974445">"Ngokulawulwa"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Ulwazi lokuhlola"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Amalebula okuqondisa"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Ulwazi lokuphepha nokuqondisa"</string>
     <string name="copyright_title" msgid="865906688917260647">"I-copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Ilayisensi"</string>
     <string name="terms_title" msgid="7697580845616764642">"Imigomo nemibandela"</string>
@@ -2231,6 +2240,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"I-VPN ehlala ikhanya"</string>
     <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Awekho ama-VPNs angeziwe."</string>
     <string name="vpn_always_on_active" msgid="2789423425184556882">"Okuhlala kubulekile kuyasebenza"</string>
+    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Akusekelwa yilolu hlelo lokusebenza"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Khetha iphrofayela ye-VPN ukuhlala uxhumekile. I-traffic yenethiwekhi izovunyelwa kuphela uma ixhunyiwe kule-VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Akunalutho"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"I-VPN ehlala ikhanya idinga ikheli le-IP kwisiphakeli ne-DNS."</string>
@@ -2499,6 +2509,7 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"slayida ukuze uvule, iphasiwedi, iphethini, iphinikhodi"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"ukuphonselwa inselelo komsebenzi, umsebenzi, iphrofayela"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"iphrofayela yomsebenzi, iphrofayela ephethwe, ukuhlanganisa, ukuhlanganisa, umsebenzi, iphrofayela"</string>
+    <string name="keywords_gesture" msgid="5696040361482126337">"ukuthinta"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Setha umaka we-Wi-Fi NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"Bhala"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Thepha umaki ukuze ubhale..."</string>
@@ -2990,7 +3001,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Idatha yangemuva itholakala kuphela nge-Wi-Fi. Lokhu kungathinta ezinye izinhlelo zokusebenza noma amasevisi uma i-Wi-Fi ingatholakali."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Iphrofayela yomsebenzi ivaliwe"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Izinhlelo zokusebenza, ukuvumelanisa okungemuva, nezinye izici ezihlobene nephrofayela yakho yomsebenzi zivaliwe."</string>
-    <string name="suggestions_title" msgid="8758376306825920705">"Iziphakamiso (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Iziphakamiso"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Susa"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Ithempelesha yombala opholile"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Sebenzisa imibala yesibonisi esipholile"</string>
@@ -3083,6 +3095,8 @@
     <string name="confirm_reset_shortcut_manager_throttling_message" msgid="3812874125513775052">"Setha kabusha izibali zokukhawulela ukulinganisela kwe-ShortcutManager?"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Lawula izaziso zesikrini sokukhiya"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Bonisa noma fihla okuqukethwe kwesaziso"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"Konke"</string>
+    <string name="page_tab_title_support" msgid="6330657582897417458">"Usekelo"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"I-<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Ububanzi obuncane"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Azikho izinhlelo zokusebenza ezicele ukufinyelela kwe-Premium SMS"</string>
@@ -3090,9 +3104,43 @@
     <string name="premium_sms_access" msgid="4660047004791638305">"Ukufinyelela ku-Premium SMS"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Kukhutshaziwe"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Imodi yedemo"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"Silapha ukuze sisize"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Sikhona lapha kuwe ngokungu-24/7"</string>
+    <string name="support_escalation_summary" msgid="4481910353815635960">"Ithimba lethu losekelo lilapha ukubhekana nanoma iziphi izinkinga"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Ithimba lethu losekelo liyatholakala usuku lonke nsuku zonke"</string>
+    <string name="support_escalation_closed_summary" msgid="8650309845497471757">"Amahora osekelo lwefoni (isikhathi sendawo)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Sesha usizo noma hlola amathiphu namacebo"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Usekelo lwe-:"</string>
+    <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%s</xliff:g> - <xliff:g id="LANGUAGE">%s</xliff:g>"</string>
+    <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%s</xliff:g> (<xliff:g id="PHONE">%s</xliff:g>)"</string>
+    <string name="support_international_phone_title" msgid="1470189566704940306">"Ukuya ngaphandle kwezwe?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Izindleko zangamazwe zingasebenza"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Ifoni"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Ingxoxo"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Hlola amathiph namacebo"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Sesha usizo futhi uthumele impendulo"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"Ngena ngemvume ukuze uthole usekelo"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Ngena ngemvume"</string>
+    <string name="support_sign_in_required_help" msgid="3930256366697956788">"Awukwazi ukufinyelela ku-akhawunti yakho?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Thumela ulwazi lwesistimu"</string>
+    <string name="support_disclaimer_content" msgid="6702447747744624871">"Ukuze kusizwe kubhekwe le nkinga ngokushesha, sidinga ulwazi lwesistimu lokuxilonga inkinga."</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Ungabonisi futhi"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Izilungiselelo zephrofayela yomsebenzi"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Usesho loxhumana naye"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Vumela usesho loxhumana naye ngenhlangano yakho ukuze ukhombe abashayayo noxhumana nabo"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> amahora</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> amahora</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> amaminithi</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> amaminithi</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> amasekhondi</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> amasekhondi</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> linda"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Ikhompuyutha"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Ama-earphone"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Ifoni"</string>
@@ -3100,4 +3148,29 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Amahedfoni"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Okokufaka okulawulwa yikhompuyutha"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"I-Bluetooth"</string>
+    <!-- no translation found for automatic_storage_manager_settings (7819434542155181607) -->
+    <skip />
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Ukuze kusizwe kukhululwe isikhala sesitoreji, isiphathi sesitoreji sisusa izithombe ezenziwe isipele namavidiyo kusukela kudivayisi yakho."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Susa izithombe namavidiyo"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Isiphathi sesitoreji"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Okuzenzakalelayo"</string>
+    <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Okwenziwa ngesandla"</string>
+    <!-- no translation found for deletion_helper_preference_title (5271510052022285884) -->
+    <skip />
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Ukuthinta"</string>
+    <string name="double_tap_power_for_camera_title" msgid="2993443929413421363">"Yeqela kukhamera"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="5917828814732238340">"Ukuze uvule ngokushesha ikhamera, vele uthephe kabili inkinobho yamandla. Isebenza kusukela kunoma isiphi isikrini."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Jikisa ikhamera"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="8415909197795361084">"Ukuze ushintshe phakathi kwekhamera ephambili nengemuva, jikisa kabili."</string>
+    <string name="ambient_display_title" msgid="7369291941168001738">"Ukuhlolwa okusheshayo kwesikrini"</string>
+    <string name="ambient_display_summary" msgid="810244127489185677">"Ukuze uhlole ifoni yakho ngaphandle kokuyivusa ngokugcwele, yithinte noma uyiphathe."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2750203868053669600">"Swayiphela izaziso"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" msgid="949163829681063130">"Ukuze uhlole izaziso zakho kusukela kunoma isiphi isikrini, swayiphela phansi kunzwa yezigxivizo zeminwe."</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Kuvuliwe"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Kuvaliwe"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"I-Bootloader isivele ivuliwe"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Xhuma ku-inthanethi kuqala"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Ayitholakali kumadivayisi akhiywe inkampani yenethiwekhi"</string>
+    <!-- no translation found for automatic_storage_manager_freed_bytes (7517560170441007788) -->
+    <skip />
 </resources>
diff --git a/res/values/aliases.xml b/res/values/aliases.xml
index a783c79..951b1bb 100644
--- a/res/values/aliases.xml
+++ b/res/values/aliases.xml
@@ -21,8 +21,6 @@
      <item name="fingerprint_enroll_find_sensor" type="layout">@layout/fingerprint_enroll_find_sensor_base</item>
      <item name="fingerprint_enroll_enrolling" type="layout">@layout/fingerprint_enroll_enrolling_base</item>
      <item name="fingerprint_enroll_finish" type="layout">@layout/fingerprint_enroll_finish_base</item>
-     <item name="setup_choose_lock_pattern" type="layout">@layout/setup_choose_lock_pattern_common</item>
-     <item name="setup_fingerprint_enroll_find_sensor" type="layout">@layout/setup_fingerprint_enroll_find_sensor_base</item>
-     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template_short</item>
+     <item name="choose_lock_pattern" type="layout">@layout/choose_lock_pattern_common</item>
 </resources>
 
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 8adf331..6827e5b 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1031,4 +1031,18 @@
         <item>Red</item>
     </string-array>
 
+    <!-- Automatic storage management settings. The amount of days for the automatic storage manager
+         to retain. These are shown in a list dialog. [CHAR LIMIT=70] -->
+    <string-array name="automatic_storage_management_days">
+        <item>Over 30 days old</item>
+        <item>Over 60 days old</item>
+        <item>Over 90 days old</item>
+    </string-array>
+
+    <string-array name="automatic_storage_management_days_values" translatable="false">
+        <item>30</item>
+        <item>60</item>
+        <item>90</item>
+    </string-array>
+
 </resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 0a072ae..8fb61dd 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -135,4 +135,10 @@
         <attr name="allowDividerAbove" format="boolean" />
         <attr name="allowDividerBelow" format="boolean" />
     </declare-styleable>
+
+    <!-- For GesturePreference -->
+    <declare-styleable name="GesturePreference">
+        <attr name="animation" format="reference" />
+    </declare-styleable>
+
 </resources>
diff --git a/res/values/bools.xml b/res/values/bools.xml
index 5ee0f7c..6f04457 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -40,4 +40,7 @@
 
     <!-- Whether none security option is hide or not  (country specific). -->
     <bool name="config_hide_none_security_option">false</bool>
+
+    <!--Whether the storage manager exists. -->
+    <bool name="config_has_storage_manager">false</bool>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index a9756ad..4a8cf99 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -69,19 +69,14 @@
     <color name="fingerprint_indicator_background_resting">#12000000</color>
 
     <color name="running_processes_system_ram">#ff384248</color>
-    <color name="running_processes_apps_ram">#ff009587</color>
     <color name="running_processes_free_ram">#ffced7db</color>
 
-    <color name="card_background">#ffffffff</color>
-
-    <color name="switchbar_background_color">#ff37474f</color>
-    <color name="switch_accent_color">#ff7fcac3</color>
+    <color name="card_background">#fffafafa</color>
 
     <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="confirm_device_credential_transparent_black">#60000000</color>
     <color name="fab_ripple">#1fffffff</color><!-- 12% white -->
     <color name="fab_shape">?android:attr/colorAccent</color>
@@ -101,9 +96,6 @@
     <!-- Accent color that matches the settings launcher icon -->
     <color name="icon_accent">#ffabffec</color>
 
-    <color name="summary_default_start">#ff009587</color>
-    <color name="summary_default_end">#ffced7db</color>
-
     <color name="importance_icon_tint">#8a000000</color>
     <color name="importance_disabled_tint">#4d000000</color>
 
@@ -125,10 +117,14 @@
 
     <color name="seek_bar_preference_preview_text">#fff</color>
 
-    <color name="importance_slider_color">@*android:color/material_deep_teal_500</color>
     <color name="importance_disabled_slider_color">@*android:color/material_grey_300</color>
     <color name="importance_secondary_slider_color">#858383</color>
 
     <color name="usage_graph_dots">#B0BEC5</color>
 
+    <color name="card_background_grey">#eeeeee</color>
+
+    <!-- Gestures settings -->
+    <color name="gestures_setting_background_color">#f5f5f5</color>
+
 </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index 3f25fc6..c5cc341 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -38,4 +38,13 @@
     <!-- When true enable color temperature setting. -->
     <bool name="config_enableColorTemperature">false</bool>
 
+    <!-- Fully-qualified class name for the implementation of the FeatureFactory to be instantiated. -->
+    <string name="config_featureFactory" translatable="false">com.android.settings.overlay.FeatureFactoryImpl</string>
+
+    <!-- Package name and fully-qualified class name for the wallpaper picker activity. -->
+    <string name="config_wallpaper_picker_package" translatable="false">com.android.settings</string>
+    <string name="config_wallpaper_picker_class" translatable="false">com.android.settings.Settings$WallpaperSettingsActivity</string>
+
+    <!-- Backup settings to launch -->
+    <string name="config_backup_settings_intent"></string>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index ef7efa2..9a97d30 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -59,6 +59,8 @@
     <dimen name="appwidget_min_height">40dip</dimen>
 
     <dimen name="pager_tabs_padding">0dp</dimen>
+    <dimen name="pager_tabs_title_padding">16dp</dimen>
+    <dimen name="pager_tabs_selected_indicator_height">3dp</dimen>
 
     <!-- Minimum width for the popup for updating a user's photo. -->
     <dimen name="update_user_photo_popup_min_width">300dip</dimen>
@@ -117,8 +119,6 @@
     <dimen name="dashboard_tile_image_margin_start">16dp</dimen>
     <dimen name="dashboard_tile_image_margin_end">32dp</dimen>
 
-    <dimen name="suggestion_arrow_margin">16dp</dimen>
-
     <!-- SwitchBar margin start / end -->
     <dimen name="switchbar_margin_start">16dp</dimen>
     <dimen name="switchbar_margin_end">16dp</dimen>
@@ -296,4 +296,7 @@
     <!-- Padding between the radio buttons/checkbox and text on the redaction interstitial -->
     <dimen name="redaction_padding_start">16dp</dimen>
 
+    <!-- Padding for Gestures settings screen -->
+    <dimen name="gestures_settings_padding_top_bottom">20dp</dimen>
+    <dimen name="gestures_play_button_size">36dp</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3a37705..5073893 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -65,6 +65,12 @@
     <!-- VoLTE provisioning flag on. Only shown in diagnostic screen, so precise translation is not needed. -->
     <string name="volte_provisioned_switch_string">VoLTE Provisioned</string>
 
+    <!-- Video calling provisioning flag on. Only shown in diagnostic screen, so precise translation is not needed. -->
+    <string name="vt_provisioned_switch_string">Video Calling Provisioned</string>
+
+    <!-- Wifi Calling provisioning flag on. Only shown in diagnostic screen, so precise translation is not needed. -->
+    <string name="wfc_provisioned_switch_string">Wifi Calling Provisioned</string>
+
     <!-- Cell Radio Power. Only shown in diagnostic screen, so precise translation is not needed. -->
     <string name="radio_info_radio_power">Cellular Radio Power</string>
 
@@ -741,7 +747,7 @@
     <!-- Introduction title shown in fingerprint enrollment to introduce the fingerprint feature[CHAR LIMIT=29] -->
     <string name="security_settings_fingerprint_enroll_introduction_title">Unlock with fingerprint</string>
     <!-- Introduction detail message shown in fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
-    <string name="security_settings_fingerprint_enroll_introduction_message">Just touch the fingerprint sensor to unlock your phone, authorize purchases, or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN. <annotation id="url">Learn more</annotation></string>
+    <string name="security_settings_fingerprint_enroll_introduction_message">Just touch the fingerprint sensor to unlock your phone, authorize purchases, or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN.</string>
     <!-- Button text to cancel enrollment from the introduction [CHAR LIMIT=22] -->
     <string name="security_settings_fingerprint_enroll_introduction_cancel">Cancel</string>
     <!-- Button text to continue to the next screen from the introduction [CHAR LIMIT=22] -->
@@ -784,7 +790,7 @@
     <!-- Message shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=NONE] -->
     <string name="security_settings_fingerprint_enroll_start_message">Put your finger on the sensor and lift after you feel a vibration</string>
     <!-- Title shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=29] -->
-    <string name="security_settings_fingerprint_enroll_repeat_title">Great! Now repeat</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title">Keep going</string>
     <!-- Message shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=NONE] -->
     <string name="security_settings_fingerprint_enroll_repeat_message">Move your finger slightly to add all the different parts of your fingerprint</string>
     <!-- Title shown in fingerprint enrollment dialog once enrollment is completed [CHAR LIMIT=29] -->
@@ -794,7 +800,7 @@
     <!-- Message shown when fingerprint enrollment is completed during setup wizard [CHAR LIMIT=NONE] -->
     <string name="setup_fingerprint_enroll_finish_message">Just touch the fingerprint sensor to wake and unlock your device.</string>
     <!-- Message shown when fingerprint enrollment is completed, telling user about the fingerprint icon that will be shown whenever they can use their fingerprint [CHAR LIMIT=NONE] -->
-    <string name="setup_fingerprint_enroll_finish_message_secondary">When you see this icon, you can use your fingerprint.</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary">When you see this icon, you can also authorize purchases or sign in to apps.</string>
     <!-- Title of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=40] -->
     <string name="setup_fingerprint_enroll_enrolling_skip_title">Skip fingerprint setup?</string>
     <!-- Content of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=NONE] -->
@@ -1983,6 +1989,9 @@
     </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\u2019s 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>
+    <string name="emergency_address_title">Update Emergency Address</string>
+    <string name="emergency_address_summary">Address used by emergency services as your location if you make a 911 call using WiFi</string>
+
 
     <!-- Sound and alerts settings -->
     <skip/>
@@ -2456,6 +2465,10 @@
     <string name="storage_menu_set_up">Set up</string>
     <!-- Storage setting.  Menu option for exploring a storage device [CHAR LIMIT=30]-->
     <string name="storage_menu_explore">Explore</string>
+    <!-- Storage setting. Menu option for using the deletion helper. [CHAR LIMIT=30] -->
+    <string name="storage_menu_free">Free up space</string>
+    <!-- Storage setting. Menu option for accessing the storage manager settings. [CHAR LIMIT=30] -->
+    <string name="storage_menu_manage">Manage storage</string>
 
     <!-- Storage setting.  Title for USB transfer settings [CHAR LIMIT=30]-->
     <string name="storage_title_usb">USB computer connection</string>
@@ -2556,6 +2569,8 @@
     <string name="storage_detail_cached">Cached data</string>
     <!-- Item title describing storage used by other data [CHAR LIMIT=48]-->
     <string name="storage_detail_other">Other</string>
+    <!-- Item title describing internal storage used by the Android System [CHAR LIMIT=48]-->
+    <string name="storage_detail_system">System</string>
     <!-- Item title that will launch a file explorer [CHAR LIMIT=48]-->
     <string name="storage_detail_explore">Explore <xliff:g id="name" example="SD card">^1</xliff:g></string>
 
@@ -2563,6 +2578,10 @@
     <string name="storage_detail_dialog_other">Other includes shared files saved by apps, files downloaded from the Internet or Bluetooth, Android files, and so on.
 \n\nTo see the entire contents of this <xliff:g id="name" example="SD card">^1</xliff:g>, tap Explore.</string>
 
+    <!-- Body of dialog informing user about the storage used by the Android System [CHAR LIMIT=NONE]-->
+    <string name="storage_detail_dialog_system">System includes files used internally by the Android operating system.
+\n\nThese files can\u2019t be viewed individually.</string>
+
     <!-- Body of dialog informing user about other users on a storage device [CHAR LIMIT=NONE]-->
     <string name="storage_detail_dialog_user"><xliff:g id="user" example="Guest user">^1</xliff:g> may have saved photos, music, movies, apps, or other data that is taking up <xliff:g id="size" example="1.2 GB">^2</xliff:g> of storage.
 \n\nTo view details, switch to <xliff:g id="user" example="Guest user">^1</xliff:g>.</string>
@@ -3005,8 +3024,10 @@
     <string name="contributors_title">Contributors</string>
     <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
     <string name="manual">Manual</string>
-    <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
-    <string name="regulatory_information">Regulatory information</string>
+    <!-- About phone settings screen, setting option name to show regulatory labels [CHAR LIMIT=25] -->
+    <string name="regulatory_labels">Regulatory labels</string>
+    <!-- About phone settings screen, setting option name to show safety and regulatory information [CHAR LIMIT=40] -->
+    <string name="safety_and_regulatory_info">Safety &amp; regulatory information</string>
     <!-- Note: this may be replaced by a more-specific title of the activity that will get launched --> <skip />
     <!-- About phone settings screen, setting option name to see copyright-related info -->
     <string name="copyright_title">Copyright</string>
@@ -5238,6 +5259,8 @@
     <string name="vpn_no_vpns_added">No VPNs added.</string>
     <!-- Preference summary for active always-on vpn [CHAR LIMIT=40] -->
     <string name="vpn_always_on_active">Always-on active</string>
+    <!-- Preference summary for app not supporting always-on vpn [CHAR LIMIT=NONE] -->
+    <string name="vpn_not_supported_by_this_app">Not supported by this app</string>
 
     <!-- Summary describing the always-on VPN feature. [CHAR LIMIT=NONE] -->
     <string name="vpn_lockdown_summary">Select a VPN profile to always remain connected to. Network traffic will only be allowed when connected to this VPN.</string>
@@ -5535,8 +5558,6 @@
 
     <!-- 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] -->
@@ -5600,6 +5621,8 @@
     <string name="help_url_remote_display" translatable="false"></string>
     <!-- Help URL, Fingerprint [DO NOT TRANSLATE] -->
     <string name="help_url_fingerprint" translatable="false"></string>
+    <!-- Help URL, Gesture settings -->
+    <string name="help_url_gestures" translatable="false"></string>
 
     <!-- User account title [CHAR LIMIT=30] -->
     <string name="user_account_title">Account for content</string>
@@ -5834,6 +5857,7 @@
     <string name="keywords_lockscreen">slide to unlock, password, pattern, PIN</string>
     <string name="keywords_profile_challenge">work challenge, work, profile</string>
     <string name="keywords_unification">work profile, managed profile, unify, unification, work, profile</string>
+    <string name="keywords_gesture">gesture</string>
 
     <!-- NFC Wi-Fi pairing/setup strings-->
 
@@ -7202,7 +7226,10 @@
     <string name="condition_work_summary">Apps, background sync, and other features related to your work profile are turned off.</string>
 
     <!-- Title for the suggestions section on the dashboard [CHAR LIMIT=30] -->
-    <string name="suggestions_title">Suggestions (<xliff:g name="count" example="3">%1$d</xliff:g>)</string>
+    <string name="suggestions_title">Suggestions</string>
+
+    <!-- Summary for the suggestions section on the dashboard, representing number of suggestions. [CHAR LIMIT=10] -->
+    <string name="suggestions_summary">+<xliff:g name="count" example="3">%1$d</xliff:g></string>
 
     <!-- Name of option to remove a suggestion from the list [CHAR LIMIT=30] -->
     <string name="suggestion_remove">Remove</string>
@@ -7450,6 +7477,10 @@
     <string name="notification_suggestion_title">Control lock screen notifications</string>
     <!-- Summary of notification suggestion during optional steps of setup. [CHAR_LIMIT=80] -->
     <string name="notification_suggestion_summary">Show or hide notification content</string>
+    <!-- Setting tab title for all setting options. [CHAR LIMIT=20] -->
+    <string name="page_tab_title_summary">All</string>
+    <!-- Setting tab title for support setting options. [CHAR LIMIT=20] -->
+    <string name="page_tab_title_support">Support</string>
 
     <!-- Summary of developer options to set the smallest width of the screen [CHAR LIMIT=60]-->
     <string name="developer_density_summary"><xliff:g name="count" example="320">%d</xliff:g> dp</string>
@@ -7472,6 +7503,79 @@
     <!-- [CHAR LIMIT=60] Name of dev option called demo mode -->
     <string name="demo_mode">Demo mode</string>
 
+    <!-- Title text for connecting to customer support [CHAR LIMIT=80]-->
+    <string name="support_escalation_title">We\'re here to help</string>
+
+    <!-- Title text for connecting to 24/7 available customer support [CHAR LIMIT=80]-->
+    <string name="support_escalation_24_7_title">We\'re here for you 24/7</string>
+
+    <!-- Summary text for connecting to customer support [CHAR LIMIT=NONE]-->
+    <string name="support_escalation_summary">Our support team is here to help address any issues</string>
+
+    <!-- Summary text for connecting to 24/7 customer support [CHAR LIMIT=NONE]-->
+    <string name="support_escalation_24_7_summary">Our support team is available all day, every day</string>
+
+    <!-- Summary text when customer support is closed. [CHAR LIMIT=NONE]-->
+    <string name="support_escalation_closed_summary">Phone support hours (local time)&lt;br&gt;&lt;b&gt;<xliff:g id="operation_hours">%s</xliff:g>&lt;/b&gt;</string>
+
+    <!-- Summary text when customer support is unavailable in the region. [CHAR LIMIT=NONE]-->
+    <string name="support_escalation_unavailable_summary">Search help or explore tips &amp; tricks</string>
+
+    <!-- Template for formatting support hours eg Mon - Fri, 8:00 AM - 19:30 PM. [CHAR LIMIT=NONE]-->
+    <string name="support_hour_format" translatable="false">
+        <xliff:g id="start_day">%s</xliff:g> - <xliff:g id="end_day">%s</xliff:g>, <xliff:g id="start_time">%s</xliff:g> - <xliff:g id="end_time">%s</xliff:g>&lt;br&gt;
+    </string>
+
+    <!-- Button label for choosing country for phone support. [CHAR LIMIT=40]-->
+    <string name="support_country_list_title">Support for:</string>
+
+    <!-- Template for formatting country and language. eg Canada - French [CHAR LIMIT=NONE]-->
+    <string name="support_country_format"><xliff:g id="country" example="Canada">%s</xliff:g> - <xliff:g id="language" example="French">%s</xliff:g></string>
+
+    <!-- Template for formatting phone number and language. eg English (800-000-0000) [CHAR LIMIT=NONE]-->
+    <string name ="support_phone_international_format">
+        <xliff:g id="language" example="English">%s</xliff:g> (<xliff:g id="phone" example="800-000-0000">%s</xliff:g>)
+    </string>
+
+    <!-- Title text for a list of international support phone numbers. [CHAR LIMIT=60]-->
+    <string name="support_international_phone_title">Traveling aboard?</string>
+
+    <!-- Description text warning international phone charge may apply when dialing support numbers. [CHAR LIMIT=NONE]-->
+    <string name="support_international_phone_summary">International charges may apply</string>
+
+    <!-- Button label for contacting customer support by phone [CHAR LIMIT=20]-->
+    <string name="support_escalation_by_phone">Phone</string>
+
+    <!-- Button label for contacting customer support by chat [CHAR LIMIT=20]-->
+    <string name="support_escalation_by_chat">Chat</string>
+
+    <!-- Button label for visiting the tips & tricks site [CHAR LIMIT=60]-->
+    <string name="support_tips_and_tricks_title">Explore tips &amp; tricks</string>
+
+    <!-- Button label for visiting help and/or send feedback [CHAR LIMIT=60]-->
+    <string name="support_help_feedback_title">Search help &amp; send feedback</string>
+
+    <!-- Title text that indicates user needs to sign in to get customer support. [CHAR LIMIT=80]-->
+    <string name="support_sign_in_required_title">Sign in for support</string>
+
+    <!-- Summary text that indicates user needs to sign-in to get real time customer support. [CHAR LIMIT=NONE]-->
+    <string name="support_sign_in_required_summary" translatable="false"></string>
+
+    <!-- Button label for signing in an account [CHAR LIMIT=40]-->
+    <string name="support_sign_in_button_text">Sign in</string>
+
+    <!-- Button label that redirects user who needs help for signin to help screen [CHAR LIMIT=NONE]-->
+    <string name="support_sign_in_required_help">Can\'t access your account?</string>
+
+    <!-- Dialog title displayed before initiating real time support [CHAR LIMIT=80]-->
+    <string name="support_disclaimer_title">Send system information</string>
+
+    <!-- Dialog content displayed before initiating real time support  [CHAR LIMIT=NONE]-->
+    <string name="support_disclaimer_content">To help address your issue quickly, we need system information for diagnosis.</string>
+
+    <!-- Checkbox text, when checked dialog will not show again [CHAR LIMIT=80] -->
+    <string name="support_disclaimer_do_not_show">Do not show again</string>
+
     <!-- [CHAR LIMIT=60] Title of work profile setting page -->
     <string name="managed_profile_settings_title">Work profile settings</string>
     <!-- [CHAR LIMIT=60] The preference title for enabling cross-profile remote contact search -->
@@ -7479,6 +7583,27 @@
     <!-- [CHAR LIMIT=NONE] The preference summary for enabling cross-profile remote contact search -->
     <string name="managed_profile_contact_search_summary">Allow contact searches by your organization to identify callers and contacts</string>
 
+    <!-- Time in hours -->
+    <plurals name="hours">
+        <item quantity="one">1 hour</item>
+        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> hours</item>
+    </plurals>
+
+    <!-- Time in minutes -->
+    <plurals name="minutes">
+        <item quantity="one">1 minute</item>
+        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> minutes</item>
+    </plurals>
+
+    <!-- Time in seconds -->
+    <plurals name="seconds">
+        <item quantity="one">1 second</item>
+        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> seconds</item>
+    </plurals>
+
+    <!-- Estimated wait time range for real time supports -->
+    <string name="support_estimated_wait_time">~<xliff:g id="ESTIMATE" example="2 minutes">%1$s</xliff:g> wait</string>
+
     <!-- Message for telling the user the kind of BT device being displayed in list. -->
     <string name="bluetooth_talkback_computer">Computer</string>
 
@@ -7499,4 +7624,66 @@
 
     <!-- Message for telling the user the kind of BT device being displayed in list. -->
     <string name="bluetooth_talkback_bluetooth">Bluetooth</string>
+
+    <!-- Used as title on the automatic storage manager settings. [CHAR LIMIT=60] -->
+    <string name="automatic_storage_manager_settings">Manage storage</string>
+
+    <!-- Used as wall of text to describe the feature. [CHAR LIMIT=NONE] -->
+    <string name="automatic_storage_manager_text">To help free up storage space, storage manager removes backed up photos and videos from your device.</string>
+
+    <!-- Dropdown preference title for dropdown describing how many days of data to retain.-->
+    <string name="automatic_storage_manager_days_title">Remove photos &amp; videos</string>
+
+    <!-- Preference title for the automatic storage manager toggle. [CHAR LIMIT=60]-->
+    <string name="automatic_storage_manager_preference_title">Storage manager</string>
+
+    <!-- Category title for the automatic settings in the storage manager settings. [CHAR LIMIT=40] -->
+    <string name="deletion_helper_automatic_title">Automatic</string>
+
+    <!-- Category title for the manual settings in the storage manager settings. [CHAR LIMIT=40] -->
+    <string name="deletion_helper_manual_title">Manual</string>
+
+    <!-- Preference menu title for accessing the deletion helper from the storage manager settings. [CHAR LIMIT=30]-->
+    <string name="deletion_helper_preference_title">Free up space now</string>
+
+    <!-- Preference title for gesture settings [CHAR LIMIT=25]-->
+    <string name="gesture_preference_title">Gestures</string>
+
+    <!-- Title text for double tap power for camera [CHAR LIMIT=60]-->
+    <string name="double_tap_power_for_camera_title">Jump to Camera</string>
+
+    <!-- Summary text for double tap power for camera [CHAR LIMIT=160]-->
+    <string name="double_tap_power_for_camera_summary">To quickly open camera, just double-tap the power button. Works from any screen.</string>
+
+    <!-- Title text for double twist for camera mode [CHAR LIMIT=60]-->
+    <string name="double_twist_for_camera_mode_title">Flip camera</string>
+
+    <!-- Summary text for double twist for camera mode  [CHAR LIMIT=160]-->
+    <string name="double_twist_for_camera_mode_summary">To switch between front and back cameras, double-twist.</string>
+
+    <!-- Title text for ambient display [CHAR LIMIT=60]-->
+    <string name="ambient_display_title">Quick screen check</string>
+
+    <!-- Summary text for ambient display [CHAR LIMIT=160]-->
+    <string name="ambient_display_summary">To check your phone without waking it up fully, nudge or pick it up.</string>
+
+    <!-- Title text for fingerprint swipe for notifications [CHAR LIMIT=60]-->
+    <string name="fingerprint_swipe_for_notifications_title">Swipe for notifications</string>
+
+    <!-- Summary text for fingerprint swipe for notifications [CHAR LIMIT=160]-->
+    <string name="fingerprint_swipe_for_notifications_summary">To check your notifications from any screen, swipe down on the fingerprint sensor.</string>
+
+    <!-- Switch text for each gesture setting state -->
+    <string name="gesture_setting_on">On</string>
+    <string name="gesture_setting_off">Off</string>
+
+    <!-- setting enable OEM unlock Checkbox's summary to explain this Checkbox is disabled because the bootloader has been unlocked [CHAR_LIMIT=60] -->
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked">Bootloader is already unlocked</string>
+    <!-- setting enable OEM unlock Checkbox's summary to explain this Checkbox is disabled because there is no connectivity. [CHAR_LIMIT=60] -->
+    <string name="oem_unlock_enable_disabled_summary_connectivity">Connect to the Internet first</string>
+    <!-- setting enable OEM unlock Checkbox's summary to explain this Checkbox is disabled because this setting is unavailable on sim-locked devices. [CHAR_LIMIT=60] -->
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device">Unavailable on carrier-locked devices</string>
+
+    <string name="automatic_storage_manager_freed_bytes"><xliff:g id="size" example="3.25MB">%1$s</xliff:g> total made available\n\nLast ran on <xliff:g id="date" example="Jan 12">%2$s</xliff:g></string>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index bfe2d1c..cc6dc30 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -286,6 +286,15 @@
         <item name="android:singleLine">true</item>
     </style>
 
+    <style name="SetupWizardButton.Negative" parent="@android:style/TextAppearance.Widget.TextView">
+        <item name="android:background">@null</item>
+        <item name="android:minWidth">0dp</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textColor">?android:attr/colorControlActivated</item>
+    </style>
+
+    <style name="SetupWizardButton.Positive" parent="@android:style/Widget.Material.Button.Colored" />
+
     <style name="vpn_label">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
@@ -329,6 +338,12 @@
     <style name="TextAppearance.RecentsTitle" parent="TextAppearance.CategoryTitle" />
     <style name="TextAppearance.ResultTitle" parent="TextAppearance.CategoryTitle" />
 
+    <style name="TextAppearance.SuggestionTitle"
+           parent="@android:style/TextAppearance.Material.Subhead">
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
     <style name="TextAppearance.FingerprintMessage"
         parent="android:TextAppearance.Material.Subhead">
         <item name="android:lineSpacingExtra">@dimen/suw_description_line_spacing_extra</item>
@@ -350,16 +365,23 @@
         <item name="android:textColor">@color/warning</item>
     </style>
 
-    <style name="FingerprintLayoutTheme">
-        <item name="suwBackground">@drawable/fp_enrollment_header</item>
-        <item name="suwIllustrationAspectRatio">@dimen/fingerprint_illustration_aspect_ratio</item>
-        <item name="suwDecorPaddingTop">@dimen/fingerprint_decor_padding_top</item>
+    <style name="TextAppearance.SupportTitle"
+           parent="@android:style/TextAppearance.Material.Subhead">
+        <item name="android:textColor">?android:attr/colorAccent</item>
+        <item name="android:textSize">24sp</item>
     </style>
 
-    <style name="SetupWizardFingerprintLayoutTheme">
-        <item name="suwBackgroundTile">@drawable/setup_illustration_tile</item>
-        <item name="suwIllustration">@drawable/setup_illustration_lock_screen</item>
-        <item name="suwIllustrationHorizontalTile">@drawable/setup_illustration_horizontal_tile</item>
+    <style name="TextAppearance.SupportSummary" parent="TextAppearance.CategoryTitle"/>
+
+    <style name="SupportPrimaryButton" parent="android:Widget.Material.Button.Colored"/>
+
+    <style name="SupportSecondaryButton"
+           parent="android:Widget.Material.Button.Borderless.Colored">
+        <item name="android:textSize">12sp</item>
+    </style>
+
+    <style name="FingerprintLayoutTheme">
+        <item name="android:icon">@drawable/ic_fingerprint_header</item>
     </style>
 
     <style name="TextAppearance.ConfirmDeviceCredentialsErrorText"
@@ -402,4 +424,12 @@
         <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
     </style>
 
+    <style name="SupportEscalationCard">
+        <item name="android:background">@color/card_background_grey</item>
+        <item name="android:gravity">center</item>
+        <item name="android:minHeight">368dp</item>
+        <item name="android:paddingStart">56dp</item>
+        <item name="android:paddingEnd">56dp</item>
+    </style>
+
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index ef9e1e0..e09a02d 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -18,7 +18,6 @@
     <attr name="fingerprint_layout_theme" format="reference" />
     <attr name="fingerprint_progress_bar_size" format="reference|dimension" />
     <attr name="fingerprint_ring_radius" format="reference|dimension" />
-    <attr name="ic_menu_add" format="reference" />
     <attr name="ic_menu_moreoverflow" format="reference" />
     <attr name="ic_wps" format="reference" />
     <attr name="setup_divider_color" format="reference" />
@@ -32,18 +31,15 @@
         <item name="android:windowBackground">@null</item>
     </style>
 
-    <style name="SetupWizardTheme" parent="SuwThemeMaterial">
+    <style name="SetupWizardTheme" parent="SuwThemeGlif">
         <!-- For all Alert Dialogs -->
         <item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
         <item name="android:colorPrimary">@color/suw_color_accent_dark</item>
-        <item name="android:listPreferredItemPaddingEnd">@dimen/suw_layout_margin_sides</item>
-        <item name="android:listPreferredItemPaddingStart">@dimen/suw_layout_margin_sides</item>
         <item name="android:windowBackground">?android:attr/colorBackground</item>
         <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
-        <item name="fingerprint_layout_theme">@style/SetupWizardFingerprintLayoutTheme</item>
+        <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
         <item name="fingerprint_progress_bar_size">@dimen/setup_fingerprint_progress_bar_size</item>
         <item name="fingerprint_ring_radius">@dimen/setup_fingerprint_ring_radius</item>
-        <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
         <item name="ic_wps">@drawable/ic_wps_dark</item>
         <item name="setup_divider_color">@color/setup_divider_color_dark</item>
@@ -59,18 +55,15 @@
         <item name="@*android:errorColor">@color/setup_lock_pattern_view_error_color_dark</item>
     </style>
 
-    <style name="SetupWizardTheme.Light" parent="SuwThemeMaterial.Light">
+    <style name="SetupWizardTheme.Light" parent="SuwThemeGlif.Light">
         <!-- For all Alert Dialogs -->
         <item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
         <item name="android:colorPrimary">@color/suw_color_accent_light</item>
-        <item name="android:listPreferredItemPaddingEnd">@dimen/suw_layout_margin_sides</item>
-        <item name="android:listPreferredItemPaddingStart">@dimen/suw_layout_margin_sides</item>
         <item name="android:windowBackground">?android:attr/colorBackground</item>
         <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
-        <item name="fingerprint_layout_theme">@style/SetupWizardFingerprintLayoutTheme</item>
+        <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
         <item name="fingerprint_progress_bar_size">@dimen/setup_fingerprint_progress_bar_size</item>
         <item name="fingerprint_ring_radius">@dimen/setup_fingerprint_ring_radius</item>
-        <item name="ic_menu_add">@drawable/ic_menu_add_light</item>
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
         <item name="ic_wps">@drawable/ic_wps_light</item>
         <item name="setup_divider_color">@color/setup_divider_color_light</item>
@@ -78,7 +71,7 @@
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
         <item name="wifi_signal">@drawable/wifi_signal</item>
         <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
-        <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
+        <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard.Light</item>
 
         <!-- LockPatternView colors -->
         <item name="@*android:regularColor">@color/setup_lock_pattern_view_regular_color_light</item>
@@ -100,7 +93,7 @@
         <item name="android:windowAnimationStyle">@null</item>
     </style>
 
-    <style name="PreferenceTheme" parent="@android:style/Theme.DeviceDefault.Settings">
+    <style name="PreferenceTheme" parent="Theme.SettingsBase">
         <item name="@android:preferenceStyle">@style/Preference</item>
         <item name="@android:editTextPreferenceStyle">@style/EditTextPreference</item>
         <item name="@dropdownPreferenceStyle">@style/Preference.DropDown.Material</item>
@@ -108,9 +101,11 @@
         <item name="apnPreferenceStyle">@style/ApnPreference</item>
     </style>
 
-    <style name="PreferenceTheme.SetupWizard">
-        <item name="android:listPreferredItemPaddingEnd">@dimen/suw_layout_margin_sides</item>
-        <item name="android:listPreferredItemPaddingStart">@dimen/suw_layout_margin_sides</item>
+    <style name="PreferenceTheme.SetupWizard" parent="SetupWizardTheme">
+        <item name="preferenceFragmentStyle">@style/SetupWizardPreferenceFragmentStyle</item>
+    </style>
+
+    <style name="PreferenceTheme.SetupWizard.Light" parent="SetupWizardTheme.Light">
         <item name="preferenceFragmentStyle">@style/SetupWizardPreferenceFragmentStyle</item>
     </style>
 
@@ -134,7 +129,7 @@
          layouts against a remote context using our local theme colors. Due to the implementation
          details of Theme, we can't reference any local resources and MUST instead use the values
          directly. So use #ff263238 instead of @color/theme_primary and so on. -->
-    <style name="Theme.SettingsBase" parent="@android:style/Theme.Material.Settings" />
+    <style name="Theme.SettingsBase" parent="@android:style/Theme.DeviceDefault.Settings" />
 
     <style name="Theme.Settings" parent="Theme.SettingsBase">
         <item name="preferenceTheme">@style/PreferenceTheme</item>
@@ -147,7 +142,6 @@
         <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
         <item name="fingerprint_progress_bar_size">@dimen/fingerprint_progress_bar_size</item>
         <item name="fingerprint_ring_radius">@dimen/fingerprint_ring_radius</item>
-        <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
         <item name="ic_wps">@drawable/ic_wps_light</item>
         <item name="wifi_signal">@drawable/wifi_signal</item>
@@ -197,19 +191,19 @@
         <item name="android:contentInsetStart">@dimen/actionbar_subsettings_contentInsetStart</item>
     </style>
 
-    <style name="ThemeOverlay.SwitchBar.Settings" parent="@android:style/ThemeOverlay.Material.Dark.ActionBar">
+    <style name="ThemeOverlay.SwitchBar.Settings" parent="@*android:style/ThemeOverlay.DeviceDefault.Dark.ActionBar.Accent">
         <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
         <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
-        <item name="switchBarBackgroundColor">@color/switchbar_background_color</item>
+        <item name="switchBarBackgroundColor">?android:attr/colorSecondary</item>
     </style>
 
     <style name="ThemeOverlay.SwitchBar.SubSettings" parent="@android:style/ThemeOverlay.Material.Dark.ActionBar">
         <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
         <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
-        <item name="switchBarBackgroundColor">@color/switchbar_background_color</item>
+        <item name="switchBarBackgroundColor">?android:attr/colorSecondary</item>
     </style>
 
-    <style name="Theme.DialogWhenLarge" parent="@*android:style/Theme.Material.Settings.DialogWhenLarge">
+    <style name="Theme.DialogWhenLarge" parent="@*android:style/Theme.DeviceDefault.Settings.DialogWhenLarge">
         <!-- Redefine the ActionBar style for contentInsetStart -->
         <item name="android:actionBarStyle">@style/Theme.ActionBar</item>
 
@@ -240,7 +234,7 @@
         <item name="android:windowSoftInputMode">adjustResize</item>
     </style>
 
-    <style name="Theme.AlertDialog" parent="@*android:style/Theme.Material.Settings.Dialog.Alert">
+    <style name="Theme.AlertDialog" parent="@*android:style/Theme.DeviceDefault.Settings.Dialog.Alert">
         <item name="android:windowSoftInputMode">adjustResize</item>
 
         <!-- Redefine the ActionBar style for contentInsetStart -->
@@ -255,24 +249,15 @@
         <item name="preferenceBackgroundColor">@android:color/transparent</item>
     </style>
 
-    <!-- Used to color the switch bar controls -->
-    <style name="ThemeOverlay.SwitchBar" parent="@android:style/ThemeOverlay">
-        <!-- Used by controls, e.g. CheckBox, ProgressBar, etc. -->
-        <item name="android:colorAccent">@color/switch_accent_color</item>
-        <item name="switchBarBackgroundColor">@color/switchbar_background_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>
+    <style name="Theme.ConfirmDeviceCredentialsDark" parent="@android:style/Theme.DeviceDefault">
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
-        <item name="android:windowBackground">@color/confirm_device_credential_dark_background</item>
+        <item name="android:windowBackground">?android:attr/colorPrimary</item>
 
         <item name="confirmDeviceCredentialsSideMargin">32dp</item>
         <item name="confirmDeviceCredentialsTopMargin">32dp</item>
@@ -289,17 +274,11 @@
         <item name="android:colorAccent">@*android:color/white</item>
     </style>
 
-    <style name="Theme.FingerprintEnroll" parent="@*android:style/Theme.Material.Settings.NoActionBar">
-        <item name="android:listPreferredItemHeight">@dimen/suw_items_preferred_height</item>
-        <item name="android:listPreferredItemPaddingEnd">@dimen/suw_layout_margin_sides</item>
-        <item name="android:listPreferredItemPaddingStart">@dimen/suw_layout_margin_sides</item>
+    <style name="Theme.FingerprintEnroll" parent="SuwThemeGlif.Light">
         <item name="android:textAppearanceListItemSmall">@android:style/TextAppearance.Material.Body1</item>
-        <item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item>
-        <item name="selectableItemBackground">?android:attr/selectableItemBackground</item>
 
         <item name="suwDividerCondition">both</item>
         <item name="suwListItemIconColor">?android:attr/colorAccent</item>
-        <item name="suwMarginSides">@dimen/suw_layout_margin_sides</item>
     </style>
 
     <style name="FallbackHome" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
@@ -314,4 +293,13 @@
         <item name="android:navigationBarColor">#00000000</item>
     </style>
 
+    <style name="FallbackHome.SetupWizard" parent="@android:style/Theme.Material.NoActionBar.Fullscreen">
+        <item name="android:windowBackground">@drawable/fallback_home_unprovisioned_background</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">#00000000</item>
+        <item name="android:navigationBarColor">#00000000</item>
+    </style>
+
 </resources>
diff --git a/res/xml/automatic_storage_management_settings.xml b/res/xml/automatic_storage_management_settings.xml
new file mode 100644
index 0000000..2320257
--- /dev/null
+++ b/res/xml/automatic_storage_management_settings.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
+        android:title="@string/automatic_storage_manager_settings" >
+
+    <PreferenceCategory
+        android:key="automatic"
+        android:title="@string/deletion_helper_automatic_title">
+
+        <SwitchPreference
+            android:key="storage_manager_active"
+            android:title="@string/automatic_storage_manager_preference_title"
+            android:summary="@string/automatic_storage_manager_text"/>
+
+
+        <com.android.settings.fuelgauge.WallOfTextPreference
+            android:key="freed_bytes"
+            android:persistent="false"
+            android:selectable="false"
+            settings:allowDividerAbove="false"
+            settings:allowDividerBelow="true" />
+
+        <DropDownPreference
+            android:key="days"
+            android:summary="%s"
+            android:title="@string/automatic_storage_manager_days_title"
+            android:entries="@array/automatic_storage_management_days"
+            android:entryValues="@array/automatic_storage_management_days_values"
+            settings:allowDividerAbove="true" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="manual"
+        android:title="@string/deletion_helper_manual_title">
+
+        <Preference
+            android:key="deletion_helper"
+            android:title="@string/deletion_helper_preference_title"/>
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 0145ff4..29363ad 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -51,10 +51,11 @@
         android:title="@string/bt_hci_snoop_log"
         android:summary="@string/bt_hci_snoop_log_summary"/>
 
-    <SwitchPreference
+    <com.android.settingslib.RestrictedSwitchPreference
         android:key="oem_unlock_enable"
         android:title="@string/oem_unlock_enable"
-        android:summary="@string/oem_unlock_enable_summary"/>
+        android:summary="@string/oem_unlock_enable_summary"
+        settings:useAdditionalSummary="true"/>
 
     <PreferenceScreen
         android:key="running_apps"
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 5638f4f..74f873b 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -56,10 +56,16 @@
 
         <PreferenceScreen
                 android:key="regulatory_info"
-                android:title="@string/regulatory_information">
+                android:title="@string/regulatory_labels">
             <intent android:action="android.settings.SHOW_REGULATORY_INFO" />
         </PreferenceScreen>
 
+        <PreferenceScreen
+                android:key="safety_info"
+                android:title="@string/safety_and_regulatory_info">
+                <intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO" />
+        </PreferenceScreen>
+
         <!-- Feedback on the device -->
         <PreferenceScreen android:key="device_feedback"
                 android:title="@string/device_feedback">
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 816f27b..cb1fac5 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -45,8 +45,11 @@
                 android:key="wallpaper"
                 android:title="@string/wallpaper_settings_title"
                 settings:keywords="@string/keywords_display_wallpaper"
-                android:fragment="com.android.settings.WallpaperTypeSettings"
-                settings:useAdminDisabledSummary="true" />
+                settings:useAdminDisabledSummary="true" >
+                <intent
+                        android:targetPackage="@string/config_wallpaper_picker_package"
+                        android:targetClass="@string/config_wallpaper_picker_class" />
+        </com.android.settingslib.RestrictedPreference>
 
         <com.android.settings.TimeoutListPreference
                 android:key="screen_timeout"
@@ -60,11 +63,6 @@
                 android:title="@string/camera_gesture_title"
                 android:summary="@string/camera_gesture_desc" />
 
-        <SwitchPreference
-                android:key="camera_double_tap_power_gesture"
-                android:title="@string/camera_double_tap_power_gesture_title"
-                android:summary="@string/camera_double_tap_power_gesture_desc" />
-
         <PreferenceScreen
                 android:key="screensaver"
                 android:title="@string/screensaver_settings_title"
@@ -74,10 +72,14 @@
                 android:key="lift_to_wake"
                 android:title="@string/lift_to_wake_title" />
 
-        <SwitchPreference
+        <PreferenceScreen
                 android:key="doze"
                 android:title="@string/doze_title"
-                android:summary="@string/doze_summary" />
+                android:summary="@string/doze_summary"
+                android:fragment="com.android.settings.gestures.GestureSettings" >
+                <extra android:name=":settings:fragment_args_key"
+                       android:value="gesture_pick_up_and_nudge" />
+        </PreferenceScreen>
 
         <SwitchPreference
                 android:key="tap_to_wake"
diff --git a/res/xml/fingerprint_enroll_introduction_items.xml b/res/xml/fingerprint_enroll_introduction_items.xml
index 4cb18a6..28a3f6b 100644
--- a/res/xml/fingerprint_enroll_introduction_items.xml
+++ b/res/xml/fingerprint_enroll_introduction_items.xml
@@ -20,7 +20,7 @@
     <Item
         android:enabled="false"
         android:id="@+id/fingerprint_introduction_message"
-        android:layout="@layout/suw_item_link_description"/>
+        android:layout="@layout/suw_items_description" />
 
     <Item
         android:id="@+id/next_button"
diff --git a/res/xml/gesture_settings.xml b/res/xml/gesture_settings.xml
new file mode 100644
index 0000000..5adc311
--- /dev/null
+++ b/res/xml/gesture_settings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:title="@string/gesture_preference_title"
+    settings:keywords="@string/keywords_gesture">
+
+    <com.android.settings.gestures.GesturePreference
+        android:key="gesture_double_tap_power"
+        android:title="@string/double_tap_power_for_camera_title"
+        android:summary="@string/double_tap_power_for_camera_summary"
+        settings:animation="@raw/gesture_double_tap"/>
+
+    <com.android.settings.gestures.GesturePreference
+        android:key="gesture_double_twist"
+        android:title="@string/double_twist_for_camera_mode_title"
+        android:summary="@string/double_twist_for_camera_mode_summary"
+        settings:animation="@raw/gesture_twist"/>
+
+    <com.android.settings.gestures.GesturePreference
+        android:key="gesture_swipe_down_fingerprint"
+        android:title="@string/fingerprint_swipe_for_notifications_title"
+        android:summary="@string/fingerprint_swipe_for_notifications_summary"
+        settings:animation="@raw/gesture_fingerprint_swipe"/>
+
+    <com.android.settings.gestures.GesturePreference
+        android:key="gesture_pick_up_and_nudge"
+        android:title="@string/ambient_display_title"
+        android:summary="@string/ambient_display_summary"
+        settings:animation="@raw/gesture_ambient_move_lift"/>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/privacy_settings.xml b/res/xml/privacy_settings.xml
index 8c66fe1..f2af8f3 100644
--- a/res/xml/privacy_settings.xml
+++ b/res/xml/privacy_settings.xml
@@ -50,15 +50,6 @@
         android:enabled="false"
         android:selectable="false" />
 
-    <!-- Network reset -->
-    <com.android.settingslib.RestrictedPreference
-        android:key="network_reset"
-        android:title="@string/reset_network_title"
-        settings:keywords="@string/keywords_network_reset"
-        settings:userRestriction="no_network_reset"
-        settings:useAdminDisabledSummary="true"
-        android:fragment="com.android.settings.ResetNetwork" />
-
     <!-- Factory reset -->
     <com.android.settingslib.RestrictedPreference
         android:key="factory_reset"
diff --git a/res/xml/shortcuts.xml b/res/xml/shortcuts.xml
new file mode 100644
index 0000000..e12c935
--- /dev/null
+++ b/res/xml/shortcuts.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android" >
+    <shortcut
+        android:shortcutId="manifest-shortcut-wifi"
+        android:icon="@drawable/ic_shortcut_wireless"
+        android:shortcutShortLabel="@string/wifi_settings" >
+        <intent android:action="android.settings.WIFI_SETTINGS" />
+    </shortcut>
+    <shortcut
+        android:shortcutId="manifest-shortcut-data-usage"
+        android:icon="@drawable/ic_shortcut_data_usage"
+        android:shortcutShortLabel="@string/data_usage_summary_title">
+        <intent
+            android:action="android.intent.action.MAIN"
+            android:targetPackage="com.android.settings"
+            android:targetClass="com.android.settings.Settings$DataUsageSummaryActivity" />
+    </shortcut>
+    <shortcut
+        android:shortcutId="manifest-shortcut-display"
+        android:icon="@drawable/ic_shortcut_display"
+        android:shortcutShortLabel="@string/display_settings">
+        <intent android:action="com.android.settings.DISPLAY_SETTINGS" />
+    </shortcut>
+    <shortcut
+        android:shortcutId="manifest-shortcut-battery"
+        android:icon="@drawable/ic_shortcut_battery"
+        android:shortcutShortLabel="@string/power_usage_summary_title" >
+        <intent android:action="android.intent.action.POWER_USAGE_SUMMARY" />
+    </shortcut>
+    <shortcut
+        android:shortcutId="manifest-shortcut-storage"
+        android:icon="@drawable/ic_shortcut_storage"
+        android:shortcutShortLabel="@string/storage_settings" >
+        <intent android:action="android.settings.INTERNAL_STORAGE_SETTINGS" />
+    </shortcut>
+</shortcuts>
\ No newline at end of file
diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml
index cd0103d..1375ed4 100644
--- a/res/xml/user_settings.xml
+++ b/res/xml/user_settings.xml
@@ -26,7 +26,7 @@
     <com.android.settings.DimmableIconPreference
             android:key="user_add"
             android:title="@string/user_add_user_or_profile_menu"
-            android:icon="@drawable/ic_menu_add_dark" />
+            android:icon="@drawable/ic_menu_add" />
 
     <PreferenceCategory
             android:key="lock_screen_settings"
diff --git a/res/xml/wifi_calling_settings.xml b/res/xml/wifi_calling_settings.xml
index ca4e560..c32582c 100644
--- a/res/xml/wifi_calling_settings.xml
+++ b/res/xml/wifi_calling_settings.xml
@@ -26,4 +26,10 @@
             android:entryValues="@array/wifi_calling_mode_values"
             android:dialogTitle="@string/wifi_calling_mode_dialog_title" />
 
+    <Preference
+        android:key="emergency_address_key"
+        android:title="@string/emergency_address_title"
+        android:summary="@string/emergency_address_summary">
+    </Preference>
+
 </PreferenceScreen>
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 0461bf8..e94db56 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -89,4 +89,13 @@
         android:key="proxy_settings"
         android:title="@string/proxy_settings_title" />
 
+    <!-- Network reset -->
+    <com.android.settingslib.RestrictedPreference
+        android:key="network_reset"
+        android:title="@string/reset_network_title"
+        settings:keywords="@string/keywords_network_reset"
+        settings:userRestriction="no_network_reset"
+        settings:useAdminDisabledSummary="true"
+        android:fragment="com.android.settings.ResetNetwork" />
+
 </PreferenceScreen>
diff --git a/src/com/android/settings/BackupSettingsActivity.java b/src/com/android/settings/BackupSettingsActivity.java
new file mode 100644
index 0000000..94e9691
--- /dev/null
+++ b/src/com/android/settings/BackupSettingsActivity.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.settings.R;
+
+import java.net.URISyntaxException;
+
+/**
+ * A trampoline activity used to launch the configured Backup activity.
+ * This activity used the theme NoDisplay to minimize the flicker that might be seen for the launch-
+ * finsih transition.
+ */
+public class BackupSettingsActivity extends Activity {
+    private static final String TAG = "BackupSettingsActivity";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        String backup = getResources().getString(R.string.config_backup_settings_intent);
+        if (!TextUtils.isEmpty(backup)) {
+            try {
+                Intent intent = Intent.parseUri(backup, 0);
+                if (intent.resolveActivity(getPackageManager()) != null) {
+                    // use startActivityForResult to let the activity check the caller signature
+                    startActivityForResult(intent, -1);
+                } else {
+                    Log.e(TAG, "Backup component not found!");
+                }
+            } catch (URISyntaxException e) {
+                Log.e(TAG, "Invalid backup component URI!", e);
+            }
+        }
+        finish();
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 5eb5132..6db6f76 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -32,7 +32,6 @@
 import android.hardware.fingerprint.FingerprintManager;
 import android.hardware.fingerprint.FingerprintManager.RemovalCallback;
 import android.os.Bundle;
-import android.os.Process;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.os.storage.StorageManager;
@@ -42,9 +41,7 @@
 import android.text.TextUtils;
 import android.util.EventLog;
 import android.util.Log;
-import android.view.View;
 import android.view.accessibility.AccessibilityManager;
-import android.widget.Toast;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.internal.widget.LockPatternUtils;
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index b3826b7..5a8960c 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -25,7 +25,6 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.os.UserHandle;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.Selection;
@@ -40,6 +39,7 @@
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
@@ -50,6 +50,7 @@
 import com.android.internal.widget.PasswordEntryKeyboardView;
 import com.android.internal.widget.TextViewInputDisabler;
 import com.android.settings.notification.RedactionInterstitial;
+import com.android.setupwizardlib.GlifLayout;
 
 public class ChooseLockPassword extends SettingsActivity {
     public static final String PASSWORD_MIN_KEY = "lockscreen.password_min";
@@ -143,6 +144,8 @@
         super.onCreate(savedInstanceState);
         CharSequence msg = getText(R.string.lockpassword_choose_your_password_header);
         setTitle(msg);
+        LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
+        layout.setFitsSystemWindows(false);
     }
 
     public static class ChooseLockPasswordFragment extends InstrumentedFragment
@@ -287,7 +290,10 @@
         @Override
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
                 Bundle savedInstanceState) {
-            return inflater.inflate(R.layout.choose_lock_password, container, false);
+            GlifLayout layout = (GlifLayout) inflater.inflate(
+                    R.layout.choose_lock_password, container, false);
+            layout.setHeaderText(getActivity().getTitle());
+            return layout;
         }
 
         @Override
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 2e9f767..59fa2c7 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -21,12 +21,12 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.UserHandle;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
@@ -37,6 +37,7 @@
 import com.android.internal.widget.LockPatternView.Cell;
 import com.android.internal.widget.LockPatternView.DisplayMode;
 import com.android.settings.notification.RedactionInterstitial;
+import com.android.setupwizardlib.GlifLayout;
 import com.google.android.collect.Lists;
 
 import java.util.ArrayList;
@@ -113,6 +114,8 @@
         super.onCreate(savedInstanceState);
         CharSequence msg = getText(R.string.lockpassword_choose_your_pattern_header);
         setTitle(msg);
+        LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
+        layout.setFitsSystemWindows(false);
     }
 
     @Override
@@ -391,7 +394,10 @@
         @Override
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
                 Bundle savedInstanceState) {
-            return inflater.inflate(R.layout.choose_lock_pattern, container, false);
+            final GlifLayout layout = (GlifLayout) inflater.inflate(
+                    R.layout.choose_lock_pattern, container, false);
+            layout.setHeaderText(getActivity().getTitle());
+            return layout;
         }
 
         @Override
diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
index ef19c2a..b46fa92 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
@@ -142,8 +142,16 @@
     @Override
     public void onResume() {
         super.onResume();
+        refreshLockScreen();
+    }
+
+    protected void refreshLockScreen() {
         if (mAllowFpAuthentication) {
             mFingerprintHelper.startListening();
+        } else {
+            if (mFingerprintHelper.isListening()) {
+                mFingerprintHelper.stopListening();
+            }
         }
         if (isProfileChallenge()) {
             updateErrorMessage(mLockPatternUtils.getCurrentFailedPasswordAttempts(
@@ -168,7 +176,7 @@
     @Override
     public void onPause() {
         super.onPause();
-        if (mAllowFpAuthentication) {
+        if (mFingerprintHelper.isListening()) {
             mFingerprintHelper.stopListening();
         }
     }
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index dd8640c..a2ce154 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -498,6 +498,7 @@
                 checkForPendingIntent();
             } else {
                 if (timeoutMs > 0) {
+                    refreshLockScreen();
                     long deadline = mLockPatternUtils.setLockoutAttemptDeadline(
                             effectiveUserId, timeoutMs);
                     handleAttemptLockout(deadline);
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java
index 3ed3e82..94589f0 100644
--- a/src/com/android/settings/DateTimeSettings.java
+++ b/src/com/android/settings/DateTimeSettings.java
@@ -28,6 +28,8 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
+import android.os.UserManager;
+import android.provider.SearchIndexableResource;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
 import android.support.v14.preference.SwitchPreference;
@@ -38,17 +40,21 @@
 import android.widget.TimePicker;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
 import com.android.settingslib.datetime.ZoneGetter;
 
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
 public class DateTimeSettings extends SettingsPreferenceFragment
-        implements OnTimeSetListener, OnDateSetListener, OnPreferenceChangeListener {
+        implements OnTimeSetListener, OnDateSetListener, OnPreferenceChangeListener, Indexable {
 
     private static final String HOURS_12 = "12";
     private static final String HOURS_24 = "24";
@@ -380,4 +386,26 @@
             return new SummaryProvider(activity, summaryLoader);
         }
     };
+
+    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new DateTimeSearchIndexProvider();
+
+    private static class DateTimeSearchIndexProvider extends BaseSearchIndexProvider {
+
+        @Override
+        public List<SearchIndexableResource> getXmlResourcesToIndex(
+                Context context, boolean enabled) {
+            List<SearchIndexableResource> result = new ArrayList<>();
+            // Remove data/time settings from search in demo mode
+            if (UserManager.isDeviceInDemoMode(context)) {
+                return result;
+            }
+
+            SearchIndexableResource sir = new SearchIndexableResource(context);
+            sir.xmlResId = R.xml.date_time_prefs;
+            result.add(sir);
+
+            return result;
+        }
+    }
 }
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 4daa881..934e752 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -64,6 +64,7 @@
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.support.v7.preference.PreferenceGroup;
 import android.support.v7.preference.PreferenceScreen;
+import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.ThreadedRenderer;
@@ -224,6 +225,7 @@
     private UserManager mUm;
     private WifiManager mWifiManager;
     private PersistentDataBlockManager mOemUnlockManager;
+    private TelephonyManager mTelephonyManager;
 
     private SwitchBar mSwitchBar;
     private boolean mLastEnabledState;
@@ -237,7 +239,7 @@
     private SwitchPreference mBugreportInPower;
     private RestrictedSwitchPreference mKeepScreenOn;
     private SwitchPreference mBtHciSnoopLog;
-    private SwitchPreference mEnableOemUnlock;
+    private RestrictedSwitchPreference mEnableOemUnlock;
     private SwitchPreference mDebugViewAttributes;
     private SwitchPreference mForceAllowOnExternal;
 
@@ -332,6 +334,7 @@
             IWebViewUpdateService.Stub.asInterface(ServiceManager.getService("webviewupdate"));
         mOemUnlockManager = (PersistentDataBlockManager)getActivity()
                 .getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
+        mTelephonyManager = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
 
         mDpm = (DevicePolicyManager)getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE);
         mUm = (UserManager) getSystemService(Context.USER_SERVICE);
@@ -369,7 +372,7 @@
         mBugreportInPower = findAndInitSwitchPref(BUGREPORT_IN_POWER_KEY);
         mKeepScreenOn = (RestrictedSwitchPreference) findAndInitSwitchPref(KEEP_SCREEN_ON);
         mBtHciSnoopLog = findAndInitSwitchPref(BT_HCI_SNOOP_LOG);
-        mEnableOemUnlock = findAndInitSwitchPref(ENABLE_OEM_UNLOCK);
+        mEnableOemUnlock = (RestrictedSwitchPreference) findAndInitSwitchPref(ENABLE_OEM_UNLOCK);
         if (!showEnableOemUnlockPreference()) {
             removePreference(mEnableOemUnlock);
             mEnableOemUnlock = null;
@@ -658,6 +661,7 @@
                 Settings.Secure.BLUETOOTH_HCI_LOG, 0) != 0);
         if (mEnableOemUnlock != null) {
             updateSwitchPreference(mEnableOemUnlock, Utils.isOemUnlockEnabled(getActivity()));
+            updateOemUnlockSettingDescription();
         }
         updateSwitchPreference(mDebugViewAttributes, Settings.Global.getInt(cr,
                 Settings.Global.DEBUG_VIEW_ATTRIBUTES, 0) != 0);
@@ -1003,17 +1007,26 @@
     }
 
     private boolean enableOemUnlockPreference() {
-        int flashLockState = PersistentDataBlockManager.FLASH_LOCK_UNKNOWN;
-        if (mOemUnlockManager != null) {
-            flashLockState = mOemUnlockManager.getFlashLockState();
-        }
-
-        return flashLockState != PersistentDataBlockManager.FLASH_LOCK_UNLOCKED;
+        return !isBootloaderUnlocked() && isOemUnlockAllowed();
     }
 
     private void updateOemUnlockOptions() {
         if (mEnableOemUnlock != null) {
+            // Showing mEnableOemUnlock preference as device has persistent data block.
+            mEnableOemUnlock.setDisabledByAdmin(null);
             mEnableOemUnlock.setEnabled(enableOemUnlockPreference());
+            if (mEnableOemUnlock.isEnabled()) {
+                // mEnableOemUnlock is enabled as device's flash lock is unlocked.
+                if (RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
+                        UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId())) {
+                    // Set mEnableOemUnlock to disabled as restriction is set, but not by admin.
+                    mEnableOemUnlock.setEnabled(false);
+                } else {
+                    // Check restriction, disable mEnableOemUnlock and apply policy transparency.
+                    mEnableOemUnlock
+                            .checkRestrictionAndSetDisabled(UserManager.DISALLOW_FACTORY_RESET);
+                }
+            }
         }
     }
 
@@ -2165,4 +2178,54 @@
                 .show();
 
     }
+
+    private void updateOemUnlockSettingDescription() {
+        if (mEnableOemUnlock != null) {
+            int oemUnlockSummary = R.string.oem_unlock_enable_summary;
+            if (isBootloaderUnlocked()) {
+                oemUnlockSummary = R.string.oem_unlock_enable_disabled_summary_bootloader_unlocked;
+            } else if (isSimLockedDevice()) {
+                oemUnlockSummary = R.string.oem_unlock_enable_disabled_summary_sim_locked_device;
+            } else if (!isOemUnlockAllowed()) {
+                // If the device isn't SIM-locked but OEM unlock is disabled by Global setting, this
+                // means the device hasn't been able to confirm whether SIM-lock or any other
+                // restrictions apply (or hasn't been able to apply such restrictions yet). Ask the
+                // user to connect to the internet in order to retrieve all restrictions.
+                oemUnlockSummary = R.string.oem_unlock_enable_disabled_summary_connectivity;
+            }
+            mEnableOemUnlock.setSummary(getString(oemUnlockSummary));
+        }
+    }
+
+    /** Returns {@code true} if the device is SIM-locked. Otherwise, returns {@code false}. */
+    private boolean isSimLockedDevice() {
+        int phoneCount = mTelephonyManager.getPhoneCount();
+        for (int i = 0; i < phoneCount; i++) {
+            if (mTelephonyManager.getAllowedCarriers(i).size() > 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Returns {@code true} if the bootloader has been unlocked. Otherwise, returns {code false}.
+     */
+    private boolean isBootloaderUnlocked() {
+        int flashLockState = PersistentDataBlockManager.FLASH_LOCK_UNKNOWN;
+        if (mOemUnlockManager != null) {
+            flashLockState = mOemUnlockManager.getFlashLockState();
+        }
+
+        return flashLockState == PersistentDataBlockManager.FLASH_LOCK_UNLOCKED;
+    }
+
+    /**
+     * Returns {@code true} if OEM unlock is not disabled by Global policy. Otherwise, returns
+     * {@code false}.
+     */
+    private boolean isOemUnlockAllowed() {
+        return Settings.Global.getInt(getActivity().getContentResolver(),
+                Settings.Global.OEM_UNLOCK_DISALLOWED, 0) == 0;
+    }
 }
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index ff7334b..dd8064f 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -175,14 +175,12 @@
         // Remove manual entry if none present.
         removePreferenceIfBoolFalse(KEY_MANUAL, R.bool.config_show_manual);
 
-        // Remove regulatory information if none present.
-        final Intent intent = new Intent(Settings.ACTION_SHOW_REGULATORY_INFO);
-        if (getPackageManager().queryIntentActivities(intent, 0).isEmpty()) {
-            Preference pref = findPreference(KEY_REGULATORY_INFO);
-            if (pref != null) {
-                getPreferenceScreen().removePreference(pref);
-            }
-        }
+        // Remove regulatory labels if no activity present to handle intent.
+        removePreferenceIfActivityMissing(
+                KEY_REGULATORY_INFO, Settings.ACTION_SHOW_REGULATORY_INFO);
+
+        removePreferenceIfActivityMissing(
+                "safety_info", "android.settings.SHOW_SAFETY_AND_REGULATORY_INFO");
     }
 
     @Override
@@ -285,7 +283,7 @@
             CarrierConfigManager configManager =
                     (CarrierConfigManager) getSystemService(Context.CARRIER_CONFIG_SERVICE);
             PersistableBundle b = configManager.getConfig();
-            if (b.getBoolean(CarrierConfigManager.KEY_CI_ACTION_ON_SYS_UPDATE_BOOL)) {
+            if (b != null && b.getBoolean(CarrierConfigManager.KEY_CI_ACTION_ON_SYS_UPDATE_BOOL)) {
                 ciActionOnSysUpdate(b);
             }
         }
@@ -327,6 +325,16 @@
         }
     }
 
+    private void removePreferenceIfActivityMissing(String preferenceKey, String action) {
+        final Intent intent = new Intent(action);
+        if (getPackageManager().queryIntentActivities(intent, 0).isEmpty()) {
+            Preference pref = findPreference(preferenceKey);
+            if (pref != null) {
+                getPreferenceScreen().removePreference(pref);
+            }
+        }
+    }
+
     private void removePreferenceIfBoolFalse(String preference, int resId) {
         if (!getResources().getBoolean(resId)) {
             Preference pref = findPreference(preference);
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 8e389a9..bb10570 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -57,7 +57,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static android.provider.Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;
 import static android.provider.Settings.Secure.CAMERA_GESTURE_DISABLED;
 import static android.provider.Settings.Secure.DOUBLE_TAP_TO_WAKE;
 import static android.provider.Settings.Secure.DOZE_ENABLED;
@@ -86,8 +85,6 @@
     private static final String KEY_AUTO_ROTATE = "auto_rotate";
     private static final String KEY_NIGHT_MODE = "night_mode";
     private static final String KEY_CAMERA_GESTURE = "camera_gesture";
-    private static final String KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE
-            = "camera_double_tap_power_gesture";
     private static final String KEY_WALLPAPER = "wallpaper";
     private static final String KEY_VR_DISPLAY_PREF = "vr_display_pref";
 
@@ -97,11 +94,9 @@
     private ListPreference mNightModePreference;
     private Preference mScreenSaverPreference;
     private SwitchPreference mLiftToWakePreference;
-    private SwitchPreference mDozePreference;
     private SwitchPreference mTapToWakePreference;
     private SwitchPreference mAutoBrightnessPreference;
     private SwitchPreference mCameraGesturePreference;
-    private SwitchPreference mCameraDoubleTapPowerGesturePreference;
 
     @Override
     protected int getMetricsCategory() {
@@ -141,10 +136,7 @@
             removePreference(KEY_LIFT_TO_WAKE);
         }
 
-        if (isDozeAvailable(activity)) {
-            mDozePreference = (SwitchPreference) findPreference(KEY_DOZE);
-            mDozePreference.setOnPreferenceChangeListener(this);
-        } else {
+        if (!isDozeAvailable(activity)) {
             removePreference(KEY_DOZE);
         }
 
@@ -162,14 +154,6 @@
             removePreference(KEY_CAMERA_GESTURE);
         }
 
-        if (isCameraDoubleTapPowerGestureAvailable(getResources())) {
-            mCameraDoubleTapPowerGesturePreference
-                    = (SwitchPreference) findPreference(KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE);
-            mCameraDoubleTapPowerGesturePreference.setOnPreferenceChangeListener(this);
-        } else {
-            removePreference(KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE);
-        }
-
         if (RotationPolicy.isRotationLockToggleVisible(activity)) {
             DropDownPreference rotatePreference =
                     (DropDownPreference) findPreference(KEY_AUTO_ROTATE);
@@ -288,11 +272,6 @@
                 !SystemProperties.getBoolean("gesture.disable_camera_launch", false);
     }
 
-    private static boolean isCameraDoubleTapPowerGestureAvailable(Resources res) {
-        return res.getBoolean(
-                com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled);
-    }
-
     private static boolean isVrDisplayModeAvailable(Context context) {
         PackageManager pm = context.getPackageManager();
         return pm.hasSystemFeature(PackageManager.FEATURE_VR_MODE_HIGH_PERFORMANCE);
@@ -365,12 +344,6 @@
             mLiftToWakePreference.setChecked(value != 0);
         }
 
-        // Update doze if it is available.
-        if (mDozePreference != null) {
-            int value = Settings.Secure.getInt(getContentResolver(), DOZE_ENABLED, 1);
-            mDozePreference.setChecked(value != 0);
-        }
-
         // Update tap to wake if it is available.
         if (mTapToWakePreference != null) {
             int value = Settings.Secure.getInt(getContentResolver(), DOUBLE_TAP_TO_WAKE, 0);
@@ -382,13 +355,6 @@
             int value = Settings.Secure.getInt(getContentResolver(), CAMERA_GESTURE_DISABLED, 0);
             mCameraGesturePreference.setChecked(value == 0);
         }
-
-        // Update camera gesture #2 if it is available.
-        if (mCameraDoubleTapPowerGesturePreference != null) {
-            int value = Settings.Secure.getInt(
-                    getContentResolver(), CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0);
-            mCameraDoubleTapPowerGesturePreference.setChecked(value == 0);
-        }
     }
 
     private void updateScreenSaverSummary() {
@@ -431,10 +397,6 @@
             boolean value = (Boolean) objValue;
             Settings.Secure.putInt(getContentResolver(), WAKE_GESTURE_ENABLED, value ? 1 : 0);
         }
-        if (preference == mDozePreference) {
-            boolean value = (Boolean) objValue;
-            Settings.Secure.putInt(getContentResolver(), DOZE_ENABLED, value ? 1 : 0);
-        }
         if (preference == mTapToWakePreference) {
             boolean value = (Boolean) objValue;
             Settings.Secure.putInt(getContentResolver(), DOUBLE_TAP_TO_WAKE, value ? 1 : 0);
@@ -444,11 +406,6 @@
             Settings.Secure.putInt(getContentResolver(), CAMERA_GESTURE_DISABLED,
                     value ? 0 : 1 /* Backwards because setting is for disabling */);
         }
-        if (preference == mCameraDoubleTapPowerGesturePreference) {
-            boolean value = (Boolean) objValue;
-            Settings.Secure.putInt(getContentResolver(), CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,
-                    value ? 0 : 1 /* Backwards because setting is for disabling */);
-        }
         if (preference == mNightModePreference) {
             try {
                 final int value = Integer.parseInt((String) objValue);
@@ -554,9 +511,6 @@
                     if (!isCameraGestureAvailable(context.getResources())) {
                         result.add(KEY_CAMERA_GESTURE);
                     }
-                    if (!isCameraDoubleTapPowerGestureAvailable(context.getResources())) {
-                        result.add(KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE);
-                    }
                     if (!isVrDisplayModeAvailable(context)) {
                         result.add(KEY_VR_DISPLAY_PREF);
                     }
diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java
index e9e2a7c..d34b456 100644
--- a/src/com/android/settings/EncryptionInterstitial.java
+++ b/src/com/android/settings/EncryptionInterstitial.java
@@ -23,19 +23,26 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.support.v7.preference.Preference;
+import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityManager;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
+import com.android.settings.utils.SettingsDividerItemDecoration;
+import com.android.setupwizardlib.GlifPreferenceLayout;
 
 import java.util.List;
 
 public class EncryptionInterstitial extends SettingsActivity {
-    private final static String TAG = EncryptionInterstitial.class.getSimpleName();
+    private static final String TAG = EncryptionInterstitial.class.getSimpleName();
 
     protected static final String EXTRA_PASSWORD_QUALITY = "extra_password_quality";
     protected static final String EXTRA_UNLOCK_METHOD_INTENT = "extra_unlock_method_intent";
@@ -63,6 +70,13 @@
                 .putExtra(EXTRA_UNLOCK_METHOD_INTENT, unlockMethodIntent);
     }
 
+    @Override
+    protected void onCreate(Bundle savedInstance) {
+        super.onCreate(savedInstance);
+        LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
+        layout.setFitsSystemWindows(false);
+    }
+
     public static class EncryptionInterstitialFragment extends SettingsPreferenceFragment
             implements DialogInterface.OnClickListener {
 
@@ -126,7 +140,8 @@
                     disableId = R.string.encrypt_dont_require_password;
                     break;
             }
-            TextView message = createHeaderView();
+            TextView message = (TextView) LayoutInflater.from(getActivity()).inflate(
+                    R.layout.encryption_interstitial_header, null, false);
             message.setText(msgId);
             setHeaderView(message);
 
@@ -138,10 +153,25 @@
                     EXTRA_REQUIRE_PASSWORD, true));
         }
 
-        protected TextView createHeaderView() {
-            TextView message = (TextView) LayoutInflater.from(getActivity()).inflate(
-                    R.layout.encryption_interstitial_header, null, false);
-            return message;
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            super.onViewCreated(view, savedInstanceState);
+            GlifPreferenceLayout layout = (GlifPreferenceLayout) view;
+            layout.setDividerItemDecoration(new SettingsDividerItemDecoration(getContext()));
+
+            layout.setIcon(getContext().getDrawable(R.drawable.ic_lock));
+            layout.setHeaderText(getActivity().getTitle());
+
+            // Use the dividers in SetupWizardRecyclerLayout. Suppress the dividers in
+            // PreferenceFragment.
+            setDivider(null);
+        }
+
+        @Override
+        public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent,
+                Bundle savedInstanceState) {
+            GlifPreferenceLayout layout = (GlifPreferenceLayout) parent;
+            return layout.onCreateRecyclerView(inflater, parent, savedInstanceState);
         }
 
         protected void startLockIntent() {
diff --git a/src/com/android/settings/FallbackHome.java b/src/com/android/settings/FallbackHome.java
index deb01a1..158f672 100644
--- a/src/com/android/settings/FallbackHome.java
+++ b/src/com/android/settings/FallbackHome.java
@@ -28,6 +28,7 @@
 import android.os.UserManager;
 import android.provider.Settings;
 import android.util.Log;
+import android.view.View;
 
 import java.util.Objects;
 
@@ -42,7 +43,9 @@
         // we don't flash the wallpaper before SUW
         if (Settings.Global.getInt(getContentResolver(),
                 Settings.Global.DEVICE_PROVISIONED, 0) == 0) {
-            setTheme(android.R.style.Theme_Black_NoTitleBar_Fullscreen);
+            setTheme(R.style.FallbackHome_SetupWizard);
+            getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
         }
 
         registerReceiver(mReceiver, new IntentFilter(Intent.ACTION_USER_UNLOCKED));
diff --git a/src/com/android/settings/InstrumentedFragment.java b/src/com/android/settings/InstrumentedFragment.java
index 0e3528a..8bab2cf 100644
--- a/src/com/android/settings/InstrumentedFragment.java
+++ b/src/com/android/settings/InstrumentedFragment.java
@@ -16,11 +16,11 @@
 
 package com.android.settings;
 
-import com.android.internal.logging.MetricsLogger;
-
 import android.os.Bundle;
 import android.support.v14.preference.PreferenceFragment;
 
+import com.android.internal.logging.MetricsLogger;
+
 /**
  * Instrumented fragment that logs visibility state.
  */
diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index 7732837..396e5fa 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -61,7 +61,6 @@
     private static final String CONFIGURE_ACCOUNT = "configure_account";
     private static final String DATA_MANAGEMENT = "data_management";
     private static final String BACKUP_INACTIVE = "backup_inactive";
-    private static final String NETWORK_RESET = "network_reset";
     private static final String FACTORY_RESET = "factory_reset";
     private static final String TAG = "PrivacySettings";
     private IBackupManager mBackupManager;
@@ -219,51 +218,6 @@
         return R.string.help_url_backup_reset;
     }
 
-    private static class SummaryProvider implements SummaryLoader.SummaryProvider {
-
-        private final Context mContext;
-        private final SummaryLoader mSummaryLoader;
-
-        public SummaryProvider(Context context, SummaryLoader summaryLoader) {
-            mContext = context;
-            mSummaryLoader = summaryLoader;
-        }
-
-        @Override
-        public void setListening(boolean listening) {
-            if (listening) {
-                IBackupManager backupManager = IBackupManager.Stub.asInterface(
-                        ServiceManager.getService(Context.BACKUP_SERVICE));
-                try {
-                    boolean backupEnabled = backupManager.isBackupEnabled();
-                    if (backupEnabled) {
-                        String transport = backupManager.getCurrentTransport();
-                        String configSummary = backupManager.getDestinationString(transport);
-                        if (configSummary != null) {
-                            mSummaryLoader.setSummary(this, configSummary);
-                        } else {
-                            mSummaryLoader.setSummary(this, mContext.getString(
-                                    R.string.backup_configure_account_default_summary));
-                        }
-                    } else {
-                        mSummaryLoader.setSummary(this, mContext.getString(
-                                R.string.backup_disabled));
-                    }
-                } catch (RemoteException e) {
-                }
-            }
-        }
-    }
-
-    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
-            = new SummaryLoader.SummaryProviderFactory() {
-        @Override
-        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
-                                                                   SummaryLoader summaryLoader) {
-            return new SummaryProvider(activity, summaryLoader);
-        }
-    };
-
     /**
      * For Search.
      */
@@ -331,9 +285,5 @@
                 UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId())) {
             nonVisibleKeys.add(FACTORY_RESET);
         }
-        if (RestrictedLockUtils.hasBaseUserRestriction(context,
-                UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {
-            nonVisibleKeys.add(NETWORK_RESET);
-        }
     }
 }
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index 031a1ae..b071cc3 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -118,6 +118,16 @@
     private static final int CELL_INFO_LIST_RATE_DISABLED = Integer.MAX_VALUE;
     private static final int CELL_INFO_LIST_RATE_MAX = 0;
 
+
+    private static final int IMS_VOLTE_PROVISIONED_CONFIG_ID =
+        ImsConfig.ConfigConstants.VLT_SETTING_ENABLED;
+
+    private static final int IMS_VT_PROVISIONED_CONFIG_ID =
+        ImsConfig.ConfigConstants.LVC_SETTING_ENABLED;
+
+    private static final int IMS_WFC_PROVISIONED_CONFIG_ID =
+        ImsConfig.ConfigConstants.VOICE_OVER_WIFI_SETTING_ENABLED;
+
     //Values in must match mCellInfoRefreshRates
     private static final String[] mCellInfoRefreshRateLabels = {
             "Disabled",
@@ -184,7 +194,9 @@
     private Button updateSmscButton;
     private Button refreshSmscButton;
     private Button oemInfoButton;
-    private Switch imsVoLteProvisionedSwitch;
+    private Switch imsVolteProvisionedSwitch;
+    private Switch imsVtProvisionedSwitch;
+    private Switch imsWfcProvisionedSwitch;
     private Spinner preferredNetworkType;
     private Spinner cellInfoRefreshRateSpinner;
 
@@ -270,7 +282,7 @@
             updateServiceState(serviceState);
             updateRadioPowerState();
             updateNetworkType();
-            updateImsVoLteProvisionedState();
+            updateImsProvisionedState();
         }
     };
 
@@ -382,7 +394,9 @@
         cellInfoAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         cellInfoRefreshRateSpinner.setAdapter(cellInfoAdapter);
 
-        imsVoLteProvisionedSwitch = (Switch) findViewById(R.id.volte_provisioned_switch);
+        imsVolteProvisionedSwitch = (Switch) findViewById(R.id.volte_provisioned_switch);
+        imsVtProvisionedSwitch = (Switch) findViewById(R.id.vt_provisioned_switch);
+        imsWfcProvisionedSwitch = (Switch) findViewById(R.id.wfc_provisioned_switch);
 
         radioPowerOnSwitch = (Switch) findViewById(R.id.radio_power);
 
@@ -425,7 +439,7 @@
         updateDataState();
         updateDataStats2();
         updateRadioPowerState();
-        updateImsVoLteProvisionedState();
+        updateImsProvisionedState();
         updateProperties();
         updateDnsCheckState();
         updateNetworkType();
@@ -447,7 +461,9 @@
         preferredNetworkType.setOnItemSelectedListener(mPreferredNetworkHandler);
 
         radioPowerOnSwitch.setOnCheckedChangeListener(mRadioPowerOnChangeListener);
-        imsVoLteProvisionedSwitch.setOnCheckedChangeListener(mImsVoLteCheckedChangeListener);
+        imsVolteProvisionedSwitch.setOnCheckedChangeListener(mImsVolteCheckedChangeListener);
+        imsVtProvisionedSwitch.setOnCheckedChangeListener(mImsVtCheckedChangeListener);
+        imsWfcProvisionedSwitch.setOnCheckedChangeListener(mImsWfcCheckedChangeListener);
 
         mTelephonyManager.listen(mPhoneStateListener,
                   PhoneStateListener.LISTEN_CALL_STATE
@@ -1099,6 +1115,37 @@
         radioPowerOnSwitch.setOnCheckedChangeListener(mRadioPowerOnChangeListener);
     }
 
+    void setImsVolteProvisionedState( boolean state ) {
+        Log.d(TAG, "setImsVolteProvisioned state: " + ((state)? "on":"off"));
+        setImsConfigProvisionedState( IMS_VOLTE_PROVISIONED_CONFIG_ID, state );
+    }
+
+    void setImsVtProvisionedState( boolean state ) {
+        Log.d(TAG, "setImsVtProvisioned() state: " + ((state)? "on":"off"));
+        setImsConfigProvisionedState( IMS_VT_PROVISIONED_CONFIG_ID, state );
+    }
+
+    void setImsWfcProvisionedState( boolean state ) {
+        Log.d(TAG, "setImsWfcProvisioned() state: " + ((state)? "on":"off"));
+        setImsConfigProvisionedState( IMS_WFC_PROVISIONED_CONFIG_ID, state );
+    }
+
+    void setImsConfigProvisionedState( int configItem, boolean state ) {
+        if (phone != null && mImsManager != null) {
+            QueuedWork.singleThreadExecutor().submit(new Runnable() {
+                public void run() {
+                    try {
+                        mImsManager.getConfigInterface().setProvisionedValue(
+                                configItem,
+                                state? 1 : 0);
+                    } catch (ImsException e) {
+                        Log.e(TAG, "setImsConfigProvisioned() exception:", e);
+                    }
+                }
+            });
+        }
+    }
+
     OnCheckedChangeListener mRadioPowerOnChangeListener = new OnCheckedChangeListener() {
         @Override
         public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
@@ -1107,25 +1154,7 @@
        }
     };
 
-    void setImsVoLteProvisionedState( boolean state ) {
-        log(String.format("toggle VoLTE provisioned: %s", ((state) ? "on":"off")));
-
-        if (phone != null && mImsManager != null) {
-            QueuedWork.singleThreadExecutor().submit(new Runnable() {
-                public void run() {
-                    try {
-                        mImsManager.getConfigInterface().setProvisionedValue(
-                                ImsConfig.ConfigConstants.VLT_SETTING_ENABLED,
-                                state? 1 : 0);
-                    } catch (ImsException e) {
-                        Log.e(TAG, "setImsVoLteProvisioned() exception:", e);
-                    }
-                }
-            });
-        }
-    }
-
-    private boolean isImsVoLteProvisioned() {
+    private boolean isImsVolteProvisioned() {
         if (phone != null && mImsManager != null) {
             return mImsManager.isVolteEnabledByPlatform(phone.getContext())
                 && mImsManager.isVolteProvisionedOnDevice(phone.getContext());
@@ -1133,20 +1162,58 @@
         return false;
     }
 
-    OnCheckedChangeListener mImsVoLteCheckedChangeListener = new OnCheckedChangeListener() {
+    OnCheckedChangeListener mImsVolteCheckedChangeListener = new OnCheckedChangeListener() {
         @Override
         public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-            setImsVoLteProvisionedState(isChecked);
+            setImsVolteProvisionedState(isChecked);
        }
     };
 
-    private void updateImsVoLteProvisionedState() {
-        log("updateImsVoLteProvisionedState isImsVoLteProvisioned()=" + isImsVoLteProvisioned());
+    private boolean isImsVtProvisioned() {
+        if (phone != null && mImsManager != null) {
+            return mImsManager.isVtEnabledByPlatform(phone.getContext())
+                && mImsManager.isVtProvisionedOnDevice(phone.getContext());
+        }
+        return false;
+    }
+
+    OnCheckedChangeListener mImsVtCheckedChangeListener = new OnCheckedChangeListener() {
+        @Override
+        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+            setImsVtProvisionedState(isChecked);
+       }
+    };
+
+    private boolean isImsWfcProvisioned() {
+        if (phone != null && mImsManager != null) {
+            return mImsManager.isWfcEnabledByPlatform(phone.getContext())
+                && mImsManager.isWfcProvisionedOnDevice(phone.getContext());
+        }
+        return false;
+    }
+
+    OnCheckedChangeListener mImsWfcCheckedChangeListener = new OnCheckedChangeListener() {
+        @Override
+        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+            setImsWfcProvisionedState(isChecked);
+       }
+    };
+
+    private void updateImsProvisionedState() {
+        log("updateImsProvisionedState isImsVolteProvisioned()=" + isImsVolteProvisioned());
         //delightful hack to prevent on-checked-changed calls from
         //actually forcing the ims provisioning to its transient/current value.
-        imsVoLteProvisionedSwitch.setOnCheckedChangeListener(null);
-        imsVoLteProvisionedSwitch.setChecked(isImsVoLteProvisioned());
-        imsVoLteProvisionedSwitch.setOnCheckedChangeListener(mImsVoLteCheckedChangeListener);
+        imsVolteProvisionedSwitch.setOnCheckedChangeListener(null);
+        imsVolteProvisionedSwitch.setChecked(isImsVolteProvisioned());
+        imsVolteProvisionedSwitch.setOnCheckedChangeListener(mImsVolteCheckedChangeListener);
+
+        imsVtProvisionedSwitch.setOnCheckedChangeListener(null);
+        imsVtProvisionedSwitch.setChecked(isImsVtProvisioned());
+        imsVtProvisionedSwitch.setOnCheckedChangeListener(mImsVtCheckedChangeListener);
+
+        imsWfcProvisionedSwitch.setOnCheckedChangeListener(null);
+        imsWfcProvisionedSwitch.setChecked(isImsWfcProvisioned());
+        imsWfcProvisionedSwitch.setOnCheckedChangeListener(mImsWfcCheckedChangeListener);
     }
 
     OnClickListener mDnsCheckButtonHandler = new OnClickListener() {
diff --git a/src/com/android/settings/RegulatoryInfoDisplayActivity.java b/src/com/android/settings/RegulatoryInfoDisplayActivity.java
index c674f13..fd94b67 100644
--- a/src/com/android/settings/RegulatoryInfoDisplayActivity.java
+++ b/src/com/android/settings/RegulatoryInfoDisplayActivity.java
@@ -56,7 +56,7 @@
         }
 
         AlertDialog.Builder builder = new AlertDialog.Builder(this)
-                .setTitle(R.string.regulatory_information)
+                .setTitle(R.string.regulatory_labels)
                 .setOnDismissListener(this);
 
         boolean regulatoryInfoDrawableExists = false;
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 3c589cc..3036bd18 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -77,6 +77,7 @@
     public static class UsageAccessSettingsActivity extends SettingsActivity { /* empty */ }
     public static class LocationSettingsActivity extends SettingsActivity { /* empty */ }
     public static class PrivacySettingsActivity extends SettingsActivity { /* empty */ }
+    public static class FactoryResetActivity extends SettingsActivity { /* empty */ }
     public static class RunningServicesActivity extends SettingsActivity { /* empty */ }
     public static class ManageAccountsSettingsActivity extends SettingsActivity { /* empty */ }
     public static class PowerUsageSummaryActivity extends SettingsActivity { /* empty */ }
@@ -84,6 +85,7 @@
     public static class AccountSyncSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AccountSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AccountSyncSettingsInAddAccountActivity extends SettingsActivity { /* empty */ }
+    public static class GestureSettingsActivity extends SettingsActivity { /* empty */ }
     public static class CryptKeeperSettingsActivity extends SettingsActivity { /* empty */ }
     public static class DeviceAdminSettingsActivity extends SettingsActivity { /* empty */ }
     public static class DataUsageSummaryActivity extends SettingsActivity { /* empty */ }
@@ -131,7 +133,6 @@
 
     public static class WifiCallingSuggestionActivity extends SettingsActivity { /* empty */ }
     public static class ZenModeAutomationSuggestionActivity extends SettingsActivity { /* empty */ }
-    public static class WallpaperSuggestionActivity extends SettingsActivity { /* empty */ }
     public static class FingerprintSuggestionActivity extends FingerprintSettings { /* empty */ }
     public static class FingerprintEnrollSuggestionActivity extends FingerprintEnrollIntroduction {
         /* empty */
@@ -139,6 +140,7 @@
     public static class ScreenLockSuggestionActivity extends ChooseLockGeneric { /* empty */ }
     public static class WallpaperSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ManagedProfileSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class DeletionHelperActivity extends SettingsActivity { /* empty */ }
 
     public static class ApnEditorActivity extends SettingsActivity { /* empty */ }
     public static class ChooseAccountActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index c597d16..8cc9085 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -49,6 +49,7 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.SearchView;
+
 import com.android.internal.util.ArrayUtils;
 import com.android.settings.Settings.WifiSettingsActivity;
 import com.android.settings.accessibility.AccessibilitySettings;
@@ -70,7 +71,7 @@
 import com.android.settings.applications.WriteSettingsDetails;
 import com.android.settings.applications.VrListenerSettings;
 import com.android.settings.bluetooth.BluetoothSettings;
-import com.android.settings.dashboard.DashboardSummary;
+import com.android.settings.dashboard.DashboardContainerFragment;
 import com.android.settings.dashboard.SearchResultsSummary;
 import com.android.settings.datausage.DataUsageSummary;
 import com.android.settings.deviceinfo.ImeiInformation;
@@ -83,6 +84,7 @@
 import com.android.settings.fuelgauge.BatterySaverSettings;
 import com.android.settings.fuelgauge.PowerUsageDetail;
 import com.android.settings.fuelgauge.PowerUsageSummary;
+import com.android.settings.gestures.GestureSettings;
 import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment;
 import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
 import com.android.settings.inputmethod.KeyboardLayoutPickerFragment;
@@ -107,6 +109,7 @@
 import com.android.settings.notification.ZenModeScheduleRuleSettings;
 import com.android.settings.notification.ZenModeSettings;
 import com.android.settings.notification.ZenModeVisualInterruptionSettings;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.print.PrintJobSettingsFragment;
 import com.android.settings.print.PrintSettingsFragment;
 import com.android.settings.qstile.DevelopmentTiles;
@@ -128,6 +131,7 @@
 import com.android.settingslib.drawer.SettingsDrawerActivity;
 import com.android.settingslib.drawer.Tile;
 
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -239,6 +243,7 @@
             Settings.StorageSettingsActivity.class.getName(),
             Settings.ManageApplicationsActivity.class.getName(),
             Settings.PowerUsageSummaryActivity.class.getName(),
+            Settings.GestureSettingsActivity.class.getName(),
             //personal_section
             Settings.LocationSettingsActivity.class.getName(),
             Settings.SecuritySettingsActivity.class.getName(),
@@ -298,6 +303,7 @@
             PowerUsageSummary.class.getName(),
             AccountSyncSettings.class.getName(),
             AccountSettings.class.getName(),
+            GestureSettings.class.getName(),
             CryptKeeperSettings.class.getName(),
             DataUsageSummary.class.getName(),
             DreamSettings.class.getName(),
@@ -345,6 +351,7 @@
             TestingSettings.class.getName(),
             WifiAPITest.class.getName(),
             WifiInfo.class.getName(),
+            MasterClear.class.getName(),
     };
 
 
@@ -396,7 +403,6 @@
     private boolean mIsShowingDashboard;
     private boolean mIsShortcut;
 
-    private int mMainContentId = R.id.main_content;
     private ViewGroup mContent;
 
     private SearchView mSearchView;
@@ -421,12 +427,7 @@
 
     @Override
     public boolean onPreferenceStartFragment(PreferenceFragment caller, Preference pref) {
-        // Override the fragment title for Wallpaper settings
-        CharSequence title = pref.getTitle();
-        if (pref.getFragment().equals(WallpaperTypeSettings.class.getName())) {
-            title = getString(R.string.wallpaper_settings_fragment_title);
-        }
-        startPreferencePanel(pref.getFragment(), pref.getExtras(), -1, title,
+        startPreferencePanel(pref.getFragment(), pref.getExtras(), -1, pref.getTitle(),
                 null, 0);
         return true;
     }
@@ -565,7 +566,7 @@
         setContentView(mIsShowingDashboard ?
                 R.layout.settings_main_dashboard : R.layout.settings_main_prefs);
 
-        mContent = (ViewGroup) findViewById(mMainContentId);
+        mContent = (ViewGroup) findViewById(R.id.main_content);
 
         getFragmentManager().addOnBackStackChangedListener(this);
 
@@ -621,7 +622,7 @@
                 // Show Search affordance
                 mDisplaySearch = true;
                 mInitialTitleResId = R.string.dashboard_title;
-                switchToFragment(DashboardSummary.class.getName(), null, false, false,
+                switchToFragment(DashboardContainerFragment.class.getName(), null, false, false,
                         mInitialTitleResId, mInitialTitle, false);
             }
         }
@@ -694,14 +695,6 @@
                 + " ms");
     }
 
-    /**
-     * Sets the id of the view continaing the main content. Should be called before calling super's
-     * onCreate.
-     */
-    protected void setMainContentId(int contentId) {
-        mMainContentId = contentId;
-    }
-
     private void setTitleFromIntent(Intent intent) {
         final int initialTitleResId = intent.getIntExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID, -1);
         if (initialTitleResId > 0) {
@@ -737,7 +730,7 @@
         setTitleFromBackStack();
     }
 
-    private int setTitleFromBackStack() {
+    private void setTitleFromBackStack() {
         final int count = getFragmentManager().getBackStackEntryCount();
 
         if (count == 0) {
@@ -746,13 +739,11 @@
             } else {
                 setTitle(mInitialTitle);
             }
-            return 0;
+            return;
         }
 
         FragmentManager.BackStackEntry bse = getFragmentManager().getBackStackEntryAt(count - 1);
         setTitleFromBackStackEntry(bse);
-
-        return count;
     }
 
     private void setTitleFromBackStackEntry(FragmentManager.BackStackEntry bse) {
@@ -988,7 +979,7 @@
      */
     public void startPreferenceFragment(Fragment fragment, boolean push) {
         FragmentTransaction transaction = getFragmentManager().beginTransaction();
-        transaction.replace(mMainContentId, fragment);
+        transaction.replace(R.id.main_content, fragment);
         if (push) {
             transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
             transaction.addToBackStack(BACK_STACK_PREFS);
@@ -1009,7 +1000,7 @@
         }
         Fragment f = Fragment.instantiate(this, fragmentName, args);
         FragmentTransaction transaction = getFragmentManager().beginTransaction();
-        transaction.replace(mMainContentId, f);
+        transaction.replace(R.id.main_content, f);
         if (withTransition) {
             TransitionManager.beginDelayedTransition(mContent);
         }
@@ -1068,6 +1059,13 @@
                 UserHandle.MU_ENABLED && UserManager.supportsMultipleUsers()
                 && !Utils.isMonkeyRunning(), isAdmin, pm);
 
+        setTileEnabled(new ComponentName(packageName,
+                        Settings.WirelessSettingsActivity.class.getName()),
+                !UserManager.isDeviceInDemoMode(this), isAdmin, pm);
+
+        setTileEnabled(new ComponentName(packageName,
+                        Settings.DateTimeSettingsActivity.class.getName()),
+                !UserManager.isDeviceInDemoMode(this), isAdmin, pm);
         NfcAdapter adapter = NfcAdapter.getDefaultAdapter(this);
         setTileEnabled(new ComponentName(packageName,
                         Settings.PaymentSettingsActivity.class.getName()),
@@ -1102,6 +1100,23 @@
                 }
             }
         }
+
+        String backupIntent = getResources().getString(R.string.config_backup_settings_intent);
+        boolean useDefaultBackup = TextUtils.isEmpty(backupIntent);
+        setTileEnabled(new ComponentName(packageName,
+                Settings.PrivacySettingsActivity.class.getName()), useDefaultBackup, isAdmin, pm);
+        boolean hasBackupActivity = false;
+        if (!useDefaultBackup) {
+            try {
+                Intent intent = Intent.parseUri(backupIntent, 0);
+                hasBackupActivity = !getPackageManager().queryIntentActivities(intent, 0).isEmpty();
+            } catch (URISyntaxException e) {
+                Log.e(LOG_TAG, "Invalid backup intent URI!", e);
+            }
+        }
+        setTileEnabled(new ComponentName(packageName,
+                BackupSettingsActivity.class.getName()), hasBackupActivity, isAdmin, pm);
+
     }
 
     private void setTileEnabled(ComponentName component, boolean enabled, boolean isAdmin,
@@ -1199,10 +1214,11 @@
         if (mSearchResultsFragment != null) {
             return;
         }
-        Fragment current = getFragmentManager().findFragmentById(mMainContentId);
+        Fragment current = getFragmentManager().findFragmentById(R.id.main_content);
         if (current != null && current instanceof SearchResultsSummary) {
             mSearchResultsFragment = (SearchResultsSummary) current;
         } else {
+            setContentHeaderView(null);
             mSearchResultsFragment = (SearchResultsSummary) switchToFragment(
                     SearchResultsSummary.class.getName(), null, false, true,
                     R.string.search_results_title, null, true);
diff --git a/src/com/android/settings/SetupChooseLockGeneric.java b/src/com/android/settings/SetupChooseLockGeneric.java
index bc3a2ec..71679f3 100644
--- a/src/com/android/settings/SetupChooseLockGeneric.java
+++ b/src/com/android/settings/SetupChooseLockGeneric.java
@@ -16,7 +16,6 @@
 
 package com.android.settings;
 
-import android.app.Activity;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.content.Context;
@@ -25,20 +24,18 @@
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.UserHandle;
-import android.support.v7.preference.Preference;
 import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.preference.Preference;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.LinearLayout;
 
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.fingerprint.SetupSkipDialog;
-import com.android.setupwizardlib.SetupWizardLayout;
-import com.android.setupwizardlib.SetupWizardPreferenceLayout;
-import com.android.setupwizardlib.view.NavigationBar;
+import com.android.settings.utils.SettingsDividerItemDecoration;
+import com.android.setupwizardlib.GlifPreferenceLayout;
 
 /**
  * Setup Wizard's version of ChooseLockGeneric screen. It inherits the logic and basic structure
@@ -74,8 +71,7 @@
         layout.setFitsSystemWindows(false);
     }
 
-    public static class SetupChooseLockGenericFragment extends ChooseLockGenericFragment
-            implements NavigationBar.NavigationBarListener {
+    public static class SetupChooseLockGenericFragment extends ChooseLockGenericFragment {
 
         public static final String EXTRA_PASSWORD_QUALITY = ":settings:password_quality";
 
@@ -83,25 +79,20 @@
         public void onViewCreated(View view, Bundle savedInstanceState) {
             super.onViewCreated(view, savedInstanceState);
 
-            SetupWizardUtils.setImmersiveMode(getActivity());
-
-            SetupWizardPreferenceLayout layout = (SetupWizardPreferenceLayout) view;
+            GlifPreferenceLayout layout = (GlifPreferenceLayout) view;
+            layout.setDividerItemDecoration(new SettingsDividerItemDecoration(getContext()));
             layout.setDividerInset(getContext().getResources().getDimensionPixelSize(
-                    R.dimen.suw_items_text_divider_inset));
-            final NavigationBar navigationBar = layout.getNavigationBar();
-            Button nextButton = navigationBar.getNextButton();
-            nextButton.setText(null);
-            nextButton.setEnabled(false);
-            navigationBar.setNavigationBarListener(this);
+                    R.dimen.suw_items_glif_text_divider_inset));
 
-            layout.setIllustration(R.drawable.setup_illustration_lock_screen,
-                    R.drawable.setup_illustration_horizontal_tile);
-            if (!mForFingerprint) {
-                layout.setHeaderText(R.string.setup_lock_settings_picker_title);
-            } else {
-                layout.setHeaderText(R.string.lock_settings_picker_title);
+            layout.setIcon(getContext().getDrawable(R.drawable.ic_lock));
+
+            int titleResource = mForFingerprint ?
+                    R.string.lock_settings_picker_title : R.string.setup_lock_settings_picker_title;
+            if (getActivity() != null) {
+                getActivity().setTitle(titleResource);
             }
 
+            layout.setHeaderText(titleResource);
             // Use the dividers in SetupWizardRecyclerLayout. Suppress the dividers in
             // PreferenceFragment.
             setDivider(null);
@@ -143,7 +134,7 @@
         @Override
         public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent,
                 Bundle savedInstanceState) {
-            SetupWizardPreferenceLayout layout = (SetupWizardPreferenceLayout) parent;
+            GlifPreferenceLayout layout = (GlifPreferenceLayout) parent;
             return layout.onCreateRecyclerView(inflater, parent, savedInstanceState);
         }
 
@@ -251,17 +242,5 @@
             SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
             return intent;
         }
-
-        @Override
-        public void onNavigateBack() {
-            Activity activity = getActivity();
-            if (activity != null) {
-                activity.onBackPressed();
-            }
-        }
-
-        @Override
-        public void onNavigateNext() {
-        }
     }
 }
diff --git a/src/com/android/settings/SetupChooseLockPassword.java b/src/com/android/settings/SetupChooseLockPassword.java
index d483d8f..f0a9a26 100644
--- a/src/com/android/settings/SetupChooseLockPassword.java
+++ b/src/com/android/settings/SetupChooseLockPassword.java
@@ -16,21 +16,13 @@
 
 package com.android.settings;
 
-import android.app.Activity;
 import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
-import com.android.setupwizardlib.SetupWizardLayout;
-import com.android.setupwizardlib.util.SystemBarHelper;
-import com.android.setupwizardlib.view.NavigationBar;
-
 /**
  * Setup Wizard's version of ChooseLockPassword screen. It inherits the logic and basic structure
  * from ChooseLockPassword class, and should remain similar to that behaviorally. This class should
@@ -91,56 +83,11 @@
         super.onApplyThemeResource(theme, resid, first);
     }
 
-    public static class SetupChooseLockPasswordFragment extends ChooseLockPasswordFragment
-            implements NavigationBar.NavigationBarListener {
-
-        private SetupWizardLayout mLayout;
-        private NavigationBar mNavigationBar;
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-            mLayout = (SetupWizardLayout) inflater.inflate(
-                    R.layout.setup_choose_lock_password, container, false);
-            mNavigationBar = mLayout.getNavigationBar();
-            mNavigationBar.setNavigationBarListener(this);
-            return mLayout;
-        }
-
-        @Override
-        public void onViewCreated(View view, Bundle savedInstanceState) {
-            super.onViewCreated(view, savedInstanceState);
-            SystemBarHelper.setImeInsetView(mLayout);
-            SetupWizardUtils.setImmersiveMode(getActivity());
-            mLayout.setHeaderText(getActivity().getTitle());
-        }
+    public static class SetupChooseLockPasswordFragment extends ChooseLockPasswordFragment {
 
         @Override
         protected Intent getRedactionInterstitialIntent(Context context) {
             return null;
         }
-
-        @Override
-        protected void setNextEnabled(boolean enabled) {
-            mNavigationBar.getNextButton().setEnabled(enabled);
-        }
-
-        @Override
-        protected void setNextText(int text) {
-            mNavigationBar.getNextButton().setText(text);
-        }
-
-        @Override
-        public void onNavigateBack() {
-            final Activity activity = getActivity();
-            if (activity != null) {
-                activity.onBackPressed();
-            }
-        }
-
-        @Override
-        public void onNavigateNext() {
-            handleNext();
-        }
     }
 }
diff --git a/src/com/android/settings/SetupChooseLockPattern.java b/src/com/android/settings/SetupChooseLockPattern.java
index 8a7842d..09b951e 100644
--- a/src/com/android/settings/SetupChooseLockPattern.java
+++ b/src/com/android/settings/SetupChooseLockPattern.java
@@ -16,21 +16,11 @@
 
 package com.android.settings;
 
-import android.app.Activity;
 import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
-import android.os.Bundle;
 import android.os.UserHandle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.LinearLayout;
-
-import com.android.setupwizardlib.SetupWizardLayout;
-import com.android.setupwizardlib.view.NavigationBar;
 
 /**
  * Setup Wizard's version of ChooseLockPattern screen. It inherits the logic and basic structure
@@ -74,99 +64,16 @@
     }
 
     @Override
-    protected void onCreate(Bundle savedInstance) {
-        super.onCreate(savedInstance);
-        LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
-        layout.setFitsSystemWindows(false);
-    }
-
-    @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
         resid = SetupWizardUtils.getTheme(getIntent());
         super.onApplyThemeResource(theme, resid, first);
     }
 
-    public static class SetupChooseLockPatternFragment extends ChooseLockPatternFragment
-            implements NavigationBar.NavigationBarListener {
-
-        private NavigationBar mNavigationBar;
-        private Button mRetryButton;
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-            final SetupWizardLayout layout = (SetupWizardLayout) inflater.inflate(
-                    R.layout.setup_choose_lock_pattern, container, false);
-            mNavigationBar = layout.getNavigationBar();
-            mNavigationBar.setNavigationBarListener(this);
-            layout.setHeaderText(getActivity().getTitle());
-            return layout;
-        }
-
-        @Override
-        public void onViewCreated(View view, Bundle savedInstanceState) {
-            mRetryButton = (Button) view.findViewById(R.id.retryButton);
-            mRetryButton.setOnClickListener(this);
-            super.onViewCreated(view, savedInstanceState);
-            SetupWizardUtils.setImmersiveMode(getActivity());
-        }
+    public static class SetupChooseLockPatternFragment extends ChooseLockPatternFragment {
 
         @Override
         protected Intent getRedactionInterstitialIntent(Context context) {
             return null;
         }
-
-        @Override
-        public void onClick(View v) {
-            if (v == mRetryButton) {
-                handleLeftButton();
-            } else {
-                super.onClick(v);
-            }
-        }
-
-        @Override
-        protected void setRightButtonEnabled(boolean enabled) {
-            mNavigationBar.getNextButton().setEnabled(enabled);
-        }
-
-        @Override
-        protected void setRightButtonText(int text) {
-            mNavigationBar.getNextButton().setText(text);
-        }
-
-        @Override
-        protected void updateStage(Stage stage) {
-            super.updateStage(stage);
-            // Only enable the button for retry
-            mRetryButton.setEnabled(stage == Stage.FirstChoiceValid);
-
-            switch (stage) {
-                case Introduction:
-                case HelpScreen:
-                case ChoiceTooShort:
-                case FirstChoiceValid:
-                    mRetryButton.setVisibility(View.VISIBLE);
-                    break;
-                case NeedToConfirm:
-                case ConfirmWrong:
-                case ChoiceConfirmed:
-                    mRetryButton.setVisibility(View.INVISIBLE);
-                    break;
-            }
-        }
-
-        @Override
-        public void onNavigateBack() {
-            final Activity activity = getActivity();
-            if (activity != null) {
-                activity.onBackPressed();
-            }
-        }
-
-        @Override
-        public void onNavigateNext() {
-            handleRightButton();
-        }
     }
 }
diff --git a/src/com/android/settings/SetupEncryptionInterstitial.java b/src/com/android/settings/SetupEncryptionInterstitial.java
index 39c8af1..59e4d07 100644
--- a/src/com/android/settings/SetupEncryptionInterstitial.java
+++ b/src/com/android/settings/SetupEncryptionInterstitial.java
@@ -16,7 +16,6 @@
 
 package com.android.settings;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -25,13 +24,10 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 
-import com.android.setupwizardlib.SetupWizardLayout;
-import com.android.setupwizardlib.SetupWizardPreferenceLayout;
-import com.android.setupwizardlib.view.NavigationBar;
+import com.android.settings.utils.SettingsDividerItemDecoration;
+import com.android.setupwizardlib.GlifPreferenceLayout;
 
 /**
  * Setup Wizard's version of EncryptionInterstitial screen. It inherits the logic and basic
@@ -78,30 +74,19 @@
         layout.setFitsSystemWindows(false);
     }
 
-    public static class SetupEncryptionInterstitialFragment extends EncryptionInterstitialFragment
-            implements NavigationBar.NavigationBarListener {
+    public static class SetupEncryptionInterstitialFragment extends EncryptionInterstitialFragment {
 
         @Override
         public void onViewCreated(View view, Bundle savedInstanceState) {
             super.onViewCreated(view, savedInstanceState);
 
-            final SetupWizardPreferenceLayout layout = (SetupWizardPreferenceLayout) view;
+            final GlifPreferenceLayout layout = (GlifPreferenceLayout) view;
+            layout.setDividerItemDecoration(new SettingsDividerItemDecoration(getContext()));
             layout.setDividerInset(getContext().getResources().getDimensionPixelSize(
-                    R.dimen.suw_items_icon_divider_inset));
-            layout.setIllustration(R.drawable.setup_illustration_lock_screen,
-                    R.drawable.setup_illustration_horizontal_tile);
-
-            final NavigationBar navigationBar = layout.getNavigationBar();
-            navigationBar.setNavigationBarListener(this);
-            Button nextButton = navigationBar.getNextButton();
-            nextButton.setText(null);
-            nextButton.setEnabled(false);
+                    R.dimen.suw_items_glif_icon_divider_inset));
+            layout.setIcon(getContext().getDrawable(R.drawable.ic_lock));
 
             layout.setHeaderText(R.string.encryption_interstitial_header);
-            Activity activity = getActivity();
-            if (activity != null) {
-                SetupWizardUtils.setImmersiveMode(activity);
-            }
 
             // Use the dividers in SetupWizardRecyclerLayout. Suppress the dividers in
             // PreferenceFragment.
@@ -109,30 +94,10 @@
         }
 
         @Override
-        protected TextView createHeaderView() {
-            TextView message = (TextView) LayoutInflater.from(getActivity()).inflate(
-                    R.layout.setup_encryption_interstitial_header, null, false);
-            return message;
-        }
-
-        @Override
         public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent,
                                                  Bundle savedInstanceState) {
-            SetupWizardPreferenceLayout layout = (SetupWizardPreferenceLayout) parent;
+            GlifPreferenceLayout layout = (GlifPreferenceLayout) parent;
             return layout.onCreateRecyclerView(inflater, parent, savedInstanceState);
         }
-
-        @Override
-        public void onNavigateBack() {
-            final Activity activity = getActivity();
-            if (activity != null) {
-                activity.onBackPressed();
-            }
-        }
-
-        @Override
-        public void onNavigateNext() {
-            // next is handled via the onPreferenceTreeClick method in EncryptionInterstitial
-        }
     }
 }
diff --git a/src/com/android/settings/SetupRedactionInterstitial.java b/src/com/android/settings/SetupRedactionInterstitial.java
index e487a50..d527585 100644
--- a/src/com/android/settings/SetupRedactionInterstitial.java
+++ b/src/com/android/settings/SetupRedactionInterstitial.java
@@ -16,20 +16,13 @@
 
 package com.android.settings;
 
-import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.os.UserHandle;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
+import android.widget.Button;
 
 import com.android.settings.notification.RedactionInterstitial;
-import com.android.setupwizardlib.SetupWizardLayout;
-import com.android.setupwizardlib.view.NavigationBar;
 
 /**
  * Setup Wizard's version of RedactionInterstitial screen. It inherits the logic and basic structure
@@ -59,49 +52,8 @@
         super.onApplyThemeResource(theme, resid, first);
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstance) {
-        super.onCreate(savedInstance);
-        LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
-        layout.setFitsSystemWindows(false);
-    }
+    public static class SetupRedactionInterstitialFragment extends RedactionInterstitialFragment {
 
-    public static class SetupRedactionInterstitialFragment extends RedactionInterstitialFragment
-            implements NavigationBar.NavigationBarListener {
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-            return inflater.inflate(R.layout.setup_redaction_interstitial, container, false);
-        }
-
-        @Override
-        public void onViewCreated(View view, Bundle savedInstanceState) {
-            super.onViewCreated(view, savedInstanceState);
-            final SetupWizardLayout layout =
-                    (SetupWizardLayout) view.findViewById(R.id.setup_wizard_layout);
-
-            final NavigationBar navigationBar = layout.getNavigationBar();
-            navigationBar.setNavigationBarListener(this);
-            navigationBar.getBackButton().setVisibility(View.GONE);
-            SetupWizardUtils.setImmersiveMode(getActivity());
-        }
-
-        @Override
-        public void onNavigateBack() {
-            final Activity activity = getActivity();
-            if (activity != null) {
-                activity.onBackPressed();
-            }
-        }
-
-        @Override
-        public void onNavigateNext() {
-            final SetupRedactionInterstitial activity = (SetupRedactionInterstitial) getActivity();
-            if (activity != null) {
-                activity.setResult(RESULT_OK, activity.getResultIntentData());
-                finish();
-            }
-        }
+        // Setup wizard specific UI customizations can be done here
     }
 }
diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java
index 71501b1..5563c3b 100644
--- a/src/com/android/settings/SetupWizardUtils.java
+++ b/src/com/android/settings/SetupWizardUtils.java
@@ -24,14 +24,6 @@
 import com.android.setupwizardlib.util.WizardManagerHelper;
 
 public class SetupWizardUtils {
-    private static final String TAG = "SetupWizardUtils";
-
-    // From WizardManager (must match constants maintained there)
-    public static final String EXTRA_SCRIPT_URI = "scriptUri";
-
-    public static boolean isUsingWizardManager(Activity activity) {
-        return activity.getIntent().hasExtra(EXTRA_SCRIPT_URI);
-    }
 
     public static int getTheme(Intent intent) {
         if (WizardManagerHelper.isLightTheme(intent, true)) {
diff --git a/src/com/android/settings/SummaryPreference.java b/src/com/android/settings/SummaryPreference.java
index 0943a2b..38449b1 100644
--- a/src/com/android/settings/SummaryPreference.java
+++ b/src/com/android/settings/SummaryPreference.java
@@ -33,6 +33,7 @@
     private String mUnits;
 
     private int mLeft, mMiddle, mRight;
+    private boolean mColorsSet = false;
     private float mLeftRatio, mMiddleRatio, mRightRatio;
     private String mStartLabel;
     private String mEndLabel;
@@ -40,8 +41,6 @@
     public SummaryPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
         setLayoutResource(R.layout.settings_summary_preference);
-        mLeft = context.getColor(R.color.summary_default_start);
-        mRight = context.getColor(R.color.summary_default_end);
     }
 
     public void setAmount(String amount) {
@@ -77,6 +76,7 @@
         mLeft = left;
         mMiddle = middle;
         mRight = right;
+        mColorsSet = true;
         notifyChanged();
     }
 
@@ -86,7 +86,9 @@
 
         LinearColorBar colorBar = (LinearColorBar) holder.itemView.findViewById(R.id.color_bar);
         colorBar.setRatios(mLeftRatio, mMiddleRatio, mRightRatio);
-        colorBar.setColors(mLeft, mMiddle, mRight);
+        if (mColorsSet) {
+            colorBar.setColors(mLeft, mMiddle, mRight);
+        }
 
         if (!TextUtils.isEmpty(mStartLabel) || !TextUtils.isEmpty(mEndLabel)) {
             holder.findViewById(R.id.label_bar).setVisibility(View.VISIBLE);
diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java
index 19d34ef..bdeab92 100644
--- a/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/UserDictionarySettings.java
@@ -160,7 +160,7 @@
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         MenuItem actionItem =
                 menu.add(0, OPTIONS_MENU_ADD, 0, R.string.user_dict_settings_add_menu_title)
-                .setIcon(R.drawable.ic_menu_add_dark);
+                .setIcon(R.drawable.ic_menu_add_white);
         actionItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
                 MenuItem.SHOW_AS_ACTION_WITH_TEXT);
     }
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index d309867..90dd9e0 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -761,9 +761,13 @@
      * devices allow users to flash other OSes to them.
      */
     static void setOemUnlockEnabled(Context context, boolean enabled) {
-        PersistentDataBlockManager manager =(PersistentDataBlockManager)
-                context.getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
-        manager.setOemUnlockEnabled(enabled);
+        try {
+            PersistentDataBlockManager manager = (PersistentDataBlockManager)
+                    context.getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
+            manager.setOemUnlockEnabled(enabled);
+        } catch (SecurityException e) {
+            Log.e(TAG, "Fail to set oem unlock.", e);
+        }
     }
 
     /**
diff --git a/src/com/android/settings/WallpaperSuggestionActivity.java b/src/com/android/settings/WallpaperSuggestionActivity.java
new file mode 100644
index 0000000..d264e4a
--- /dev/null
+++ b/src/com/android/settings/WallpaperSuggestionActivity.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+public class WallpaperSuggestionActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Intent intent = new Intent()
+                .setClassName(getString(R.string.config_wallpaper_picker_package),
+                        getString(R.string.config_wallpaper_picker_class))
+                .addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
+        startActivity(intent);
+        finish();
+    }
+}
diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java
index 3602295..7484b84 100644
--- a/src/com/android/settings/WifiCallingSettings.java
+++ b/src/com/android/settings/WifiCallingSettings.java
@@ -19,6 +19,7 @@
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -26,10 +27,12 @@
 import android.os.PersistableBundle;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
+import android.support.v7.preference.Preference.OnPreferenceClickListener;
 import android.support.v7.preference.PreferenceScreen;
 import android.telephony.CarrierConfigManager;
 import android.telephony.PhoneStateListener;
 import android.telephony.TelephonyManager;
+import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Switch;
 import android.widget.TextView;
@@ -53,11 +56,20 @@
 
     //String keys for preference lookup
     private static final String BUTTON_WFC_MODE = "wifi_calling_mode";
+    private static final String PREFERENCE_EMERGENCY_ADDRESS = "emergency_address_key";
+
+    private static final int REQUEST_CHECK_WFC_EMERGENCY_ADDRESS = 1;
+
+    public static final String EXTRA_LAUNCH_CARRIER_APP = "EXTRA_LAUNCH_CARRIER_APP";
+
+    public static final int LAUCH_APP_ACTIVATE = 0;
+    public static final int LAUCH_APP_UPDATE = 1;
 
     //UI objects
     private SwitchBar mSwitchBar;
     private Switch mSwitch;
     private ListPreference mButtonWfcMode;
+    private Preference mUpdateAddress;
     private TextView mEmptyView;
 
     private boolean mValidListener = false;
@@ -84,12 +96,41 @@
 
             Preference pref = getPreferenceScreen().findPreference(BUTTON_WFC_MODE);
             if (pref != null) {
-                pref.setEnabled(isWfcEnabled
+                pref.setEnabled(isWfcEnabled && getEditableWfcMode(activity)
                         && (state == TelephonyManager.CALL_STATE_IDLE));
             }
         }
     };
 
+    private static boolean getEditableWfcMode(Context context) {
+        CarrierConfigManager configManager = (CarrierConfigManager)
+                context.getSystemService(Context.CARRIER_CONFIG_SERVICE);
+        if (configManager != null) {
+            PersistableBundle b = configManager.getConfig();
+            if (b != null) {
+                return b.getBoolean(CarrierConfigManager.KEY_EDITABLE_WFC_MODE_BOOL);
+            }
+        }
+        return true;
+    }
+
+    private final OnPreferenceClickListener mUpdateAddressListener =
+            new OnPreferenceClickListener() {
+                /*
+                 * Launch carrier emergency address managemnent activity
+                 */
+                @Override
+                public boolean onPreferenceClick(Preference preference) {
+                    final Context context = getActivity();
+                    Intent carrierAppIntent = getCarrierActivityIntent(context);
+                    if (carrierAppIntent != null) {
+                        carrierAppIntent.putExtra(EXTRA_LAUNCH_CARRIER_APP, LAUCH_APP_UPDATE);
+                        startActivity(carrierAppIntent);
+                    }
+                    return true;
+                }
+    };
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
@@ -163,6 +204,9 @@
         mButtonWfcMode = (ListPreference) findPreference(BUTTON_WFC_MODE);
         mButtonWfcMode.setOnPreferenceChangeListener(this);
 
+        mUpdateAddress = (Preference) findPreference(PREFERENCE_EMERGENCY_ADDRESS);
+        mUpdateAddress.setOnPreferenceClickListener(mUpdateAddressListener);
+
         mIntentFilter = new IntentFilter();
         mIntentFilter.addAction(ImsManager.ACTION_IMS_REGISTRATION_ERROR);
 
@@ -239,29 +283,96 @@
     @Override
     public void onSwitchChanged(Switch switchView, boolean isChecked) {
         final Context context = getActivity();
+        Log.d(TAG, "onSwitchChanged(" + isChecked + ")");
 
-        ImsManager.setWfcSetting(context, isChecked);
+        if (!isChecked) {
+            updateWfcMode(context, false);
+            return;
+        }
+
+        // Call address management activity before turning on WFC
+        Intent carrierAppIntent = getCarrierActivityIntent(context);
+        if (carrierAppIntent != null) {
+            carrierAppIntent.putExtra(EXTRA_LAUNCH_CARRIER_APP, LAUCH_APP_ACTIVATE);
+            startActivityForResult(carrierAppIntent, REQUEST_CHECK_WFC_EMERGENCY_ADDRESS);
+        } else {
+            updateWfcMode(context, true);
+        }
+    }
+
+    /*
+     * Get the Intent to launch carrier emergency address management activity.
+     * Return null when no activity found.
+     */
+    private static Intent getCarrierActivityIntent(Context context) {
+        // Retrive component name from carrirt config
+        CarrierConfigManager configManager = context.getSystemService(CarrierConfigManager.class);
+        if (configManager == null) return null;
+
+        PersistableBundle bundle = configManager.getConfig();
+        if (bundle == null) return null;
+
+        String carrierApp = bundle.getString(
+                CarrierConfigManager.KEY_WFC_EMERGENCY_ADDRESS_CARRIER_APP_STRING);
+        if (TextUtils.isEmpty(carrierApp)) return null;
+
+        ComponentName componentName = ComponentName.unflattenFromString(carrierApp);
+        if (componentName == null) return null;
+
+        // Build and return intent
+        Intent intent = new Intent();
+        intent.setComponent(componentName);
+        return intent;
+    }
+
+    /*
+     * Turn on/off WFC mode with ImsManager and update UI accordingly
+     */
+    private void updateWfcMode(Context context, boolean wfcEnabled) {
+        Log.i(TAG, "updateWfcMode(" + wfcEnabled + ")");
+        ImsManager.setWfcSetting(context, wfcEnabled);
 
         int wfcMode = ImsManager.getWfcMode(context);
-        updateButtonWfcMode(context, isChecked, wfcMode);
-        if (isChecked) {
+        updateButtonWfcMode(context, wfcEnabled, wfcMode);
+        if (wfcEnabled) {
             MetricsLogger.action(getActivity(), getMetricsCategory(), wfcMode);
         } else {
             MetricsLogger.action(getActivity(), getMetricsCategory(), -1);
         }
     }
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        final Context context = getActivity();
+
+        if (requestCode == REQUEST_CHECK_WFC_EMERGENCY_ADDRESS) {
+            Log.d(TAG, "WFC emergency address activity result = " + resultCode);
+
+            if (resultCode == Activity.RESULT_OK) {
+                updateWfcMode(context, true);
+            }
+        }
+    }
+
     private void updateButtonWfcMode(Context context, boolean wfcEnabled, int wfcMode) {
         mButtonWfcMode.setSummary(getWfcModeSummary(context, wfcMode));
-        mButtonWfcMode.setEnabled(wfcEnabled);
+        mButtonWfcMode.setEnabled(wfcEnabled && mEditableWfcMode);
 
         final PreferenceScreen preferenceScreen = getPreferenceScreen();
+        boolean updateAddressEnabled = (getCarrierActivityIntent(context) != null);
         if (wfcEnabled) {
             preferenceScreen.addPreference(mButtonWfcMode);
+            if (updateAddressEnabled) {
+                preferenceScreen.addPreference(mUpdateAddress);
+            } else {
+                preferenceScreen.removePreference(mUpdateAddress);
+            }
         } else {
             preferenceScreen.removePreference(mButtonWfcMode);
+            preferenceScreen.removePreference(mUpdateAddress);
         }
-        preferenceScreen.setEnabled(mEditableWfcMode);
     }
 
     @Override
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 5b1d644..7e3b8d8 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -57,6 +57,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 public class WirelessSettings extends SettingsPreferenceFragment implements Indexable {
@@ -72,6 +73,7 @@
     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_WFC_SETTINGS = "wifi_calling_settings";
+    private static final String KEY_NETWORK_RESET = "network_reset";
 
     public static final String EXIT_ECM_RESULT = "exit_ecm_result";
     public static final int REQUEST_CODE_EXIT_ECM = 1;
@@ -336,6 +338,12 @@
             p.setEnabled(!TetherSettings
                     .isProvisioningNeededButUnavailable(getActivity()));
         }
+
+        // Remove network reset if not allowed
+        if (RestrictedLockUtils.hasBaseUserRestriction(activity,
+                UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {
+            removePreference(KEY_NETWORK_RESET);
+        }
     }
 
     @Override
@@ -349,7 +357,8 @@
 
         // update WFC setting
         final Context context = getActivity();
-        if (ImsManager.isWfcEnabledByPlatform(context)) {
+        if (ImsManager.isWfcEnabledByPlatform(context) &&
+                ImsManager.isWfcProvisionedOnDevice(context)) {
             getPreferenceScreen().addPreference(mButtonWfc);
 
             mButtonWfc.setSummary(WifiCallingSettings.getWfcModeSummary(
@@ -402,6 +411,10 @@
             @Override
             public List<SearchIndexableResource> getXmlResourcesToIndex(
                     Context context, boolean enabled) {
+                // Remove wireless settings from search in demo mode
+                if (UserManager.isDeviceInDemoMode(context)) {
+                    return Collections.emptyList();
+                }
                 SearchIndexableResource sir = new SearchIndexableResource(context);
                 sir.xmlResId = R.xml.wireless_settings;
                 return Arrays.asList(sir);
@@ -466,10 +479,16 @@
                     result.add(KEY_TETHER_SETTINGS);
                 }
 
-                if (!ImsManager.isWfcEnabledByPlatform(context)) {
+                if (!ImsManager.isWfcEnabledByPlatform(context) ||
+                        !ImsManager.isWfcProvisionedOnDevice(context)) {
                     result.add(KEY_WFC_SETTINGS);
                 }
 
+                if (RestrictedLockUtils.hasBaseUserRestriction(context,
+                        UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {
+                    result.add(KEY_NETWORK_RESET);
+                }
+
                 return result;
             }
         };
diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
index edc0282..0ccf6d8 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
@@ -42,46 +42,11 @@
 
     @Override
     protected void onCreate(Bundle savedState) {
-        // Main content frame id should be set before calling super as that is where the first
-        // Fragment is inflated.
-        setMainContentId(R.id.suw_main_content);
         super.onCreate(savedState);
 
         // Finish configuring the content view.
-        FrameLayout parentLayout = (FrameLayout) findViewById(R.id.main_content);
-        LayoutInflater.from(this)
-                .inflate(R.layout.accessibility_settings_for_suw, parentLayout);
-
         getActionBar().setDisplayHomeAsUpEnabled(true);
         setIsDrawerPresent(false);
-
-        // Hide System Nav Bar.
-        SystemBarHelper.hideSystemBars(getWindow());
-        LinearLayout parentView = (LinearLayout) findViewById(R.id.content_parent);
-        parentView.setFitsSystemWindows(false);
-        // Adjust for the Status Bar.
-        parentView.setOnApplyWindowInsetsListener(new View.OnApplyWindowInsetsListener() {
-                @Override
-                public WindowInsets onApplyWindowInsets(View v, WindowInsets insets) {
-                    parentView.setPadding(0, insets.getSystemWindowInsetTop(), 0, 0);
-                    return insets;
-                }
-            });
-
-        // Show SUW Nav Bar.
-        NavigationBar navigationBar = (NavigationBar) findViewById(R.id.suw_navigation_bar);
-        navigationBar.getNextButton().setVisibility(View.GONE);
-        navigationBar.setNavigationBarListener(new NavigationBar.NavigationBarListener() {
-            @Override
-            public void onNavigateBack() {
-                onNavigateUp();
-            }
-
-            @Override
-            public void onNavigateNext() {
-                // Do nothing. We don't show this button.
-            }
-        });
     }
 
     @Override
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index 4e2ebce..e37de68 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -34,6 +34,9 @@
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.accessibility.AccessibilityManager;
@@ -80,6 +83,21 @@
     }
 
     @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater infalter) {
+        // Do not call super. We don't want to see the "Help & feedback" option on this page so as
+        // not to confuse users who think they might be able to send feedback about a specific
+        // accessibility service from this page.
+
+        // We still want to show the "Settings" menu.
+        if (mSettingsTitle != null && mSettingsIntent != null) {
+            MenuItem menuItem = menu.add(mSettingsTitle);
+            menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+            menuItem.setIntent(mSettingsIntent);
+        }
+
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mLockPatternUtils = new LockPatternUtils(getActivity());
diff --git a/src/com/android/settings/accounts/AccountSettings.java b/src/com/android/settings/accounts/AccountSettings.java
index 22c9de7..eb74034 100644
--- a/src/com/android/settings/accounts/AccountSettings.java
+++ b/src/com/android/settings/accounts/AccountSettings.java
@@ -350,7 +350,7 @@
     private Preference newManagedProfileSettings() {
         Preference preference = new Preference(getPrefContext());
         preference.setTitle(R.string.managed_profile_settings_title);
-        preference.setIcon(R.drawable.ic_sysbar_quicksettings);
+        preference.setIcon(R.drawable.ic_settings);
         preference.setOnPreferenceClickListener(this);
         preference.setOrder(ORDER_NEXT_TO_LAST);
         return preference;
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 0964abe..d374f6b 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -102,7 +102,6 @@
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 
@@ -231,6 +230,11 @@
             enabled = false;
         }
 
+        // Don't allow uninstalling the device provisioning package.
+        if (isDeviceProvisioningPackage(mAppEntry.info.packageName)) {
+            enabled = false;
+        }
+
         // If the uninstall intent is already queued, disable the uninstall button
         if (mDpm.isUninstallInQueue(mPackageName)) {
             enabled = false;
@@ -298,6 +302,16 @@
         return false;
     }
 
+    /**
+     * Returns {@code true} if the supplied package is the device provisioning app. Otherwise,
+     * returns {@code false}.
+     */
+    private boolean isDeviceProvisioningPackage(String packageName) {
+        String deviceProvisioningPackage = getResources().getString(
+                com.android.internal.R.string.config_deviceProvisioningPackage);
+        return deviceProvisioningPackage != null && deviceProvisioningPackage.equals(packageName);
+    }
+
     /** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle icicle) {
diff --git a/src/com/android/settings/applications/LinearColorBar.java b/src/com/android/settings/applications/LinearColorBar.java
index 158a625..b637671 100644
--- a/src/com/android/settings/applications/LinearColorBar.java
+++ b/src/com/android/settings/applications/LinearColorBar.java
@@ -14,10 +14,10 @@
 import android.util.DisplayMetrics;
 import android.view.MotionEvent;
 import android.widget.LinearLayout;
+import com.android.settings.Utils;
 
 public class LinearColorBar extends LinearLayout {
-    static final int LEFT_COLOR = 0xff009688;
-    static final int MIDDLE_COLOR = 0xff009688;
+
     static final int RIGHT_COLOR = 0xffced7db;
     static final int GRAY_COLOR = 0xff555555;
     static final int WHITE_COLOR = 0xffffffff;
@@ -26,8 +26,8 @@
     private float mYellowRatio;
     private float mGreenRatio;
 
-    private int mLeftColor = LEFT_COLOR;
-    private int mMiddleColor = MIDDLE_COLOR;
+    private int mLeftColor;
+    private int mMiddleColor;
     private int mRightColor = RIGHT_COLOR;
 
     private boolean mShowIndicator = true;
@@ -70,7 +70,7 @@
                 ? 2 : 1;
         mEdgeGradientPaint.setStrokeWidth(mLineWidth);
         mEdgeGradientPaint.setAntiAlias(true);
-        
+        mLeftColor = mMiddleColor = Utils.getColorAccent(context);
     }
 
     public void setOnRegionTappedListener(OnRegionTappedListener listener) {
diff --git a/src/com/android/settings/applications/ProcessStatsSummary.java b/src/com/android/settings/applications/ProcessStatsSummary.java
index 30701dc..01dbf09 100644
--- a/src/com/android/settings/applications/ProcessStatsSummary.java
+++ b/src/com/android/settings/applications/ProcessStatsSummary.java
@@ -53,10 +53,6 @@
 
         addPreferencesFromResource(R.xml.process_stats_summary);
         mSummaryPref = (SummaryPreference) findPreference(KEY_STATUS_HEADER);
-        int memColor = getContext().getColor(R.color.running_processes_apps_ram);
-        mSummaryPref.setColors(memColor, memColor,
-                getContext().getColor(R.color.running_processes_free_ram));
-
         mPerformance = findPreference(KEY_PERFORMANCE);
         mTotalMemory = findPreference(KEY_TOTAL_MEMORY);
         mAverageUsed = findPreference(KEY_AVERAGY_USED);
diff --git a/src/com/android/settings/applications/RunningProcessesView.java b/src/com/android/settings/applications/RunningProcessesView.java
index af60996..7ba83c2 100644
--- a/src/com/android/settings/applications/RunningProcessesView.java
+++ b/src/com/android/settings/applications/RunningProcessesView.java
@@ -42,6 +42,7 @@
 import com.android.internal.util.MemInfoReader;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
+import com.android.settings.Utils;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -450,7 +451,7 @@
         mColorBar = (LinearColorBar)mHeader.findViewById(R.id.color_bar);
         final Context context = getContext();
         mColorBar.setColors(context.getColor(R.color.running_processes_system_ram),
-                context.getColor(R.color.running_processes_apps_ram),
+                Utils.getColorAccent(context),
                 context.getColor(R.color.running_processes_free_ram));
         mBackgroundProcessPrefix = (TextView)mHeader.findViewById(R.id.freeSizePrefix);
         mAppsProcessPrefix = (TextView)mHeader.findViewById(R.id.appsSizePrefix);
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
index 48ca5a9..ded7e58 100755
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
@@ -387,6 +387,7 @@
     }
 
     private void onPair(String value) {
+        Log.i(TAG, "Pairing dialog accepted");
         switch (mType) {
             case BluetoothDevice.PAIRING_VARIANT_PIN:
             case BluetoothDevice.PAIRING_VARIANT_PIN_16_DIGITS:
@@ -422,6 +423,7 @@
     }
 
     private void onCancel() {
+        Log.i(TAG, "Pairing dialog canceled");
         mDevice.cancelPairingUserInput();
     }
 
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index c54311a..7c76794 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -163,10 +163,7 @@
         countItem(null, R.layout.suggestion_header, hasSuggestions, NS_SPACER);
         resetCount();
         if (mSuggestions != null) {
-            int maxSuggestions = mSuggestionMode == SUGGESTION_MODE_DEFAULT
-                    ? Math.min(DEFAULT_SUGGESTION_COUNT, mSuggestions.size())
-                    : mSuggestionMode == SUGGESTION_MODE_EXPANDED ? mSuggestions.size()
-                    : 0;
+            int maxSuggestions = getDisplayableSuggestionCount();
             for (int i = 0; i < mSuggestions.size(); i++) {
                 countItem(mSuggestions.get(i), R.layout.suggestion_tile, i < maxSuggestions,
                         NS_SUGGESTION);
@@ -208,6 +205,14 @@
         mId++;
     }
 
+    private int getDisplayableSuggestionCount() {
+        final int suggestionSize = mSuggestions.size();
+        return mSuggestionMode == SUGGESTION_MODE_DEFAULT
+                ? Math.min(DEFAULT_SUGGESTION_COUNT, suggestionSize)
+                : mSuggestionMode == SUGGESTION_MODE_EXPANDED
+                        ? suggestionSize : 0;
+    }
+
     @Override
     public DashboardItemHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         return new DashboardItemHolder(LayoutInflater.from(parent.getContext()).inflate(
@@ -299,6 +304,14 @@
         holder.icon.setImageResource(hasMoreSuggestions() ? R.drawable.ic_expand_more
                 : R.drawable.ic_expand_less);
         holder.title.setText(mContext.getString(R.string.suggestions_title, mSuggestions.size()));
+        final int undisplayedSuggestionCount =
+                mSuggestions.size() - getDisplayableSuggestionCount();
+        if (undisplayedSuggestionCount == 0) {
+            holder.summary.setText(null);
+        } else {
+            holder.summary.setText(
+                    mContext.getString(R.string.suggestions_summary, undisplayedSuggestionCount));
+        }
         holder.itemView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/src/com/android/settings/dashboard/DashboardContainerFragment.java b/src/com/android/settings/dashboard/DashboardContainerFragment.java
new file mode 100644
index 0000000..b33063d
--- /dev/null
+++ b/src/com/android/settings/dashboard/DashboardContainerFragment.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.dashboard;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.content.Context;
+import android.os.Bundle;
+import android.support.v13.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.MetricsProto;
+import com.android.settings.InstrumentedFragment;
+import com.android.settings.R;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.overlay.SupportFeatureProvider;
+import com.android.settings.widget.SlidingTabLayout;
+import com.android.settingslib.drawer.SettingsDrawerActivity;
+
+/**
+ * Container for Dashboard fragments.
+ */
+public final class DashboardContainerFragment extends InstrumentedFragment {
+
+    private static final int INDEX_SUMMARY_FRAGMENT = 0;
+    private static final int INDEX_SUPPORT_FRAGMENT = 1;
+
+    private ViewPager mViewPager;
+    private View mHeaderView;
+    private DashboardViewPagerAdapter mPagerAdapter;
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DASHBOARD_CONTAINER;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) {
+        final View content = inflater.inflate(R.layout.dashboard_container, parent, false);
+        final Context context = getContext();
+        mViewPager = (ViewPager) content.findViewById(R.id.pager);
+        mPagerAdapter = new DashboardViewPagerAdapter(context, getChildFragmentManager());
+        mViewPager.setAdapter(mPagerAdapter);
+        mViewPager.addOnPageChangeListener(new TabInstrumentationListener(context));
+        mHeaderView = inflater.inflate(R.layout.dashboard_container_header, parent, false);
+        ((SlidingTabLayout) mHeaderView).setViewPager(mViewPager);
+        return content;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (mPagerAdapter.getCount() > 1) {
+            final Activity activity = getActivity();
+            if (activity instanceof SettingsDrawerActivity) {
+                ((SettingsDrawerActivity) getActivity()).setContentHeaderView(mHeaderView);
+            }
+        }
+    }
+
+    private static final class DashboardViewPagerAdapter extends FragmentPagerAdapter {
+
+        private final Context mContext;
+        private final SupportFeatureProvider mSupportFeatureProvider;
+
+        public DashboardViewPagerAdapter(Context context, FragmentManager fragmentManager) {
+            super(fragmentManager);
+            mContext = context;
+            mSupportFeatureProvider =
+                    FeatureFactory.getFactory(context).getSupportFeatureProvider(context);
+        }
+
+        @Override
+        public CharSequence getPageTitle(int position) {
+            switch (position) {
+                case INDEX_SUMMARY_FRAGMENT:
+                    return mContext.getString(R.string.page_tab_title_summary);
+                case INDEX_SUPPORT_FRAGMENT:
+                    return mContext.getString(R.string.page_tab_title_support);
+            }
+            return super.getPageTitle(position);
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            switch (position) {
+                case INDEX_SUMMARY_FRAGMENT:
+                    return new DashboardSummary();
+                case INDEX_SUPPORT_FRAGMENT:
+                    return new SupportFragment();
+                default:
+                    throw new IllegalArgumentException(
+                            String.format(
+                                    "Position %d does not map to a valid dashboard fragment",
+                                    position));
+            }
+        }
+
+        @Override
+        public int getCount() {
+            return mSupportFeatureProvider == null ? 1 : 2;
+        }
+    }
+
+    private static final class TabInstrumentationListener
+            implements ViewPager.OnPageChangeListener {
+
+        private final Context mContext;
+
+        public TabInstrumentationListener(Context context) {
+            mContext = context;
+        }
+
+        @Override
+        public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+            // Do nothing.
+        }
+
+        @Override
+        public void onPageScrollStateChanged(int state) {
+            // Do nothing
+        }
+
+        @Override
+        public void onPageSelected(int position) {
+            switch (position) {
+                case INDEX_SUMMARY_FRAGMENT:
+                    MetricsLogger.action(mContext, MetricsProto.MetricsEvent.ACTION_SELECT_SUMMARY);
+                    break;
+                case INDEX_SUPPORT_FRAGMENT:
+                    MetricsLogger.action(
+                            mContext, MetricsProto.MetricsEvent.ACTION_SELECT_SUPPORT_FRAGMENT);
+                    break;
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index a53f41b..e04b255 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -22,10 +22,9 @@
 import android.support.v7.widget.LinearLayoutManager;
 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 com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.InstrumentedFragment;
@@ -85,7 +84,6 @@
         List<DashboardCategory> categories =
                 ((SettingsActivity) getActivity()).getDashboardCategories();
         mSummaryLoader = new SummaryLoader(getActivity(), categories);
-        setHasOptionsMenu(true);
         Context context = getContext();
         mConditionManager = ConditionManager.get(context, false);
         mSuggestionParser = new SuggestionParser(context,
@@ -102,14 +100,6 @@
     }
 
     @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        super.onCreateOptionsMenu(menu, inflater);
-        if (getActivity() == null) return;
-        HelpUtils.prepareHelpMenuItem(getActivity(), menu, R.string.help_uri_dashboard,
-                getClass().getName());
-    }
-
-    @Override
     public void onStart() {
         long startTime = System.currentTimeMillis();
         super.onStart();
diff --git a/src/com/android/settings/dashboard/SuggestionsChecks.java b/src/com/android/settings/dashboard/SuggestionsChecks.java
index 0ce82ad..5f140ba 100644
--- a/src/com/android/settings/dashboard/SuggestionsChecks.java
+++ b/src/com/android/settings/dashboard/SuggestionsChecks.java
@@ -32,9 +32,9 @@
 import com.android.settings.Settings.FingerprintEnrollSuggestionActivity;
 import com.android.settings.Settings.FingerprintSuggestionActivity;
 import com.android.settings.Settings.ScreenLockSuggestionActivity;
-import com.android.settings.Settings.WallpaperSuggestionActivity;
 import com.android.settings.Settings.WifiCallingSuggestionActivity;
 import com.android.settings.Settings.ZenModeAutomationSuggestionActivity;
+import com.android.settings.WallpaperSuggestionActivity;
 import com.android.settingslib.drawer.Tile;
 
 import java.util.Collection;
@@ -78,7 +78,8 @@
     }
 
     public boolean isWifiCallingUnavailableOrEnabled() {
-        if (!ImsManager.isWfcEnabledByPlatform(mContext)) {
+        if (!ImsManager.isWfcEnabledByPlatform(mContext) ||
+                !ImsManager.isWfcProvisionedOnDevice(mContext)) {
             return true;
         }
         return ImsManager.isWfcEnabledByUser(mContext)
diff --git a/src/com/android/settings/dashboard/SupportFragment.java b/src/com/android/settings/dashboard/SupportFragment.java
new file mode 100644
index 0000000..58f79a8
--- /dev/null
+++ b/src/com/android/settings/dashboard/SupportFragment.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.dashboard;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.OnAccountsUpdateListener;
+import android.app.Activity;
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
+import android.net.NetworkInfo;
+import android.net.NetworkRequest;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.android.internal.logging.MetricsProto;
+import com.android.settings.InstrumentedFragment;
+import com.android.settings.R;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.overlay.SupportFeatureProvider;
+
+/**
+ * Fragment for support tab in SettingsGoogle.
+ */
+public final class SupportFragment extends InstrumentedFragment implements View.OnClickListener,
+        OnAccountsUpdateListener {
+
+    private final Handler mHandler = new Handler(Looper.getMainLooper());
+    private final ConnectivityManager.NetworkCallback mNetworkCallback =
+            new ConnectivityManager.NetworkCallback() {
+
+                @Override
+                public void onCapabilitiesChanged(Network network,
+                        NetworkCapabilities capabilities) {
+                    postConnectivityChanged();
+                }
+
+                @Override
+                public void onAvailable(Network network) {
+                    postConnectivityChanged();
+                }
+
+                @Override
+                public void onLost(Network network) {
+                    postConnectivityChanged();
+                }
+            };
+
+    private Activity mActivity;
+    private View mContent;
+    private RecyclerView mRecyclerView;
+    private SupportItemAdapter mSupportItemAdapter;
+    private AccountManager mAccountManager;
+    private SupportFeatureProvider mSupportFeatureProvider;
+    private ConnectivityManager mConnectivityManager;
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.SUPPORT_FRAGMENT;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mActivity = getActivity();
+        mAccountManager = AccountManager.get(mActivity);
+        mSupportFeatureProvider =
+                FeatureFactory.getFactory(mActivity).getSupportFeatureProvider(mActivity);
+        mSupportItemAdapter = new SupportItemAdapter(mActivity, savedInstanceState,
+                mSupportFeatureProvider, this /* itemClickListener */);
+        mConnectivityManager =
+                (ConnectivityManager) mActivity.getSystemService(Context.CONNECTIVITY_SERVICE);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        mContent = inflater.inflate(R.layout.support_fragment, container, false);
+        mRecyclerView = (RecyclerView) mContent.findViewById(R.id.support_items);
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(
+                getActivity(), LinearLayoutManager.VERTICAL, false /* reverseLayout */));
+        mRecyclerView.setAdapter(mSupportItemAdapter);
+        return mContent;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        // Monitor account change.
+        mAccountManager.addOnAccountsUpdatedListener(
+                this /* listener */, null /* handler */, true /* updateImmediately */);
+        // Monitor connectivity
+        mConnectivityManager.registerNetworkCallback(
+                new NetworkRequest.Builder()
+                        .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+                        .build(),
+                mNetworkCallback);
+        mSupportItemAdapter.setHasInternet(hasInternet());
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        // Stop monitor account change.
+        mAccountManager.removeOnAccountsUpdatedListener(this /* listener */);
+        // Stop monitor connectivity.
+        mConnectivityManager.unregisterNetworkCallback(mNetworkCallback);
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        mSupportItemAdapter.onSaveInstanceState(outState);
+    }
+
+    @Override
+    public void onAccountsUpdated(Account[] accounts) {
+        // Account changed, update support items.
+        mSupportItemAdapter.setAccount(
+                mSupportFeatureProvider.getSupportEligibleAccount(mActivity));
+    }
+
+    @Override
+    public void onClick(View v) {
+        final SupportItemAdapter.ViewHolder vh =
+                (SupportItemAdapter.ViewHolder) mRecyclerView.getChildViewHolder(v);
+        mSupportItemAdapter.onItemClicked(vh.getAdapterPosition());
+    }
+
+    private void postConnectivityChanged() {
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                if (mSupportItemAdapter != null) {
+                    mSupportItemAdapter.setHasInternet(hasInternet());
+                }
+            }
+        });
+    }
+
+    private boolean hasInternet() {
+        final NetworkInfo activeNetwork = mConnectivityManager.getActiveNetworkInfo();
+        return activeNetwork != null && activeNetwork.isConnectedOrConnecting();
+    }
+}
diff --git a/src/com/android/settings/dashboard/SupportItemAdapter.java b/src/com/android/settings/dashboard/SupportItemAdapter.java
new file mode 100644
index 0000000..678226a
--- /dev/null
+++ b/src/com/android/settings/dashboard/SupportItemAdapter.java
@@ -0,0 +1,668 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.dashboard;
+
+import android.accounts.Account;
+import android.annotation.DrawableRes;
+import android.annotation.LayoutRes;
+import android.annotation.StringRes;
+import android.app.Activity;
+import android.app.DialogFragment;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.overlay.SupportFeatureProvider;
+import com.android.settings.support.SupportDisclaimerDialogFragment;
+import com.android.settings.support.SupportPhone;
+import com.android.settings.support.SupportPhoneDialogFragment;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import static com.android.settings.overlay.SupportFeatureProvider.SupportType.CHAT;
+import static com.android.settings.overlay.SupportFeatureProvider.SupportType.PHONE;
+
+/**
+ * Item adapter for support tiles.
+ */
+public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAdapter.ViewHolder> {
+
+    private static final String STATE_SELECTED_COUNTRY = "STATE_SELECTED_COUNTRY";
+    private static final int TYPE_ESCALATION_OPTIONS = R.layout.support_escalation_options;
+    private static final int TYPE_ESCALATION_OPTIONS_OFFLINE =
+            R.layout.support_offline_escalation_options;
+    private static final int TYPE_SUPPORT_TILE = R.layout.support_tile;
+    private static final int TYPE_SIGN_IN_BUTTON = R.layout.support_sign_in_button;
+
+    private final Activity mActivity;
+    private final EscalationClickListener mEscalationClickListener;
+    private final SpinnerItemSelectListener mSpinnerItemSelectListener;
+    private final SupportFeatureProvider mSupportFeatureProvider;
+    private final View.OnClickListener mItemClickListener;
+    private final List<SupportData> mSupportData;
+
+    private String mSelectedCountry;
+    private boolean mHasInternet;
+    private Account mAccount;
+
+    public SupportItemAdapter(Activity activity, Bundle savedInstanceState,
+            SupportFeatureProvider supportFeatureProvider, View.OnClickListener itemClickListener) {
+        mActivity = activity;
+        mSupportFeatureProvider = supportFeatureProvider;
+        mItemClickListener = itemClickListener;
+        mEscalationClickListener = new EscalationClickListener();
+        mSpinnerItemSelectListener = new SpinnerItemSelectListener();
+        mSupportData = new ArrayList<>();
+        // Optimistically assume we have Internet access. It will be updated later to correct value.
+        mHasInternet = true;
+        if (savedInstanceState != null) {
+            mSelectedCountry = savedInstanceState.getString(STATE_SELECTED_COUNTRY);
+        } else {
+            mSelectedCountry = mSupportFeatureProvider.getCurrentCountryCodeIfHasConfig(PHONE);
+        }
+        setAccount(mSupportFeatureProvider.getSupportEligibleAccount(mActivity));
+        refreshData();
+    }
+
+    @Override
+    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        return new ViewHolder(LayoutInflater.from(parent.getContext()).inflate(
+                viewType, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(ViewHolder holder, int position) {
+        final SupportData data = mSupportData.get(position);
+        switch (holder.getItemViewType()) {
+            case TYPE_SIGN_IN_BUTTON:
+                bindSignInPromoTile(holder, (EscalationData) data);
+                break;
+            case TYPE_ESCALATION_OPTIONS:
+                bindEscalationOptions(holder, (EscalationData) data);
+                break;
+            case TYPE_ESCALATION_OPTIONS_OFFLINE:
+                bindOfflineEscalationOptions(holder, (OfflineEscalationData) data);
+                break;
+            default:
+                bindSupportTile(holder, data);
+                break;
+        }
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return mSupportData.get(position).type;
+    }
+
+    @Override
+    public int getItemCount() {
+        return mSupportData.size();
+    }
+
+    /**
+     * Called when a support item is clicked.
+     */
+    public void onItemClicked(int position) {
+        if (position >= 0 && position < mSupportData.size()) {
+            final SupportData data = mSupportData.get(position);
+            if (data.intent != null) {
+                if (data.metricsEvent >= 0) {
+                    MetricsLogger.action(mActivity, data.metricsEvent);
+                }
+                mActivity.startActivityForResult(data.intent, 0);
+            }
+        }
+    }
+
+    public void setHasInternet(boolean hasInternet) {
+        if (mHasInternet != hasInternet) {
+            mHasInternet = hasInternet;
+            refreshData();
+        }
+    }
+
+    public void setAccount(Account account) {
+        if (!Objects.equals(mAccount, account)) {
+            mAccount = account;
+            refreshData();
+        }
+    }
+
+    public void onSaveInstanceState(Bundle outState) {
+        outState.putString(STATE_SELECTED_COUNTRY, mSelectedCountry);
+    }
+
+    /**
+     * Create data for the adapter. If there is already data in the adapter, they will be
+     * destroyed and recreated.
+     */
+    private void refreshData() {
+        mSupportData.clear();
+        if (mAccount == null) {
+            addSignInPromo();
+        } else if (mHasInternet) {
+            addEscalationCards();
+        } else {
+            addOfflineEscalationCards();
+        }
+        addMoreHelpItems();
+        notifyDataSetChanged();
+    }
+
+    private void addEscalationCards() {
+        final boolean hasPhoneOperation =
+                mSupportFeatureProvider.isSupportTypeEnabled(mActivity, PHONE);
+        final boolean hasChatOperation =
+                mSupportFeatureProvider.isSupportTypeEnabled(mActivity, CHAT);
+        final EscalationData.Builder builder = new EscalationData.Builder(mActivity);
+        if (!hasPhoneOperation && !hasChatOperation) {
+            // No support at all.
+            builder.setTileTitle(R.string.support_escalation_title)
+                    .setTileSummary(R.string.support_escalation_unavailable_summary);
+        } else if (mSupportFeatureProvider.isAlwaysOperating(PHONE, null /* countryCode */)
+                || mSupportFeatureProvider.isAlwaysOperating(CHAT, null /* countryCode */)) {
+            // Support is available.
+            builder.setTileTitle(R.string.support_escalation_24_7_title)
+                    .setTileSummary(mActivity.getString(R.string.support_escalation_24_7_summary));
+        } else if (mSupportFeatureProvider.isOperatingNow(PHONE)
+                || mSupportFeatureProvider.isOperatingNow(CHAT)) {
+            // Support is available now.
+            builder.setTileTitle(R.string.support_escalation_title)
+                    .setTileSummary(R.string.support_escalation_summary);
+        } else {
+            // Support is not temporarily unavailable.
+            builder.setTileTitle(R.string.support_escalation_title)
+                    .setTileSummary(
+                            mSupportFeatureProvider.getOperationHours(mActivity, PHONE, null));
+        }
+        if (hasPhoneOperation) {
+            builder.setText1(R.string.support_escalation_by_phone)
+                    .setSummary1(mSupportFeatureProvider.getEstimatedWaitTime(mActivity, PHONE))
+                    .setEnabled1(mSupportFeatureProvider.isOperatingNow(PHONE));
+        }
+        if (hasChatOperation) {
+            builder.setText2(R.string.support_escalation_by_chat)
+                    .setSummary2(mSupportFeatureProvider.getEstimatedWaitTime(mActivity, CHAT))
+                    .setEnabled2(mSupportFeatureProvider.isOperatingNow(CHAT));
+        }
+        mSupportData.add(builder.build());
+    }
+
+    private void addOfflineEscalationCards() {
+        final CharSequence operatingHours;
+        if (mSupportFeatureProvider.isAlwaysOperating(PHONE, mSelectedCountry)) {
+            operatingHours = mActivity.getString(R.string.support_escalation_24_7_summary);
+        } else {
+            operatingHours = mSupportFeatureProvider.getOperationHours(mActivity,
+                    PHONE, mSelectedCountry);
+        }
+        mSupportData.add(new OfflineEscalationData.Builder(mActivity)
+                .setCountries(mSupportFeatureProvider.getPhoneSupportCountries())
+                .setTollFreePhone(mSupportFeatureProvider.getSupportPhones(
+                        mSelectedCountry, true /* isTollFree */))
+                .setTolledPhone(mSupportFeatureProvider.getSupportPhones(
+                        mSelectedCountry, false /* isTollFree */))
+                .setTileTitle(R.string.support_escalation_title)
+                .setTileSummary(operatingHours)
+                .build());
+    }
+
+    private void addSignInPromo() {
+        mSupportData.add(new EscalationData.Builder(mActivity, TYPE_SIGN_IN_BUTTON)
+                .setText1(R.string.support_sign_in_button_text)
+                .setText2(R.string.support_sign_in_required_help)
+                .setTileTitle(R.string.support_sign_in_required_title)
+                .setTileSummary(R.string.support_sign_in_required_summary)
+                .build());
+    }
+
+    private void addMoreHelpItems() {
+        mSupportData.add(new SupportData.Builder(mActivity, TYPE_SUPPORT_TILE)
+                .setIcon(R.drawable.ic_help_24dp)
+                .setTileTitle(R.string.support_help_feedback_title)
+                .setIntent(mSupportFeatureProvider.getHelpIntent(mActivity))
+                .setMetricsEvent(MetricsProto.MetricsEvent.ACTION_SUPPORT_HELP_AND_FEEDBACK)
+                .build());
+        mSupportData.add(new SupportData.Builder(mActivity, TYPE_SUPPORT_TILE)
+                .setIcon(R.drawable.ic_lightbulb_outline_24)
+                .setTileTitle(R.string.support_tips_and_tricks_title)
+                .setIntent(mSupportFeatureProvider.getTipsAndTricksIntent(mActivity))
+                .setMetricsEvent(MetricsProto.MetricsEvent.ACTION_SUPPORT_TIPS_AND_TRICKS)
+                .build());
+    }
+
+    private void bindEscalationOptions(ViewHolder holder, EscalationData data) {
+        holder.tileTitleView.setText(data.tileTitle);
+        holder.tileSummaryView.setText(data.tileSummary);
+        if (data.text1 == 0) {
+            holder.text1View.setVisibility(View.GONE);
+        } else {
+            holder.text1View.setText(data.text1);
+            holder.text1View.setOnClickListener(mEscalationClickListener);
+            holder.text1View.setEnabled(data.enabled1 && mHasInternet);
+            holder.text1View.setVisibility(View.VISIBLE);
+        }
+        if (TextUtils.isEmpty(data.text2)) {
+            holder.text2View.setVisibility(View.GONE);
+        } else {
+            holder.text2View.setText(data.text2);
+            holder.text2View.setOnClickListener(mEscalationClickListener);
+            holder.text2View.setEnabled(data.enabled2 && mHasInternet);
+            holder.text2View.setVisibility(View.VISIBLE);
+        }
+        if (holder.summary1View != null) {
+            holder.summary1View.setText(data.summary1);
+            holder.summary1View.setVisibility(mHasInternet ? View.VISIBLE : View.GONE);
+        }
+        if (holder.summary2View != null) {
+            holder.summary2View.setText(data.summary2);
+            holder.summary2View.setVisibility(mHasInternet ? View.VISIBLE : View.GONE);
+        }
+    }
+
+    private void bindOfflineEscalationOptions(ViewHolder holder, OfflineEscalationData data) {
+        // Bind Title
+        holder.tileTitleView.setText(data.tileTitle);
+        holder.tileSummaryView.setText(data.tileSummary);
+        // Bind spinner
+        final Spinner spinner = (Spinner) holder.itemView.findViewById(R.id.spinner);
+        final ArrayAdapter<String> adapter = new ArrayAdapter(
+                mActivity, android.R.layout.simple_spinner_dropdown_item, data.countries);
+        spinner.setAdapter(adapter);
+        final List<String> countryCodes = mSupportFeatureProvider.getPhoneSupportCountryCodes();
+        for (int i = 0; i < countryCodes.size(); i++) {
+            if (TextUtils.equals(countryCodes.get(i), mSelectedCountry)) {
+                spinner.setSelection(i);
+                break;
+            }
+        }
+        spinner.setOnItemSelectedListener(mSpinnerItemSelectListener);
+        // Bind buttons
+        if (data.tollFreePhone != null) {
+            holder.text1View.setText(data.tollFreePhone.number);
+            holder.text1View.setVisibility(View.VISIBLE);
+            holder.text1View.setOnClickListener(mEscalationClickListener);
+        } else {
+            holder.text1View.setVisibility(View.GONE);
+        }
+        if (data.tolledPhone != null) {
+            holder.text2View.setText(
+                    mActivity.getString(R.string.support_international_phone_title));
+            holder.text2View.setVisibility(View.VISIBLE);
+            holder.text2View.setOnClickListener(mEscalationClickListener);
+        } else {
+            holder.text2View.setVisibility(View.GONE);
+        }
+    }
+
+    private void bindSignInPromoTile(ViewHolder holder, EscalationData data) {
+        holder.tileTitleView.setText(data.tileTitle);
+        holder.tileSummaryView.setText(data.tileSummary);
+        holder.text1View.setText(data.text1);
+        holder.text2View.setText(data.text2);
+        holder.text1View.setOnClickListener(mEscalationClickListener);
+        holder.text2View.setOnClickListener(mEscalationClickListener);
+    }
+
+    private void bindSupportTile(ViewHolder holder, SupportData data) {
+        if (holder.iconView != null) {
+            holder.iconView.setImageResource(data.icon);
+        }
+        if (holder.tileTitleView != null) {
+            holder.tileTitleView.setText(data.tileTitle);
+        }
+        if (holder.tileSummaryView != null) {
+            holder.tileSummaryView.setText(data.tileSummary);
+        }
+        holder.itemView.setOnClickListener(mItemClickListener);
+    }
+
+    /**
+     * Show a disclaimer dialog and start support action after disclaimer has been acknowledged.
+     */
+    private void tryStartDisclaimerAndSupport(final @SupportFeatureProvider.SupportType int type) {
+        if (mSupportFeatureProvider.shouldShowDisclaimerDialog(mActivity)) {
+            DialogFragment fragment = SupportDisclaimerDialogFragment.newInstance(mAccount, type);
+            fragment.show(mActivity.getFragmentManager(), SupportDisclaimerDialogFragment.TAG);
+            return;
+        }
+        mSupportFeatureProvider.startSupport(mActivity, mAccount, type);
+    }
+
+    /**
+     * Click handler for starting escalation options.
+     */
+    private final class EscalationClickListener implements View.OnClickListener {
+        @Override
+        public void onClick(final View v) {
+            if (mAccount == null) {
+                switch (v.getId()) {
+                    case android.R.id.text1:
+                        MetricsLogger.action(mActivity,
+                                MetricsProto.MetricsEvent.ACTION_SUPPORT_SIGN_IN);
+                        mActivity.startActivityForResult(
+                                mSupportFeatureProvider.getAccountLoginIntent(),
+                                0 /* requestCode */);
+                        break;
+                    case android.R.id.text2:
+                        mActivity.startActivityForResult(
+                                mSupportFeatureProvider.getSignInHelpIntent(mActivity),
+                                0 /* requestCode */);
+                        break;
+                }
+            } else if (mHasInternet) {
+                switch (v.getId()) {
+                    case android.R.id.text1:
+                        MetricsLogger.action(mActivity,
+                                MetricsProto.MetricsEvent.ACTION_SUPPORT_PHONE);
+                        tryStartDisclaimerAndSupport(PHONE);
+                        break;
+                    case android.R.id.text2:
+                        MetricsLogger.action(mActivity,
+                                MetricsProto.MetricsEvent.ACTION_SUPPORT_CHAT);
+                        tryStartDisclaimerAndSupport(CHAT);
+                        break;
+                }
+            } else {
+                switch (v.getId()) {
+                    case android.R.id.text1: {
+                        final SupportPhone phone = mSupportFeatureProvider
+                                .getSupportPhones(mSelectedCountry, true /* isTollFree */);
+                        if (phone != null) {
+                            mActivity.startActivity(phone.getDialIntent());
+                        }
+                        break;
+                    }
+                    case android.R.id.text2: {
+                        final SupportPhone phone = mSupportFeatureProvider
+                                .getSupportPhones(mSelectedCountry, false /* isTollFree */);
+                        final SupportPhoneDialogFragment fragment =
+                                SupportPhoneDialogFragment.newInstance(phone);
+                        fragment.show(mActivity.getFragmentManager(),
+                                SupportPhoneDialogFragment.TAG);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    private final class SpinnerItemSelectListener implements AdapterView.OnItemSelectedListener {
+
+        @Override
+        public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+            final List<String> countryCodes = mSupportFeatureProvider.getPhoneSupportCountryCodes();
+            final String selectedCountry = countryCodes.get(position);
+            if (!TextUtils.equals(selectedCountry, mSelectedCountry)) {
+                mSelectedCountry = selectedCountry;
+                refreshData();
+            }
+        }
+
+        @Override
+        public void onNothingSelected(AdapterView<?> parent) {
+            // Do nothing.
+        }
+    }
+
+    /**
+     * {@link RecyclerView.ViewHolder} for support items.
+     */
+    static final class ViewHolder extends RecyclerView.ViewHolder {
+
+        final ImageView iconView;
+        final TextView tileTitleView;
+        final TextView tileSummaryView;
+        final TextView text1View;
+        final TextView text2View;
+        final TextView summary1View;
+        final TextView summary2View;
+
+        ViewHolder(View itemView) {
+            super(itemView);
+            iconView = (ImageView) itemView.findViewById(android.R.id.icon);
+            tileTitleView = (TextView) itemView.findViewById(R.id.tile_title);
+            tileSummaryView = (TextView) itemView.findViewById(R.id.tile_summary);
+            text1View = (TextView) itemView.findViewById(android.R.id.text1);
+            text2View = (TextView) itemView.findViewById(android.R.id.text2);
+            summary1View = (TextView) itemView.findViewById(R.id.summary1);
+            summary2View = (TextView) itemView.findViewById(R.id.summary2);
+        }
+    }
+
+    /**
+     * Data for a single support item.
+     */
+    private static class SupportData {
+
+        final Intent intent;
+        final int metricsEvent;
+        @LayoutRes
+        final int type;
+        @DrawableRes
+        final int icon;
+        @StringRes
+        final int tileTitle;
+        final CharSequence tileSummary;
+
+
+        private SupportData(Builder builder) {
+            this.type = builder.mType;
+            this.icon = builder.mIcon;
+            this.tileTitle = builder.mTileTitle;
+            this.tileSummary = builder.mTileSummary;
+            this.intent = builder.mIntent;
+            this.metricsEvent = builder.mMetricsEvent;
+        }
+
+        static class Builder {
+
+            protected final Context mContext;
+            @LayoutRes
+            private final int mType;
+            @DrawableRes
+            private int mIcon;
+            @StringRes
+            private int mTileTitle;
+            private CharSequence mTileSummary;
+            private Intent mIntent;
+            private int mMetricsEvent = -1;
+
+            Builder(Context context, @LayoutRes int type) {
+                mContext = context;
+                mType = type;
+            }
+
+            Builder setIcon(@DrawableRes int icon) {
+                mIcon = icon;
+                return this;
+            }
+
+            Builder setTileTitle(@StringRes int title) {
+                mTileTitle = title;
+                return this;
+            }
+
+            Builder setTileSummary(@StringRes int summary) {
+                mTileSummary = mContext.getString(summary);
+                return this;
+            }
+
+            Builder setTileSummary(CharSequence summary) {
+                mTileSummary = summary;
+                return this;
+            }
+
+            Builder setMetricsEvent(int metricsEvent) {
+                mMetricsEvent = metricsEvent;
+                return this;
+            }
+
+            Builder setIntent(Intent intent) {
+                mIntent = intent;
+                return this;
+            }
+
+            SupportData build() {
+                return new SupportData(this);
+            }
+        }
+    }
+
+    /**
+     * Data model for escalation cards.
+     */
+    private static class EscalationData extends SupportData {
+
+        @StringRes
+        final int text1;
+        final CharSequence text2;
+        final boolean enabled1;
+        final boolean enabled2;
+        final CharSequence summary1;
+        final CharSequence summary2;
+
+        private EscalationData(Builder builder) {
+            super(builder);
+            this.text1 = builder.mText1;
+            this.text2 = builder.mText2;
+            this.summary1 = builder.mSummary1;
+            this.summary2 = builder.mSummary2;
+            this.enabled1 = builder.mEnabled1;
+            this.enabled2 = builder.mEnabled2;
+        }
+
+        static class Builder extends SupportData.Builder {
+
+            @StringRes
+            private int mText1;
+            private CharSequence mText2;
+            private CharSequence mSummary1;
+            private CharSequence mSummary2;
+            private boolean mEnabled1;
+            private boolean mEnabled2;
+
+            protected Builder(Context context, @LayoutRes int type) {
+                super(context, type);
+            }
+
+            Builder(Context context) {
+                this(context, TYPE_ESCALATION_OPTIONS);
+            }
+
+            Builder setEnabled1(boolean enabled) {
+                mEnabled1 = enabled;
+                return this;
+            }
+
+            Builder setText1(@StringRes int text1) {
+                mText1 = text1;
+                return this;
+            }
+
+            Builder setText2(@StringRes int text2) {
+                mText2 = mContext.getString(text2);
+                return this;
+            }
+
+            Builder setText2(CharSequence text2) {
+                mText2 = text2;
+                return this;
+            }
+
+            Builder setSummary1(String summary1) {
+                mSummary1 = summary1;
+                return this;
+            }
+
+            Builder setEnabled2(boolean enabled) {
+                mEnabled2 = enabled;
+                return this;
+            }
+
+            Builder setSummary2(String summary2) {
+                mSummary2 = summary2;
+                return this;
+            }
+
+            EscalationData build() {
+                return new EscalationData(this);
+            }
+        }
+    }
+
+    /**
+     * Support data for offline mode.
+     */
+    private static final class OfflineEscalationData extends EscalationData {
+
+        final List<String> countries;
+        final SupportPhone tollFreePhone;
+        final SupportPhone tolledPhone;
+
+        private OfflineEscalationData(Builder builder) {
+            super(builder);
+            countries = builder.mCountries;
+            tollFreePhone = builder.mTollFreePhone;
+            tolledPhone = builder.mTolledPhone;
+        }
+
+        static final class Builder extends EscalationData.Builder {
+
+            private List<String> mCountries;
+            private SupportPhone mTollFreePhone;
+            private SupportPhone mTolledPhone;
+
+            Builder(Context context) {
+                super(context, TYPE_ESCALATION_OPTIONS_OFFLINE);
+            }
+
+            Builder setCountries(List<String> countries) {
+                mCountries = countries;
+                return this;
+            }
+
+            Builder setTollFreePhone(SupportPhone phone) {
+                mTollFreePhone = phone;
+                return this;
+            }
+
+            Builder setTolledPhone(SupportPhone phone) {
+                mTolledPhone = phone;
+                return this;
+            }
+
+            OfflineEscalationData build() {
+                return new OfflineEscalationData(this);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
new file mode 100644
index 0000000..1b64fc4
--- /dev/null
+++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
@@ -0,0 +1,159 @@
+/**
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deletionhelper;
+
+import android.app.Activity;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.os.storage.StorageManager;
+import android.provider.Settings;
+import android.text.format.DateUtils;
+import android.text.format.Formatter;
+import android.util.Log;
+import android.view.View;
+import android.widget.Switch;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.DropDownPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.Preference.OnPreferenceChangeListener;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.internal.logging.MetricsProto.MetricsEvent;
+import com.android.settings.SettingsActivity;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.R;
+import com.android.settings.widget.SwitchBar;
+import com.android.settings.widget.SwitchBar.OnSwitchChangeListener;
+
+/**
+ * AutomaticStorageManagerSettings is the Settings screen for configuration and management of the
+ * automatic storage manager.
+ */
+public class AutomaticStorageManagerSettings extends SettingsPreferenceFragment implements
+        OnPreferenceChangeListener, Preference.OnPreferenceClickListener {
+    public static final int DEFAULT_DAYS_TO_RETAIN = 90;
+
+    private static final String KEY_DAYS = "days";
+    private static final String KEY_DELETION_HELPER = "deletion_helper";
+    private static final String KEY_FREED = "freed_bytes";
+    private static final String KEY_STORAGE_MANAGER_SWITCH = "storage_manager_active";
+
+    private DropDownPreference mDaysToRetain;
+    private Preference mFreedBytes;
+    private Preference mDeletionHelper;
+    private SwitchPreference mStorageManagerSwitch;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.automatic_storage_management_settings);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        mDaysToRetain = (DropDownPreference) findPreference(KEY_DAYS);
+        mDaysToRetain.setOnPreferenceChangeListener(this);
+
+        mFreedBytes = findPreference(KEY_FREED);
+
+        mDeletionHelper = findPreference(KEY_DELETION_HELPER);
+        mDeletionHelper.setOnPreferenceClickListener(this);
+
+        mStorageManagerSwitch = (SwitchPreference) findPreference(KEY_STORAGE_MANAGER_SWITCH);
+        mStorageManagerSwitch.setOnPreferenceChangeListener(this);
+
+        ContentResolver cr = getContentResolver();
+        int value = Settings.Secure.getInt(cr,
+                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,
+                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN_DEFAULT);
+        String[] stringValues =
+                getResources().getStringArray(R.array.automatic_storage_management_days_values);
+        mDaysToRetain.setValue(stringValues[daysValueToIndex(value, stringValues)]);
+
+        long freedBytes = Settings.Secure.getLong(cr,
+                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_BYTES_CLEARED,
+                0);
+        long lastRunMillis = Settings.Secure.getLong(cr,
+                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_LAST_RUN,
+                0);
+        if (freedBytes == 0 || lastRunMillis == 0) {
+            mFreedBytes.setVisible(false);
+        } else {
+            Activity activity = getActivity();
+            mFreedBytes.setSummary(activity.getString(
+                    R.string.automatic_storage_manager_freed_bytes,
+                    Formatter.formatFileSize(activity, freedBytes),
+                    DateUtils.formatDateTime(activity, lastRunMillis, DateUtils.FORMAT_SHOW_DATE)));
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        boolean isChecked =
+                Settings.Secure.getInt(getContentResolver(),
+                        Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED, 0) != 0;
+        mStorageManagerSwitch.setChecked(isChecked);
+        mDaysToRetain.setEnabled(isChecked);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        switch (preference.getKey()) {
+            case KEY_STORAGE_MANAGER_SWITCH:
+                boolean checked = (boolean) newValue;
+                mDaysToRetain.setEnabled(checked);
+                Settings.Secure.putInt(getContentResolver(),
+                        Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED, checked ? 1 : 0);
+                break;
+            case KEY_DAYS:
+                Settings.Secure.putInt(getContentResolver(),
+                        Settings.Secure.AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,
+                        Integer.parseInt((String) newValue));
+                break;
+        }
+        return true;
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsEvent.STORAGE_MANAGER_SETTINGS;
+    }
+
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+        if (KEY_DELETION_HELPER.equals(preference.getKey())) {
+            Intent intent = new Intent(StorageManager.ACTION_MANAGE_STORAGE);
+            getContext().startActivity(intent);
+        }
+        return true;
+    }
+
+    private static int daysValueToIndex(int value, String[] indices) {
+        for (int i = 0; i < indices.length; i++) {
+            int thisValue = Integer.parseInt(indices[i]);
+            if (value == thisValue) {
+                return i;
+            }
+        }
+        return indices.length - 1;
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
index c9a1fb7..2a84a93 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@ -30,6 +30,7 @@
 import android.content.pm.UserInfo;
 import android.os.Bundle;
 import android.os.Environment;
+import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.os.storage.StorageEventListener;
@@ -37,6 +38,7 @@
 import android.os.storage.VolumeInfo;
 import android.os.storage.VolumeRecord;
 import android.provider.DocumentsContract;
+import android.provider.Settings;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
 import android.support.v7.preference.PreferenceGroup;
@@ -58,6 +60,7 @@
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 import com.android.settings.applications.ManageApplications;
+import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;
 import com.android.settings.deviceinfo.StorageSettings.MountTask;
 import com.android.settingslib.deviceinfo.StorageMeasurement;
 import com.android.settingslib.deviceinfo.StorageMeasurement.MeasurementDetails;
@@ -81,13 +84,19 @@
 
     private static final String TAG_RENAME = "rename";
     private static final String TAG_OTHER_INFO = "otherInfo";
+    private static final String TAG_SYSTEM_INFO = "systemInfo";
     private static final String TAG_USER_INFO = "userInfo";
     private static final String TAG_CONFIRM_CLEAR_CACHE = "confirmClearCache";
 
+    private static final String EXTRA_VOLUME_SIZE = "volume_size";
+
     private static final String AUTHORITY_MEDIA = "com.android.providers.media.documents";
 
+    private static final String STORAGE_MANAGER_PROPERTY = "ro.storage_manager.enabled";
+
     private static final int[] ITEMS_NO_SHOW_SHARED = new int[] {
             R.string.storage_detail_apps,
+            R.string.storage_detail_system,
     };
 
     private static final int[] ITEMS_SHOW_SHARED = new int[] {
@@ -95,15 +104,21 @@
             R.string.storage_detail_images,
             R.string.storage_detail_videos,
             R.string.storage_detail_audio,
-            R.string.storage_detail_other
+            R.string.storage_detail_system,
+            R.string.storage_detail_other,
     };
 
+    private static final int DELETION_HELPER_SETTINGS = 1;
+    private static final int DELETION_HELPER_CLEAR = 1;
+
     private StorageManager mStorageManager;
     private UserManager mUserManager;
 
     private String mVolumeId;
     private VolumeInfo mVolume;
     private VolumeInfo mSharedVolume;
+    private long mTotalSize;
+    private long mSystemSize;
 
     private StorageMeasurement mMeasure;
 
@@ -116,6 +131,7 @@
     private int mItemPoolIndex;
 
     private Preference mExplore;
+    private Preference mAutomaticStorageManagement;
 
     private boolean mNeedsUpdate;
 
@@ -145,6 +161,14 @@
         mVolumeId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID);
         mVolume = mStorageManager.findVolumeById(mVolumeId);
 
+        final long sharedDataSize = mVolume.getPath().getTotalSpace();
+        mTotalSize = getArguments().getLong(EXTRA_VOLUME_SIZE, 0);
+        mSystemSize = mTotalSize - sharedDataSize;
+        if (mTotalSize <= 0) {
+            mTotalSize = sharedDataSize;
+            mSystemSize = 0;
+        }
+
         // Find the emulated shared storage layered above this private volume
         mSharedVolume = mStorageManager.findEmulatedForPrivate(mVolume);
 
@@ -163,6 +187,7 @@
         mCurrentUser = mUserManager.getUserInfo(UserHandle.myUserId());
 
         mExplore = buildAction(R.string.storage_menu_explore);
+        mAutomaticStorageManagement = buildAction(R.string.storage_menu_manage);
 
         mNeedsUpdate = true;
 
@@ -189,6 +214,9 @@
 
         screen.removeAll();
 
+        if (SystemProperties.getBoolean(STORAGE_MANAGER_PROPERTY, false)) {
+            addPreference(screen, mAutomaticStorageManagement);
+        }
         addPreference(screen, mSummary);
 
         List<UserInfo> allUsers = mUserManager.getUsers();
@@ -229,17 +257,15 @@
             addPreference(screen, mExplore);
         }
 
-        final File file = mVolume.getPath();
-        final long totalBytes = file.getTotalSpace();
-        final long freeBytes = file.getFreeSpace();
-        final long usedBytes = totalBytes - freeBytes;
+        final long freeBytes = mVolume.getPath().getFreeSpace();
+        final long usedBytes = mTotalSize - freeBytes;
 
         final BytesResult result = Formatter.formatBytes(getResources(), usedBytes, 0);
         mSummary.setTitle(TextUtils.expandTemplate(getText(R.string.storage_size_large),
                 result.value, result.units));
         mSummary.setSummary(getString(R.string.storage_volume_used,
-                Formatter.formatFileSize(context, totalBytes)));
-        mSummary.setPercent((int) ((usedBytes * 100) / totalBytes));
+                Formatter.formatFileSize(context, mTotalSize)));
+        mSummary.setPercent((int) ((usedBytes * 100) / mTotalSize));
 
         mMeasure.forceMeasure();
         mNeedsUpdate = false;
@@ -274,6 +300,10 @@
     }
 
     private void addItem(PreferenceGroup group, int titleRes, CharSequence title, int userId) {
+        if (titleRes == R.string.storage_detail_system && mSystemSize <= 0) {
+            Log.w(TAG, "Skipping System storage because its size is " + mSystemSize);
+            return;
+        }
         StorageItemPreference item;
         if (mItemPoolIndex < mItemPreferencePool.size()) {
             item = mItemPreferencePool.get(mItemPoolIndex);
@@ -306,6 +336,10 @@
         return pref;
     }
 
+    static void setVolumeSize(Bundle args, long size) {
+        args.putLong(EXTRA_VOLUME_SIZE, size);
+    }
+
     @Override
     public void onResume() {
         super.onResume();
@@ -355,6 +389,7 @@
         final MenuItem unmount = menu.findItem(R.id.storage_unmount);
         final MenuItem format = menu.findItem(R.id.storage_format);
         final MenuItem migrate = menu.findItem(R.id.storage_migrate);
+        final MenuItem manage = menu.findItem(R.id.storage_free);
 
         // Actions live in menu for non-internal private volumes; they're shown
         // as preference items for public volumes.
@@ -363,11 +398,13 @@
             mount.setVisible(false);
             unmount.setVisible(false);
             format.setVisible(false);
+            manage.setVisible(SystemProperties.getBoolean(STORAGE_MANAGER_PROPERTY, false));
         } else {
             rename.setVisible(mVolume.getType() == VolumeInfo.TYPE_PRIVATE);
             mount.setVisible(mVolume.getState() == VolumeInfo.STATE_UNMOUNTED);
             unmount.setVisible(mVolume.isMountedReadable());
             format.setVisible(true);
+            manage.setVisible(false);
         }
 
         format.setTitle(R.string.storage_menu_format_public);
@@ -406,6 +443,11 @@
                 intent.putExtra(VolumeInfo.EXTRA_VOLUME_ID, mVolume.getId());
                 startActivity(intent);
                 return true;
+            case R.id.storage_free:
+                final Intent deletion_helper_intent =
+                        new Intent(StorageManager.ACTION_MANAGE_STORAGE);
+                startActivity(deletion_helper_intent);
+                return true;
         }
         return super.onOptionsItemSelected(item);
     }
@@ -453,6 +495,11 @@
                 intent.addCategory(Intent.CATEGORY_DEFAULT);
 
             } break;
+            case R.string.storage_detail_system: {
+                SystemInfoFragment.show(this);
+                return true;
+
+            }
             case R.string.storage_detail_other: {
                 OtherInfoFragment.show(this, mStorageManager.getBestVolumeDescription(mVolume),
                         mSharedVolume);
@@ -467,6 +514,11 @@
             case R.string.storage_menu_explore: {
                 intent = mSharedVolume.buildBrowseIntent();
             } break;
+            case R.string.storage_menu_manage: {
+                startFragment(this, AutomaticStorageManagerSettings.class.getCanonicalName(),
+                        R.string.automatic_storage_manager_settings, 0, null);
+                return true;
+            }
             case 0: {
                 UserInfoFragment.show(this, pref.getTitle(), pref.getSummary());
                 return true;
@@ -506,6 +558,9 @@
                 itemTitleId = 0;
             }
             switch (itemTitleId) {
+                case R.string.storage_detail_system: {
+                    updatePreference(item, mSystemSize);
+                } break;
                 case R.string.storage_detail_apps: {
                     updatePreference(item, details.appsSize.get(userId));
                 } break;
@@ -542,7 +597,7 @@
     }
 
     private void updatePreference(StorageItemPreference pref, long size) {
-        pref.setStorageSize(size, mVolume.getPath().getTotalSpace());
+        pref.setStorageSize(size, mTotalSize);
     }
 
     private boolean isProfileOf(UserInfo user, UserInfo profile) {
@@ -633,6 +688,24 @@
         }
     }
 
+    public static class SystemInfoFragment extends DialogFragment {
+        public static void show(Fragment parent) {
+            if (!parent.isAdded()) return;
+
+            final SystemInfoFragment dialog = new SystemInfoFragment();
+            dialog.setTargetFragment(parent, 0);
+            dialog.show(parent.getFragmentManager(), TAG_SYSTEM_INFO);
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            return new AlertDialog.Builder(getActivity())
+                    .setMessage(R.string.storage_detail_dialog_system)
+                    .setPositiveButton(android.R.string.ok, null)
+                    .create();
+        }
+    }
+
     public static class OtherInfoFragment extends DialogFragment {
         public static void show(Fragment parent, String title, VolumeInfo sharedVol) {
             if (!parent.isAdded()) return;
diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java
index bad70da..ba14e13 100644
--- a/src/com/android/settings/deviceinfo/SimStatus.java
+++ b/src/com/android/settings/deviceinfo/SimStatus.java
@@ -128,7 +128,8 @@
                     return;
                 }
                 CellBroadcastMessage cbMessage = (CellBroadcastMessage) extras.get("message");
-                if (cbMessage != null && cbMessage.getServiceCategory() == 50) {
+                if (cbMessage != null && cbMessage.getServiceCategory() == 50
+                        && mSir.getSubscriptionId() == cbMessage.getSubId()) {
                     String latestAreaInfo = cbMessage.getMessageBody();
                     updateAreaInfo(latestAreaInfo);
                 }
diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java
index 5ae3986..8f0e91b 100644
--- a/src/com/android/settings/deviceinfo/StorageSettings.java
+++ b/src/com/android/settings/deviceinfo/StorageSettings.java
@@ -42,6 +42,7 @@
 import android.text.format.Formatter.BytesResult;
 import android.util.Log;
 import android.widget.Toast;
+
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
@@ -50,7 +51,6 @@
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
-
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.drawer.SettingsDrawerActivity;
 
@@ -88,6 +88,7 @@
     private PreferenceCategory mExternalCategory;
 
     private StorageSummaryPreference mInternalSummary;
+    private static long sTotalInternalStorage;
 
     @Override
     protected int getMetricsCategory() {
@@ -108,6 +109,8 @@
         mStorageManager = context.getSystemService(StorageManager.class);
         mStorageManager.registerListener(mStorageListener);
 
+        sTotalInternalStorage = mStorageManager.getPrimaryStorageSize();
+
         addPreferencesFromResource(R.xml.device_info_storage);
 
         mInternalCategory = (PreferenceCategory) findPreference("storage_internal");
@@ -162,15 +165,16 @@
             if (vol.getType() == VolumeInfo.TYPE_PRIVATE) {
                 final int color = COLOR_PRIVATE[privateCount++ % COLOR_PRIVATE.length];
                 mInternalCategory.addPreference(
-                        new StorageVolumePreference(context, vol, color));
+                        new StorageVolumePreference(context, vol, color, sTotalInternalStorage));
                 if (vol.isMountedReadable()) {
                     final File path = vol.getPath();
                     privateUsedBytes += path.getTotalSpace() - path.getFreeSpace();
-                    privateTotalBytes += path.getTotalSpace();
+                    privateTotalBytes += sTotalInternalStorage > 0
+                            ? sTotalInternalStorage : path.getTotalSpace();
                 }
             } else if (vol.getType() == VolumeInfo.TYPE_PUBLIC) {
                 mExternalCategory.addPreference(
-                        new StorageVolumePreference(context, vol, COLOR_PUBLIC));
+                        new StorageVolumePreference(context, vol, COLOR_PUBLIC, 0));
             }
         }
 
@@ -224,6 +228,7 @@
             // Only showing primary internal storage, so just shortcut
             final Bundle args = new Bundle();
             args.putString(VolumeInfo.EXTRA_VOLUME_ID, VolumeInfo.ID_PRIVATE_INTERNAL);
+            PrivateVolumeSettings.setVolumeSize(args, sTotalInternalStorage);
             Intent intent = Utils.onBuildStartFragmentIntent(getActivity(),
                     PrivateVolumeSettings.class.getName(), args, null, R.string.apps_storage, null,
                     false);
@@ -268,6 +273,7 @@
             if (vol.getType() == VolumeInfo.TYPE_PRIVATE) {
                 final Bundle args = new Bundle();
                 args.putString(VolumeInfo.EXTRA_VOLUME_ID, vol.getId());
+                PrivateVolumeSettings.setVolumeSize(args, sTotalInternalStorage);
                 startFragment(this, PrivateVolumeSettings.class.getCanonicalName(),
                         -1, 0, args);
                 return true;
@@ -491,7 +497,11 @@
                     continue;
                 }
                 privateUsedBytes += path.getTotalSpace() - path.getFreeSpace();
-                privateTotalBytes += path.getTotalSpace();
+                if (info.getType() == VolumeInfo.TYPE_PRIVATE && sTotalInternalStorage > 0) {
+                    privateTotalBytes = sTotalInternalStorage;
+                } else {
+                    privateTotalBytes += path.getTotalSpace();
+                }
             }
             mLoader.setSummary(this, mContext.getString(R.string.storage_summary,
                     Formatter.formatFileSize(mContext, privateUsedBytes),
diff --git a/src/com/android/settings/deviceinfo/StorageSummaryPreference.java b/src/com/android/settings/deviceinfo/StorageSummaryPreference.java
index 9fc1363..e1cf774 100644
--- a/src/com/android/settings/deviceinfo/StorageSummaryPreference.java
+++ b/src/com/android/settings/deviceinfo/StorageSummaryPreference.java
@@ -46,6 +46,7 @@
         if (mPercent != -1) {
             progress.setVisibility(View.VISIBLE);
             progress.setProgress(mPercent);
+            progress.setScaleY(7f);
         } else {
             progress.setVisibility(View.GONE);
         }
diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
index dba636c..2ef42fa 100644
--- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
@@ -46,7 +46,8 @@
     private int mColor;
     private int mUsedPercent = -1;
 
-    public StorageVolumePreference(Context context, VolumeInfo volume, int color) {
+    // TODO: ideally, VolumeInfo should have a total physical size.
+    public StorageVolumePreference(Context context, VolumeInfo volume, int color, long totalBytes) {
         super(context);
 
         mStorageManager = context.getSystemService(StorageManager.class);
@@ -68,8 +69,10 @@
         if (volume.isMountedReadable()) {
             // TODO: move statfs() to background thread
             final File path = volume.getPath();
+            if (totalBytes <= 0) {
+                totalBytes = path.getTotalSpace();
+            }
             final long freeBytes = path.getFreeSpace();
-            final long totalBytes = path.getTotalSpace();
             final long usedBytes = totalBytes - freeBytes;
 
             final String used = Formatter.formatFileSize(context, usedBytes);
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollBase.java b/src/com/android/settings/fingerprint/FingerprintEnrollBase.java
index 150a01a..2aef37b 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollBase.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollBase.java
@@ -23,15 +23,13 @@
 import android.os.UserHandle;
 import android.text.TextUtils;
 import android.view.View;
-import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.TextView;
 
 import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.InstrumentedActivity;
 import com.android.settings.R;
-import com.android.setupwizardlib.SetupWizardLayout;
-import com.android.setupwizardlib.view.NavigationBar;
+import com.android.setupwizardlib.GlifLayout;
 
 /**
  * Base activity for all fingerprint enrollment steps.
@@ -71,38 +69,26 @@
     }
 
     protected void initViews() {
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS |
-                WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN |
-                WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR);
-
-        getWindow().getDecorView().setSystemUiVisibility(
-                View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
-
         getWindow().setStatusBarColor(Color.TRANSPARENT);
-        getNavigationBar().setVisibility(View.GONE);
         Button nextButton = getNextButton();
         if (nextButton != null) {
             nextButton.setOnClickListener(this);
         }
     }
 
-    protected NavigationBar getNavigationBar() {
-        return (NavigationBar) findViewById(R.id.suw_layout_navigation_bar);
-    }
-
-    protected SetupWizardLayout getSetupWizardLayout() {
-        return (SetupWizardLayout) findViewById(R.id.setup_wizard_layout);
+    protected GlifLayout getLayout() {
+        return (GlifLayout) findViewById(R.id.setup_wizard_layout);
     }
 
     protected void setHeaderText(int resId, boolean force) {
-        TextView layoutTitle = getSetupWizardLayout().getHeaderTextView();
+        TextView layoutTitle = getLayout().getHeaderTextView();
         CharSequence previousTitle = layoutTitle.getText();
         CharSequence title = getText(resId);
         if (previousTitle != title || force) {
             if (!TextUtils.isEmpty(previousTitle)) {
                 layoutTitle.setAccessibilityLiveRegion(View.ACCESSIBILITY_LIVE_REGION_POLITE);
             }
-            getSetupWizardLayout().setHeaderText(title);
+            getLayout().setHeaderText(title);
             setTitle(title);
         }
     }
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
index 4cbf963..c1a0925 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
@@ -18,38 +18,32 @@
 
 import android.app.admin.DevicePolicyManager;
 import android.content.ActivityNotFoundException;
-import android.content.Context;
 import android.content.Intent;
-import android.graphics.Typeface;
 import android.hardware.fingerprint.FingerprintManager;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.text.Annotation;
-import android.text.SpannableString;
-import android.text.SpannableStringBuilder;
-import android.text.TextPaint;
-import android.text.TextUtils;
-import android.text.style.URLSpan;
 import android.util.Log;
-import android.view.View;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.internal.util.CharSequences;
 import com.android.settings.ChooseLockGeneric;
 import com.android.settings.ChooseLockSettingsHelper;
-import com.android.settingslib.HelpUtils;
 import com.android.settings.R;
-import com.android.setupwizardlib.SetupWizardRecyclerLayout;
+import com.android.settingslib.HelpUtils;
+import com.android.setupwizardlib.GlifRecyclerLayout;
 import com.android.setupwizardlib.items.IItem;
 import com.android.setupwizardlib.items.Item;
 import com.android.setupwizardlib.items.RecyclerItemAdapter;
+import com.android.setupwizardlib.span.LinkSpan;
 
 /**
  * Onboarding activity for fingerprint enrollment.
  */
 public class FingerprintEnrollIntroduction extends FingerprintEnrollBase
-        implements RecyclerItemAdapter.OnItemSelectedListener {
+        implements RecyclerItemAdapter.OnItemSelectedListener, LinkSpan.OnClickListener {
+
+    private static final String TAG = "FingerprintIntro";
 
     protected static final int CHOOSE_LOCK_GENERIC_REQUEST = 1;
     protected static final int FINGERPRINT_FIND_SENSOR_REQUEST = 2;
@@ -63,19 +57,12 @@
         super.onCreate(savedInstanceState);
         setContentView(R.layout.fingerprint_enroll_introduction);
         setHeaderText(R.string.security_settings_fingerprint_enroll_introduction_title);
-        final SetupWizardRecyclerLayout layout =
-                (SetupWizardRecyclerLayout) findViewById(R.id.setup_wizard_layout);
+        final GlifRecyclerLayout layout = (GlifRecyclerLayout) getLayout();
         mUserManager = UserManager.get(this);
         final RecyclerItemAdapter adapter = (RecyclerItemAdapter) layout.getAdapter();
         adapter.setOnItemSelectedListener(this);
         Item item = (Item) adapter.findItemById(R.id.fingerprint_introduction_message);
-        item.setTitle(LearnMoreSpan.linkify(
-                getText(R.string.security_settings_fingerprint_enroll_introduction_message),
-                getString(R.string.help_url_fingerprint)));
-        // setupwizard library automatically sets the divider inset to
-        // R.dimen.suw_items_icon_divider_inset. We adjust this back to 0 as we do not want
-        // an inset within settings.
-        layout.setDividerInset(0);
+        item.setTitle(getText(R.string.security_settings_fingerprint_enroll_introduction_message));
         updatePasswordQuality();
     }
 
@@ -127,8 +114,7 @@
     }
 
     protected Intent getFindSensorIntent() {
-        Intent intent = new Intent(this, FingerprintEnrollFindSensor.class);
-        return intent;
+        return new Intent(this, FingerprintEnrollFindSensor.class);
     }
 
     @Override
@@ -149,6 +135,8 @@
                 launchFindSensor(token);
                 return;
             }
+        } else if (requestCode == LEARN_MORE_REQUEST) {
+            overridePendingTransition(R.anim.suw_slide_back_in, R.anim.suw_slide_back_out);
         }
         super.onActivityResult(requestCode, resultCode, data);
     }
@@ -174,57 +162,21 @@
         finish();
     }
 
-    private static class LearnMoreSpan extends URLSpan {
-        private static final String TAG = "LearnMoreSpan";
-        private static final Typeface TYPEFACE_MEDIUM =
-                Typeface.create("sans-serif-medium", Typeface.NORMAL);
-
-        private LearnMoreSpan(String url) {
-            super(url);
-        }
-
-        @Override
-        public void onClick(View widget) {
-            Context ctx = widget.getContext();
-            Intent intent = HelpUtils.getHelpIntent(ctx, getURL(), ctx.getClass().getName());
+    @Override
+    public void onClick(LinkSpan span) {
+        if ("url".equals(span.getId())) {
+            String url = getString(R.string.help_url_fingerprint);
+            Intent intent = HelpUtils.getHelpIntent(this, url, getClass().getName());
+            if (intent == null) {
+                Log.w(TAG, "Null help intent.");
+                return;
+            }
             try {
                 // This needs to be startActivityForResult even though we do not care about the
                 // actual result because the help app needs to know about who invoked it.
-                widget.startActivityForResult(intent, LEARN_MORE_REQUEST);
+                startActivityForResult(intent, LEARN_MORE_REQUEST);
             } catch (ActivityNotFoundException e) {
-                Log.w(LearnMoreSpan.TAG,
-                        "Actvity was not found for intent, " + intent.toString());
-            }
-        }
-
-        @Override
-        public void updateDrawState(TextPaint ds) {
-            super.updateDrawState(ds);
-            ds.setUnderlineText(false);
-            ds.setTypeface(TYPEFACE_MEDIUM);
-        }
-
-        public static CharSequence linkify(CharSequence rawText, String uri) {
-            SpannableString msg = new SpannableString(rawText);
-            Annotation[] spans = msg.getSpans(0, msg.length(), Annotation.class);
-            if (TextUtils.isEmpty(uri)) {
-                CharSequence ret = rawText;
-                for (Annotation annotation : spans) {
-                    int start = msg.getSpanStart(annotation);
-                    int end = msg.getSpanEnd(annotation);
-                    ret = TextUtils.concat(ret.subSequence(0, start),
-                            msg.subSequence(end, msg.length()));
-                }
-                return ret;
-            } else {
-                SpannableStringBuilder builder = new SpannableStringBuilder(msg);
-                for (Annotation annotation : spans) {
-                    int start = msg.getSpanStart(annotation);
-                    int end = msg.getSpanEnd(annotation);
-                    LearnMoreSpan link = new LearnMoreSpan(uri);
-                    builder.setSpan(link, start, end, msg.getSpanFlags(link));
-                }
-                return builder;
+                Log.w(TAG, "Activity was not found for intent, " + e);
             }
         }
     }
diff --git a/src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java b/src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java
index cc1d4fd..a26883a 100644
--- a/src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java
+++ b/src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java
@@ -19,17 +19,18 @@
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
+import android.annotation.ColorInt;
 import android.annotation.Nullable;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.util.AttributeSet;
-import android.util.TypedValue;
 import android.view.View;
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
 
 import com.android.settings.R;
+import com.android.settings.Utils;
 
 /**
  * View which plays an animation to indicate where the sensor is on the device.
@@ -61,13 +62,11 @@
                 R.fraction.fingerprint_sensor_location_fraction_x, 1, 1);
         mFractionCenterY = getResources().getFraction(
                 R.fraction.fingerprint_sensor_location_fraction_y, 1, 1);
-        TypedValue typedValue = new TypedValue();
-        context.getTheme().resolveAttribute(android.R.attr.colorAccent, typedValue, true);
-        int color = getResources().getColor(typedValue.resourceId, null);
+        @ColorInt int colorAccent = Utils.getColorAccent(context);
         mDotPaint.setAntiAlias(true);
         mPulsePaint.setAntiAlias(true);
-        mDotPaint.setColor(color);
-        mPulsePaint.setColor(color);
+        mDotPaint.setColor(colorAccent);
+        mPulsePaint.setColor(colorAccent);
         mLinearOutSlowInInterpolator = AnimationUtils.loadInterpolator(context,
                 android.R.interpolator.linear_out_slow_in);
         mFastOutSlowInInterpolator = AnimationUtils.loadInterpolator(context,
diff --git a/src/com/android/settings/fingerprint/FingerprintUiHelper.java b/src/com/android/settings/fingerprint/FingerprintUiHelper.java
index 6e7f8ec..f7ec97b 100644
--- a/src/com/android/settings/fingerprint/FingerprintUiHelper.java
+++ b/src/com/android/settings/fingerprint/FingerprintUiHelper.java
@@ -67,7 +67,7 @@
         }
     }
 
-    private boolean isListening() {
+    public boolean isListening() {
         return mCancellationSignal != null && !mCancellationSignal.isCanceled();
     }
 
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
index b037c2b..8bd495e 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
@@ -31,11 +31,8 @@
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
-import com.android.setupwizardlib.util.SystemBarHelper;
-import com.android.setupwizardlib.view.NavigationBar;
 
-public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling
-        implements NavigationBar.NavigationBarListener {
+public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling {
 
     private static final String TAG_DIALOG = "dialog";
 
@@ -54,32 +51,21 @@
 
     @Override
     protected void initViews() {
-        SetupWizardUtils.setImmersiveMode(this);
+        super.initViews();
+        final Button skipButton = (Button) findViewById(R.id.skip_button);
+        skipButton.setVisibility(View.VISIBLE);
+        skipButton.setOnClickListener(this);
+    }
 
-        final View buttonBar = findViewById(R.id.button_bar);
-        if (buttonBar != null) {
-            buttonBar.setVisibility(View.GONE);
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.skip_button:
+                new SkipDialog().show(getFragmentManager(), TAG_DIALOG);
+                break;
+            default:
+                super.onClick(v);
         }
-
-        final NavigationBar navigationBar = getNavigationBar();
-        navigationBar.setNavigationBarListener(this);
-        navigationBar.getNextButton().setText(R.string.skip_label);
-        navigationBar.getBackButton().setVisibility(View.GONE);
-    }
-
-    @Override
-    protected Button getNextButton() {
-        return getNavigationBar().getNextButton();
-    }
-
-    @Override
-    public void onNavigateBack() {
-        onBackPressed();
-    }
-
-    @Override
-    public void onNavigateNext() {
-        new SkipDialog().show(getFragmentManager(), TAG_DIALOG);
     }
 
     @Override
@@ -102,7 +88,7 @@
 
         @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
-            final AlertDialog dialog = new AlertDialog.Builder(getActivity())
+            return new AlertDialog.Builder(getActivity())
                     .setTitle(R.string.setup_fingerprint_enroll_enrolling_skip_title)
                     .setMessage(R.string.setup_fingerprint_enroll_enrolling_skip_message)
                     .setCancelable(false)
@@ -124,8 +110,6 @@
                                 }
                             })
                     .create();
-            SystemBarHelper.hideSystemBars(dialog);
-            return dialog;
         }
     }
 }
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
index 9cf5369..baf4fcd 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
@@ -19,21 +19,17 @@
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.UserHandle;
-import android.view.View;
-import android.widget.Button;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
-import com.android.setupwizardlib.view.NavigationBar;
 
-public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSensor
-        implements NavigationBar.NavigationBarListener {
+public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSensor {
 
     @Override
     protected int getContentView() {
-        return R.layout.setup_fingerprint_enroll_find_sensor;
+        return R.layout.fingerprint_enroll_find_sensor;
     }
 
     @Override
@@ -54,34 +50,6 @@
     }
 
     @Override
-    protected void initViews() {
-        SetupWizardUtils.setImmersiveMode(this);
-
-        final View nextButton = findViewById(R.id.next_button);
-        if (nextButton != null) {
-            nextButton.setVisibility(View.GONE);
-        }
-
-        getNavigationBar().setNavigationBarListener(this);
-        getNavigationBar().getBackButton().setVisibility(View.GONE);
-    }
-
-    @Override
-    protected Button getNextButton() {
-        return getNavigationBar().getNextButton();
-    }
-
-    @Override
-    public void onNavigateBack() {
-        onBackPressed();
-    }
-
-    @Override
-    public void onNavigateNext() {
-        onNextButtonClick();
-    }
-
-    @Override
     protected int getMetricsCategory() {
         return MetricsEvent.FINGERPRINT_FIND_SENSOR_SETUP;
     }
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
index b17ed09..f6602f3 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
@@ -20,17 +20,14 @@
 import android.content.res.Resources;
 import android.os.UserHandle;
 import android.view.View;
-import android.widget.Button;
 import android.widget.TextView;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
-import com.android.setupwizardlib.view.NavigationBar;
 
-public class SetupFingerprintEnrollFinish extends FingerprintEnrollFinish
-        implements NavigationBar.NavigationBarListener {
+public class SetupFingerprintEnrollFinish extends FingerprintEnrollFinish {
 
     @Override
     protected Intent getEnrollingIntent() {
@@ -51,16 +48,7 @@
 
     @Override
     protected void initViews() {
-        SetupWizardUtils.setImmersiveMode(this);
-
-        final View nextButton = findViewById(R.id.next_button);
-        if (nextButton != null) {
-            nextButton.setVisibility(View.GONE);
-        }
-
-        final NavigationBar navigationBar = getNavigationBar();
-        navigationBar.setNavigationBarListener(this);
-        navigationBar.getBackButton().setVisibility(View.GONE);
+        super.initViews();
 
         final TextView message = (TextView) findViewById(R.id.message);
         message.setText(R.string.setup_fingerprint_enroll_finish_message);
@@ -70,21 +58,6 @@
     }
 
     @Override
-    protected Button getNextButton() {
-        return getNavigationBar().getNextButton();
-    }
-
-    @Override
-    public void onNavigateBack() {
-        onBackPressed();
-    }
-
-    @Override
-    public void onNavigateNext() {
-        onNextButtonClick();
-    }
-
-    @Override
     protected int getMetricsCategory() {
         return MetricsEvent.FINGERPRINT_ENROLL_FINISH_SETUP;
     }
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
index f816682..aac2057 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
@@ -19,20 +19,17 @@
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.UserHandle;
-import android.widget.Button;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
 import com.android.settings.SetupChooseLockGeneric;
 import com.android.settings.SetupWizardUtils;
-import com.android.setupwizardlib.SetupWizardRecyclerLayout;
+import com.android.setupwizardlib.GlifRecyclerLayout;
 import com.android.setupwizardlib.items.Item;
 import com.android.setupwizardlib.items.RecyclerItemAdapter;
-import com.android.setupwizardlib.view.NavigationBar;
 
-public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntroduction
-        implements NavigationBar.NavigationBarListener {
+public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntroduction {
 
     @Override
     protected Intent getChooseLockIntent() {
@@ -56,8 +53,7 @@
 
     @Override
     protected void initViews() {
-        final SetupWizardRecyclerLayout layout =
-                (SetupWizardRecyclerLayout) findViewById(R.id.setup_wizard_layout);
+        GlifRecyclerLayout layout = (GlifRecyclerLayout) getLayout();
         final RecyclerItemAdapter adapter = (RecyclerItemAdapter) layout.getAdapter();
         final Item nextItem = (Item) adapter.findItemById(R.id.next_button);
         nextItem.setTitle(
@@ -66,14 +62,6 @@
         final Item cancelItem = (Item) adapter.findItemById(R.id.cancel_button);
         cancelItem.setTitle(
                 getText(R.string.security_settings_fingerprint_enroll_introduction_cancel_setup));
-
-        SetupWizardUtils.setImmersiveMode(this);
-        getNavigationBar().setNavigationBarListener(this);
-        Button nextButton = getNavigationBar().getNextButton();
-        nextButton.setText(null);
-        nextButton.setEnabled(false);
-        layout.setDividerInset(getResources().getDimensionPixelSize(
-                R.dimen.suw_items_icon_divider_inset));
     }
 
     @Override
@@ -98,16 +86,6 @@
     }
 
     @Override
-    public void onNavigateBack() {
-        onBackPressed();
-    }
-
-    @Override
-    public void onNavigateNext() {
-        // next is handled via the onNextButtonClick method in FingerprintEnrollIntroduction
-    }
-
-    @Override
     protected int getMetricsCategory() {
         return MetricsEvent.FINGERPRINT_ENROLL_INTRO_SETUP;
     }
diff --git a/src/com/android/settings/fingerprint/SetupSkipDialog.java b/src/com/android/settings/fingerprint/SetupSkipDialog.java
index 11e6936..c6e04d7 100644
--- a/src/com/android/settings/fingerprint/SetupSkipDialog.java
+++ b/src/com/android/settings/fingerprint/SetupSkipDialog.java
@@ -22,17 +22,10 @@
 import android.app.DialogFragment;
 import android.app.FragmentManager;
 import android.content.DialogInterface;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
-import android.os.Handler;
 import android.support.annotation.NonNull;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
 
 import com.android.settings.R;
-import com.android.setupwizardlib.util.SystemBarHelper;
 
 public class SetupSkipDialog extends DialogFragment implements DialogInterface.OnClickListener {
 
@@ -52,10 +45,7 @@
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        final AlertDialog dialog = onCreateDialogBuilder().create();
-        // hide system status bar.
-        SystemBarHelper.hideSystemBars(dialog);
-        return dialog;
+        return onCreateDialogBuilder().create();
     }
 
     @NonNull
diff --git a/src/com/android/settings/gestures/GesturePreference.java b/src/com/android/settings/gestures/GesturePreference.java
new file mode 100644
index 0000000..76ceba4
--- /dev/null
+++ b/src/com/android/settings/gestures/GesturePreference.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.PorterDuff;
+import android.graphics.SurfaceTexture;
+import android.media.MediaMetadataRetriever;
+import android.media.MediaPlayer;
+import android.net.Uri;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.Surface;
+import android.view.TextureView;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.util.AttributeSet;
+import android.util.Log;
+
+import com.android.settings.R;
+
+/**
+ * Preference item for a gesture with a switch to signify if it should be enabled.
+ * This shows the title and description of the gesture along with an animation showing how to do
+ * the gesture
+ */
+public final class GesturePreference extends SwitchPreference {
+    private static final String TAG = "GesturePreference";
+    private final Context mContext;
+
+    private Uri mVideoPath;
+    private MediaPlayer mMediaPlayer;
+    private MediaMetadataRetriever mMediaMetadata;
+    private boolean animationAvailable;
+
+    public GesturePreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mContext = context;
+        setLayoutResource(R.layout.gesture_preference);
+        TypedArray attributes = context.getTheme().obtainStyledAttributes(
+                attrs,
+                R.styleable.GesturePreference,
+                0, 0);
+        try {
+            int animation = attributes.getResourceId(R.styleable.GesturePreference_animation, 0);
+            mVideoPath = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
+                    .authority(context.getPackageName())
+                    .appendPath(String.valueOf(animation))
+                    .build();
+            mMediaMetadata = new MediaMetadataRetriever();
+            mMediaMetadata.setDataSource(mContext, mVideoPath);
+            animationAvailable = true;
+        } catch (Exception e) {
+            Log.w(TAG, "Animation resource not found. Will not show animation.");
+        } finally {
+            attributes.recycle();
+        }
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder holder) {
+        super.onBindViewHolder(holder);
+        holder.setDividerAllowedAbove(false);
+        holder.setDividerAllowedBelow(false);
+        final TextureView video = (TextureView) holder.findViewById(R.id.gesture_video);
+        final ImageView imageView = (ImageView) holder.findViewById(R.id.gesture_image);
+        final ImageView playButton = (ImageView) holder.findViewById(R.id.gesture_play_button);
+        final View animationFrame = holder.findViewById(R.id.gesture_animation_frame);
+
+        if (!animationAvailable) {
+            animationFrame.setVisibility(View.GONE);
+            return;
+        }
+
+        Bitmap bitmap = mMediaMetadata.getFrameAtTime(0);
+        if (bitmap != null) {
+            imageView.setImageDrawable(new BitmapDrawable(bitmap));
+            imageView.setColorFilter(mContext.getResources().getColor(
+                    R.color.gestures_setting_background_color), PorterDuff.Mode.DARKEN);
+        }
+        imageView.setVisibility(View.VISIBLE);
+        playButton.setVisibility(View.VISIBLE);
+
+        video.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mMediaPlayer != null) {
+                    if (mMediaPlayer.isPlaying()) {
+                        mMediaPlayer.pause();
+                        playButton.setVisibility(View.VISIBLE);
+                    } else {
+                        mMediaPlayer.start();
+                        playButton.setVisibility(View.GONE);
+                    }
+                }
+            }
+        });
+
+        video.setSurfaceTextureListener(new TextureView.SurfaceTextureListener() {
+            @Override
+            public void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture, int width,
+                    int height) {
+                animationFrame.setLayoutParams(new LinearLayout.LayoutParams(width, width));
+                mMediaPlayer = MediaPlayer.create(mContext, mVideoPath);
+                if (mMediaPlayer != null) {
+                    mMediaPlayer.setSurface(new Surface(surfaceTexture));
+                    mMediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
+                        @Override
+                        public void onPrepared(MediaPlayer mediaPlayer) {
+                            mediaPlayer.setLooping(true);
+                        }
+                    });
+                }
+            }
+
+            @Override
+            public void onSurfaceTextureSizeChanged(SurfaceTexture surfaceTexture, int width,
+                    int height) {
+            }
+
+            @Override
+            public boolean onSurfaceTextureDestroyed(SurfaceTexture surfaceTexture) {
+                imageView.setVisibility(View.VISIBLE);
+                if (mMediaPlayer != null) {
+                    mMediaPlayer.stop();
+                    mMediaPlayer.reset();
+                    mMediaPlayer.release();
+                }
+                return false;
+            }
+
+            @Override
+            public void onSurfaceTextureUpdated(SurfaceTexture surfaceTexture) {
+                if (mMediaPlayer.isPlaying() && imageView.getVisibility() == View.VISIBLE) {
+                    imageView.setVisibility(View.GONE);
+                }
+            }
+        });
+
+    }
+
+    @Override
+    public void onDetached() {
+        mMediaMetadata.release();
+        super.onDetached();
+    }
+
+}
diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java
new file mode 100644
index 0000000..cafba68
--- /dev/null
+++ b/src/com/android/settings/gestures/GestureSettings.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.SystemProperties;
+import android.provider.SearchIndexableResource;
+import android.provider.Settings.Global;
+import android.provider.Settings.Secure;
+import android.support.v7.preference.Preference;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.internal.logging.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.SettingsPreferenceFragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Top level fragment for gesture settings.
+ * This will create individual switch preference for each gesture and handle updates when each
+ * preference is updated
+ */
+public class GestureSettings extends SettingsPreferenceFragment implements
+        Preference.OnPreferenceChangeListener, Indexable {
+
+    private static final String TAG = "GestureSettings";
+    private static final String PREF_KEY_DOUBLE_TAP_POWER = "gesture_double_tap_power";
+    private static final String PREF_KEY_DOUBLE_TWIST = "gesture_double_twist";
+    private static final String PREF_KEY_PICK_UP_AND_NUDGE = "gesture_pick_up_and_nudge";
+    private static final String PREF_KEY_SWIPE_DOWN_FINGERPRINT = "gesture_swipe_down_fingerprint";
+    private static final String DEBUG_DOZE_COMPONENT = "debug.doze.component";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.gesture_settings);
+        Context context = getActivity();
+
+         // Double tap power for camera
+        if (isCameraDoubleTapPowerGestureAvailable(getResources())) {
+            int cameraDisabled = Secure.getInt(
+                    getContentResolver(), Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0);
+            GesturePreference preference =
+                    (GesturePreference) findPreference(PREF_KEY_DOUBLE_TAP_POWER);
+            preference.setChecked(cameraDisabled == 0);
+            preference.setOnPreferenceChangeListener(this);
+        } else {
+            removePreference(PREF_KEY_DOUBLE_TAP_POWER);
+        }
+
+        // Ambient Display
+        if (isDozeAvailable(context)) {
+            GesturePreference preference =
+                    (GesturePreference) findPreference(PREF_KEY_PICK_UP_AND_NUDGE);
+            int dozeEnabled = Secure.getInt(getContentResolver(), Secure.DOZE_ENABLED, 1);
+            preference.setChecked(dozeEnabled != 0);
+            preference.setOnPreferenceChangeListener(this);
+        } else {
+            removePreference(PREF_KEY_PICK_UP_AND_NUDGE);
+        }
+
+        // Fingerprint slide for notifications
+        if (isSystemUINavigationAvailable(context)) {
+            GesturePreference preference =
+                    (GesturePreference) findPreference(PREF_KEY_SWIPE_DOWN_FINGERPRINT);
+            preference.setChecked(isSystemUINavigationEnabled(context));
+            preference.setOnPreferenceChangeListener(this);
+        } else {
+            removePreference(PREF_KEY_SWIPE_DOWN_FINGERPRINT);
+        }
+
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        boolean enabled = (boolean) newValue;
+        String key = preference.getKey();
+        if (PREF_KEY_DOUBLE_TAP_POWER.equals(key)) {
+            Secure.putInt(getContentResolver(),
+                    Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, enabled ? 0 : 1);
+        } else if (PREF_KEY_PICK_UP_AND_NUDGE.equals(key)) {
+            Secure.putInt(getContentResolver(), Secure.DOZE_ENABLED, enabled ? 1 : 0);
+        } else if (PREF_KEY_SWIPE_DOWN_FINGERPRINT.equals(key)) {
+            Global.putInt(getContentResolver(),
+                    Global.SYSTEM_NAVIGATION_KEYS_ENABLED, enabled ? 1 : 0);
+        }
+        return true;
+    }
+
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_gestures;
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsEvent.SETTINGS_GESTURES;
+    }
+
+    private static boolean isCameraDoubleTapPowerGestureAvailable(Resources res) {
+        return res.getBoolean(
+                com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled);
+    }
+
+    private static boolean isDozeAvailable(Context context) {
+        String name = Build.IS_DEBUGGABLE ? SystemProperties.get(DEBUG_DOZE_COMPONENT) : null;
+        if (TextUtils.isEmpty(name)) {
+            name = context.getResources().getString(
+                    com.android.internal.R.string.config_dozeComponent);
+        }
+        return !TextUtils.isEmpty(name);
+    }
+
+    private static boolean isSystemUINavigationAvailable(Context context) {
+        return context.getResources().getBoolean(
+                com.android.internal.R.bool.config_supportSystemNavigationKeys);
+    }
+
+    private static boolean isSystemUINavigationEnabled(Context context) {
+        return Global.getInt(context.getContentResolver(), Global.SYSTEM_NAVIGATION_KEYS_ENABLED, 1)
+                == 1;
+    }
+
+    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<SearchIndexableResource>();
+
+                SearchIndexableResource sir = new SearchIndexableResource(context);
+                sir.xmlResId = R.xml.gesture_settings;
+                result.add(sir);
+
+                return result;
+            }
+
+            @Override
+            public List<String> getNonIndexableKeys(Context context) {
+                ArrayList<String> result = new ArrayList<String>();
+                if (!isCameraDoubleTapPowerGestureAvailable(context.getResources())) {
+                    result.add(PREF_KEY_DOUBLE_TAP_POWER);
+                }
+                if (!isDozeAvailable(context)) {
+                    result.add(PREF_KEY_PICK_UP_AND_NUDGE);
+                }
+                if (!isSystemUINavigationAvailable(context)) {
+                    result.add(PREF_KEY_SWIPE_DOWN_FINGERPRINT);
+                }
+                return result;
+            }
+        };
+
+}
\ No newline at end of file
diff --git a/src/com/android/settings/notification/ImportanceSeekBarPreference.java b/src/com/android/settings/notification/ImportanceSeekBarPreference.java
index b21f9ce..0617df9 100644
--- a/src/com/android/settings/notification/ImportanceSeekBarPreference.java
+++ b/src/com/android/settings/notification/ImportanceSeekBarPreference.java
@@ -31,6 +31,7 @@
 import android.widget.ImageView;
 import android.widget.SeekBar;
 import android.widget.TextView;
+import com.android.settings.Utils;
 
 /**
  * A slider preference that controls notification importance.
@@ -55,8 +56,7 @@
             int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
         setLayoutResource(R.layout.preference_importance_slider);
-        mActiveSliderTint = ColorStateList.valueOf(
-                context.getColor(R.color.importance_slider_color));
+        mActiveSliderTint = ColorStateList.valueOf(Utils.getColorAccent(context));
         mInactiveSliderTint = ColorStateList.valueOf(
                 context.getColor(R.color.importance_disabled_slider_color));
         mHandler = new Handler();
diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java
index 4aa5ec8..ab5d834 100644
--- a/src/com/android/settings/notification/RedactionInterstitial.java
+++ b/src/com/android/settings/notification/RedactionInterstitial.java
@@ -25,8 +25,9 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CheckBox;
+import android.widget.Button;
 import android.widget.CompoundButton;
+import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.TextView;
@@ -59,6 +60,13 @@
         return RedactionInterstitialFragment.class.getName().equals(fragmentName);
     }
 
+    @Override
+    protected void onCreate(Bundle savedInstance) {
+        super.onCreate(savedInstance);
+        LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
+        layout.setFitsSystemWindows(false);
+    }
+
     /**
      * Create an intent for launching RedactionInterstitial.
      * @return An intent to launch the activity is if is available, @null if the activity is not
@@ -66,10 +74,6 @@
      */
     public static Intent createStartIntent(Context ctx, int userId) {
         return new Intent(ctx, RedactionInterstitial.class)
-                .putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, true)
-                .putExtra(EXTRA_PREFS_SET_BACK_TEXT, (String) null)
-                .putExtra(EXTRA_PREFS_SET_NEXT_TEXT, ctx.getString(
-                        R.string.app_notifications_dialog_done))
                 .putExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID,
                         Utils.isManagedProfile(UserManager.get(ctx), userId)
                             ? R.string.lock_screen_notifications_interstitial_title_profile
@@ -78,7 +82,7 @@
     }
 
     public static class RedactionInterstitialFragment extends SettingsPreferenceFragment
-            implements RadioGroup.OnCheckedChangeListener {
+            implements RadioGroup.OnCheckedChangeListener, View.OnClickListener {
 
         private RadioGroup mRadioGroup;
         private RestrictedRadioButton mShowAllButton;
@@ -116,6 +120,20 @@
                 ((RadioButton) view.findViewById(R.id.hide_all))
                     .setText(R.string.lock_screen_notifications_summary_disable_profile);
             }
+
+            final Button button = (Button) view.findViewById(R.id.redaction_done_button);
+            button.setOnClickListener(this);
+        }
+
+        @Override
+        public void onClick(View v) {
+            if (v.getId() == R.id.redaction_done_button) {
+                final RedactionInterstitial activity = (RedactionInterstitial) getActivity();
+                if (activity != null) {
+                    activity.setResult(RESULT_OK, activity.getResultIntentData());
+                    finish();
+                }
+            }
         }
 
         @Override
diff --git a/src/com/android/settings/overlay/FeatureFactory.java b/src/com/android/settings/overlay/FeatureFactory.java
new file mode 100644
index 0000000..1bffc2b
--- /dev/null
+++ b/src/com/android/settings/overlay/FeatureFactory.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.overlay;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.settings.R;
+
+/**
+ * Abstract class for creating feature controllers. Allows OEM implementations to define their own
+ * factories with their own controllers containing whatever code is needed to implement
+ * the features. To provide a factory implementation, implementors should override
+ * {@link R.string#config_featureFactory} in their override.
+ */
+public abstract class FeatureFactory {
+    private static final String LOG_TAG = "FeatureFactory";
+    private static final boolean DEBUG = false;
+
+    private static FeatureFactory sFactory;
+
+    /**
+     * Returns a factory for creating feature controllers. Creates the factory if it does not
+     * already exist. Uses the value of {@link R.string#config_featureFactory} to instantiate
+     * a factory implementation.
+     */
+    public static FeatureFactory getFactory(Context context) {
+        if (sFactory != null) {
+            return sFactory;
+        }
+
+        if (DEBUG) Log.d(LOG_TAG, "getFactory");
+        final String clsName = context.getString(R.string.config_featureFactory);
+        if (TextUtils.isEmpty(clsName)) {
+            throw new UnsupportedOperationException("No feature factory configured");
+        }
+        try {
+            sFactory = (FeatureFactory) context.getClassLoader().loadClass(clsName).newInstance();
+        } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
+            throw new FactoryNotFoundException(e);
+        }
+
+        if (DEBUG) Log.d(LOG_TAG, "started " + sFactory.getClass().getSimpleName());
+        return sFactory;
+    }
+
+    public abstract SupportFeatureProvider getSupportFeatureProvider(Context context);
+
+    public static final class FactoryNotFoundException extends RuntimeException {
+        public FactoryNotFoundException(Throwable throwable) {
+            super("Unable to create factory. Did you misconfigure Proguard?", throwable);
+        }
+    }
+}
diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java
new file mode 100644
index 0000000..ce561f3
--- /dev/null
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.overlay;
+
+import android.content.Context;
+
+/**
+ * {@link FeatureFactory} implementation for AOSP Settings.
+ */
+public final class FeatureFactoryImpl extends FeatureFactory {
+
+    @Override
+    public SupportFeatureProvider getSupportFeatureProvider(Context context) {
+        return null;
+    }
+
+}
diff --git a/src/com/android/settings/overlay/SupportFeatureProvider.java b/src/com/android/settings/overlay/SupportFeatureProvider.java
new file mode 100644
index 0000000..c535622
--- /dev/null
+++ b/src/com/android/settings/overlay/SupportFeatureProvider.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.overlay;
+
+import android.accounts.Account;
+import android.annotation.IntDef;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+
+import com.android.settings.support.SupportPhone;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.List;
+
+/**
+ * Feature provider for support tab.
+ */
+public interface SupportFeatureProvider {
+
+    @IntDef({SupportType.EMAIL, SupportType.PHONE, SupportType.CHAT})
+    @Retention(RetentionPolicy.SOURCE)
+    @interface SupportType {
+        int EMAIL = 1;
+        int PHONE = 2;
+        int CHAT = 3;
+    }
+
+    /**
+     * Returns a intent that will open help & feedback.
+     */
+    Intent getHelpIntent(Context context);
+
+    /**
+     * Whether or not a support type is enabled.
+     */
+    boolean isSupportTypeEnabled(Context context, @SupportType int type);
+
+    /**
+     * Whether or not a support type is in operation 24/7. If country is null, use
+     * current country.
+     */
+    boolean isAlwaysOperating(@SupportType int type, String countryCode);
+
+    /**
+     * Whether or not a support type is operating now.
+     */
+    boolean isOperatingNow(@SupportType int type);
+
+    /**
+     * Returns the current country code if it has a operation config, otherwise returns null.
+     */
+    String getCurrentCountryCodeIfHasConfig(@SupportType int type);
+
+    /**
+     * Returns localized string for operation hours in specified country. If country is null, use
+     * current country to figure out operation hours.
+     */
+    CharSequence getOperationHours(Context context, @SupportType int type, String countryCode);
+
+    /**
+     * Returns a localized string indicating estimated wait time for a support time.
+     */
+    String getEstimatedWaitTime(Context context, @SupportType int type);
+
+    /**
+     * Returns a list of country codes that have phone support.
+     */
+    List<String> getPhoneSupportCountryCodes();
+
+    /**
+     * Returns a list of countries that have phone support.
+     */
+    List<String> getPhoneSupportCountries();
+
+    /**
+     * Returns a support phone for specified country.
+     */
+    SupportPhone getSupportPhones(String countryCode, boolean isTollfree);
+
+    /**
+     * Whether or not a disclaimer dialog should be displayed.
+     */
+    boolean shouldShowDisclaimerDialog(Context context);
+
+    /**
+     * Sets whether or not a disclaimer dialog should be displayed.
+     */
+    void setShouldShowDisclaimerDialog(Context context, boolean shouldShow);
+
+    /**
+     * Returns an {@link Account} that's eligible for support options.
+     */
+    Account getSupportEligibleAccount(Context context);
+
+    /**
+     * Starts support activity of specified type
+     *
+     * @param activity Calling activity
+     * @param account A account returned by {@link #getSupportEligibleAccount}
+     * @param type The type of support account needs.
+     */
+    void startSupport(Activity activity, Account account, @SupportType int type);
+
+    /**
+     * Returns an {@link Intent} that opens help and allow user get help on sign in.
+     */
+    Intent getSignInHelpIntent(Context context);
+
+    /**
+     * Returns an intent that will start the add account UI.
+     */
+    Intent getAccountLoginIntent();
+
+    /**
+     * Returns an intent that will launch the tips and tricks UI.
+     */
+    Intent getTipsAndTricksIntent(Context context);
+}
diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java
index 08bbd97..dc7df52 100644
--- a/src/com/android/settings/print/PrintJobSettingsFragment.java
+++ b/src/com/android/settings/print/PrintJobSettingsFragment.java
@@ -26,11 +26,13 @@
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 
+import android.view.ViewGroup;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
@@ -70,8 +72,9 @@
     }
 
     @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        View view = super.onCreateView(inflater, container, savedInstanceState);
 
         addPreferencesFromResource(R.xml.print_job_settings);
         mPrintJobPreference = findPreference(PRINT_JOB_PREFERENCE);
@@ -86,6 +89,8 @@
         processArguments();
 
         setHasOptionsMenu(true);
+
+        return  view;
     }
 
     @Override
diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index 42d8a8d..6ef900b 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -39,6 +39,7 @@
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.TypedValue;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -132,8 +133,9 @@
     }
 
     @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        View root = super.onCreateView(inflater, container, savedInstanceState);
 
         mServiceEnabled = getArguments().getBoolean(PrintSettingsFragment.EXTRA_CHECKED);
 
@@ -141,6 +143,8 @@
         if (!TextUtils.isEmpty(title)) {
             getActivity().setTitle(title);
         }
+
+        return root;
     }
 
     @Override
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index 82a18ee..49d254c 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -43,6 +43,7 @@
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
@@ -104,8 +105,9 @@
     }
 
     @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        View root = super.onCreateView(inflater, container, savedInstanceState);
         addPreferencesFromResource(R.xml.print_settings);
 
         mActivePrintJobsCategory = (PreferenceCategory) findPreference(
@@ -119,6 +121,8 @@
 
         mPrintServicesController = new PrintServicesController();
         getLoaderManager().initLoader(LOADER_ID_PRINT_SERVICES, null, mPrintServicesController);
+
+        return root;
     }
 
     @Override
diff --git a/src/com/android/settings/search/Index.java b/src/com/android/settings/search/Index.java
index fd67ea6..976c6fb 100644
--- a/src/com/android/settings/search/Index.java
+++ b/src/com/android/settings/search/Index.java
@@ -1165,17 +1165,6 @@
         return result.toString();
     }
 
-    private int getResId(Context context, AttributeSet set, int[] attrs, int resId) {
-        final TypedArray sa = context.obtainStyledAttributes(set, attrs);
-        final TypedValue tv = sa.peekValue(resId);
-
-        if (tv != null && tv.type == TypedValue.TYPE_STRING) {
-            return tv.resourceId;
-        } else {
-            return 0;
-        }
-   }
-
     /**
      * A private class for updating the Index database
      */
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index 08a0d0c..ff633e0 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -272,7 +272,7 @@
         sResMap.put(DateTimeSettings.class.getName(),
                 new SearchIndexableResource(
                         Ranking.getRankForClassName(DateTimeSettings.class.getName()),
-                        R.xml.date_time_prefs,
+                        NO_DATA_RES_ID,
                         DateTimeSettings.class.getName(),
                         R.drawable.ic_settings_date_time));
 
diff --git a/src/com/android/settings/support/SupportDisclaimerDialogFragment.java b/src/com/android/settings/support/SupportDisclaimerDialogFragment.java
new file mode 100644
index 0000000..db74f0f
--- /dev/null
+++ b/src/com/android/settings/support/SupportDisclaimerDialogFragment.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.support;
+
+import android.accounts.Account;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.text.Spannable;
+import android.text.TextPaint;
+import android.text.method.LinkMovementMethod;
+import android.text.style.URLSpan;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.TextView;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.overlay.SupportFeatureProvider;
+
+/**
+ * {@link DialogFragment} for support disclaimer.
+ */
+public final class SupportDisclaimerDialogFragment extends DialogFragment implements
+        DialogInterface.OnClickListener {
+
+    public static final String TAG = "SupportDisclaimerDialog";
+    private static final String EXTRA_TYPE = "extra_type";
+    private static final String EXTRA_ACCOUNT = "extra_account";
+
+    public static SupportDisclaimerDialogFragment newInstance(Account account,
+            @SupportFeatureProvider.SupportType int type) {
+        final SupportDisclaimerDialogFragment fragment = new SupportDisclaimerDialogFragment();
+        final Bundle bundle = new Bundle(2);
+        bundle.putParcelable(SupportDisclaimerDialogFragment.EXTRA_ACCOUNT, account);
+        bundle.putInt(SupportDisclaimerDialogFragment.EXTRA_TYPE, type);
+        fragment.setArguments(bundle);
+        return fragment;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.support_disclaimer_title)
+                .setPositiveButton(android.R.string.ok, this)
+                .setNegativeButton(android.R.string.cancel, this);
+        final View content = LayoutInflater.from(builder.getContext())
+                .inflate(R.layout.support_disclaimer_content, null);
+        final TextView disclaimer = (TextView) content.findViewById(R.id.support_disclaimer_text);
+        disclaimer.setMovementMethod(LinkMovementMethod.getInstance());
+        stripUnderlines((Spannable) disclaimer.getText());
+        return builder
+                .setView(content)
+                .create();
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        if (which == Dialog.BUTTON_NEGATIVE) {
+            MetricsLogger.action(getContext(),
+                    MetricsProto.MetricsEvent.ACTION_SUPPORT_DISCLAIMER_CANCEL);
+            return;
+        }
+        final Activity activity = getActivity();
+        final CheckBox doNotShow =
+                (CheckBox) getDialog().findViewById(R.id.support_disclaimer_do_not_show_again);
+        final SupportFeatureProvider supportFeatureProvider =
+                FeatureFactory.getFactory(activity).getSupportFeatureProvider(activity);
+        supportFeatureProvider.setShouldShowDisclaimerDialog(getContext(), !doNotShow.isChecked());
+        final Bundle bundle = getArguments();
+        MetricsLogger.action(activity, MetricsProto.MetricsEvent.ACTION_SUPPORT_DISCLAIMER_OK);
+        supportFeatureProvider.startSupport(getActivity(),
+                (Account) bundle.getParcelable(EXTRA_ACCOUNT), bundle.getInt(EXTRA_TYPE));
+    }
+
+    @Override
+    public void onCancel(DialogInterface dialog) {
+        super.onCancel(dialog);
+        MetricsLogger.action(getContext(),
+                MetricsProto.MetricsEvent.ACTION_SUPPORT_DISCLAIMER_CANCEL);
+    }
+
+    /**
+     * Removes the underlines of {@link android.text.style.URLSpan}s.
+     */
+    private static void stripUnderlines(Spannable input) {
+        final URLSpan[] urls = input.getSpans(0, input.length(), URLSpan.class);
+
+        for (URLSpan span : urls) {
+            final int start = input.getSpanStart(span);
+            final int end = input.getSpanEnd(span);
+            input.removeSpan(span);
+            input.setSpan(new NoUnderlineUrlSpan(span.getURL()), start, end,
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+    }
+
+    /**
+     * A {@link URLSpan} that doesn't decorate the link with underline.
+     */
+    public static class NoUnderlineUrlSpan extends URLSpan {
+
+        public NoUnderlineUrlSpan(String url) {
+            super(url);
+        }
+
+        @Override
+        public void updateDrawState(TextPaint ds) {
+            super.updateDrawState(ds);
+            ds.setUnderlineText(false);
+        }
+    }
+}
diff --git a/src/com/android/settings/support/SupportPhone.java b/src/com/android/settings/support/SupportPhone.java
new file mode 100644
index 0000000..d27dca5
--- /dev/null
+++ b/src/com/android/settings/support/SupportPhone.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.support;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.text.TextUtils;
+
+import java.text.ParseException;
+
+/**
+ * Data model for a support phone number.
+ */
+public final class SupportPhone implements Parcelable {
+
+    public final String language;
+    public final String number;
+    public final boolean isTollFree;
+
+    public SupportPhone(String config) throws ParseException {
+        // Config follows this format: language:[tollfree|tolled]:number
+        final String[] tokens = config.split(":");
+        if (tokens.length != 3) {
+            throw new ParseException("Phone config is invalid " + config, 0);
+        }
+        language = tokens[0];
+        isTollFree = TextUtils.equals(tokens[1], "tollfree");
+        number = tokens[2];
+    }
+
+    protected SupportPhone(Parcel in) {
+        language = in.readString();
+        number = in.readString();
+        isTollFree = in.readInt() != 0;
+    }
+
+    public Intent getDialIntent() {
+        return new Intent(Intent.ACTION_DIAL)
+                .setData(new Uri.Builder()
+                        .scheme("tel")
+                        .appendPath(number)
+                        .build());
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(language);
+        dest.writeString(number);
+        dest.writeInt(isTollFree ? 1 : 0);
+    }
+
+    public static final Creator<SupportPhone> CREATOR = new Creator<SupportPhone>() {
+        @Override
+        public SupportPhone createFromParcel(Parcel in) {
+            return new SupportPhone(in);
+        }
+
+        @Override
+        public SupportPhone[] newArray(int size) {
+            return new SupportPhone[size];
+        }
+    };
+}
diff --git a/src/com/android/settings/support/SupportPhoneDialogFragment.java b/src/com/android/settings/support/SupportPhoneDialogFragment.java
new file mode 100644
index 0000000..bba6238
--- /dev/null
+++ b/src/com/android/settings/support/SupportPhoneDialogFragment.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.support;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+
+import com.android.settings.R;
+
+import java.util.Locale;
+
+/**
+ * A dialog fragment that displays support phone numbers.
+ */
+public final class SupportPhoneDialogFragment extends DialogFragment implements
+        View.OnClickListener {
+
+    public static final String TAG = "SupportPhoneDialog";
+    private static final String EXTRA_PHONE = "extra_phone";
+
+    public static SupportPhoneDialogFragment newInstance(SupportPhone phone) {
+        final SupportPhoneDialogFragment fragment = new SupportPhoneDialogFragment();
+        final Bundle bundle = new Bundle(2);
+        bundle.putParcelable(EXTRA_PHONE, phone);
+        fragment.setArguments(bundle);
+        return fragment;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final SupportPhone phone = getArguments().getParcelable(EXTRA_PHONE);
+        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.support_international_phone_title);
+        final View content = LayoutInflater.from(builder.getContext())
+                .inflate(R.layout.support_phone_dialog_content, null);
+        final View phoneNumberContainer = content.findViewById(R.id.phone_number_container);
+        final TextView phoneView = (TextView) content.findViewById(R.id.phone_number);
+        final String formattedPhoneNumber = getContext().getString(
+                R.string.support_phone_international_format,
+                new Locale(phone.language).getDisplayLanguage(), phone.number);
+        phoneView.setText(formattedPhoneNumber);
+        phoneNumberContainer.setOnClickListener(this);
+        return builder
+                .setView(content)
+                .create();
+    }
+
+    @Override
+    public void onClick(View v) {
+        final SupportPhone phone = getArguments().getParcelable(EXTRA_PHONE);
+        getActivity().startActivity(phone.getDialIntent());
+        dismiss();
+    }
+}
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index d6b189b..0975cba 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -615,9 +615,9 @@
         }
     }
 
-    private boolean emergencyInfoActivityPresent() {
+    private static boolean emergencyInfoActivityPresent(Context context) {
         Intent intent = new Intent(ACTION_EDIT_EMERGENCY_INFO).setPackage("com.android.emergency");
-        List<ResolveInfo> infos = getContext().getPackageManager().queryIntentActivities(intent, 0);
+        List<ResolveInfo> infos = context.getPackageManager().queryIntentActivities(intent, 0);
         if (infos == null || infos.isEmpty()) {
             return false;
         }
@@ -863,7 +863,7 @@
                     mUserCaps.mDisallowAddUser ? mUserCaps.mEnforcedAdmin : null);
         }
 
-        if (emergencyInfoActivityPresent()) {
+        if (emergencyInfoActivityPresent(getContext())) {
             mEmergencyInfoPreference.setOnPreferenceClickListener(this);
             mEmergencyInfoPreference.setOrder(Preference.DEFAULT_ORDER);
             preferenceScreen.addPreference(mEmergencyInfoPreference);
@@ -1147,6 +1147,12 @@
                         data.screenTitle = res.getString(R.string.user_settings_title);
                         result.add(data);
                     }
+                    if (emergencyInfoActivityPresent(context)) {
+                        data = new SearchIndexableRaw(context);
+                        data.title = res.getString(R.string.emergency_info_title);
+                        data.screenTitle = res.getString(R.string.emergency_info_title);
+                        result.add(data);
+                    }
                     return result;
                 }
             };
diff --git a/src/com/android/settings/utils/AsyncLoader.java b/src/com/android/settings/utils/AsyncLoader.java
new file mode 100644
index 0000000..76c99fa
--- /dev/null
+++ b/src/com/android/settings/utils/AsyncLoader.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2016 Google Inc.
+ * Licensed to The Android Open Source Project.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.AsyncTaskLoader;
+import android.content.Context;
+
+/**
+ * This class fills in some boilerplate for AsyncTaskLoader to actually load things.
+ *
+ * Subclasses need to implement {@link AsyncLoader#loadInBackground()} to perform the actual
+ * background task, and {@link AsyncLoader#onDiscardResult(T)} to clean up previously loaded
+ * results.
+ *
+ * This loader is based on the MailAsyncTaskLoader from the AOSP EmailUnified repo.
+ */
+public abstract class AsyncLoader<T> extends AsyncTaskLoader<T> {
+    private T mResult;
+
+    public AsyncLoader(final Context context) {
+        super(context);
+    }
+
+    @Override
+    protected void onStartLoading() {
+        if (mResult != null) {
+            deliverResult(mResult);
+        }
+
+        if (takeContentChanged() || mResult == null) {
+            forceLoad();
+        }
+    }
+
+    @Override
+    protected void onStopLoading() {
+        cancelLoad();
+    }
+
+    @Override
+    public void deliverResult(final T data) {
+        if (isReset()) {
+            if (data != null) {
+                onDiscardResult(data);
+            }
+            return;
+        }
+
+        final T oldResult = mResult;
+        mResult = data;
+
+        if (isStarted()) {
+            super.deliverResult(data);
+        }
+
+        if (oldResult != null && oldResult != mResult) {
+            onDiscardResult(oldResult);
+        }
+    }
+
+    @Override
+    protected void onReset() {
+        super.onReset();
+
+        onStopLoading();
+
+        if (mResult != null) {
+            onDiscardResult(mResult);
+        }
+        mResult = null;
+    }
+
+    @Override
+    public void onCanceled(final T data) {
+        super.onCanceled(data);
+
+        if (data != null) {
+            onDiscardResult(data);
+        }
+    }
+
+    /**
+     * Called when discarding the load results so subclasses can take care of clean-up or
+     * recycling tasks. This is not called if the same result (by way of pointer equality) is
+     * returned again by a subsequent call to loadInBackground, or if result is null.
+     *
+     * Note that this may be called concurrently with loadInBackground(), and in some circumstances
+     * may be called more than once for a given object.
+     *
+     * @param result The value returned from {@link AsyncLoader#loadInBackground()} which
+     *               is to be discarded.
+     */
+    protected abstract void onDiscardResult(final T result);
+}
diff --git a/src/com/android/settings/utils/SettingsDividerItemDecoration.java b/src/com/android/settings/utils/SettingsDividerItemDecoration.java
new file mode 100644
index 0000000..451d532
--- /dev/null
+++ b/src/com/android/settings/utils/SettingsDividerItemDecoration.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.utils;
+
+import android.content.Context;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.support.v7.widget.RecyclerView;
+
+import com.android.setupwizardlib.DividerItemDecoration;
+
+public class SettingsDividerItemDecoration extends DividerItemDecoration {
+
+    public SettingsDividerItemDecoration(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected boolean isDividerAllowedAbove(RecyclerView.ViewHolder viewHolder) {
+        if (viewHolder instanceof PreferenceViewHolder) {
+            return ((PreferenceViewHolder) viewHolder).isDividerAllowedAbove();
+        }
+        return super.isDividerAllowedAbove(viewHolder);
+    }
+
+    @Override
+    protected boolean isDividerAllowedBelow(RecyclerView.ViewHolder viewHolder) {
+        if (viewHolder instanceof PreferenceViewHolder) {
+            return ((PreferenceViewHolder) viewHolder).isDividerAllowedBelow();
+        }
+        return super.isDividerAllowedBelow(viewHolder);
+    }
+}
diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java
index 170b128..99d2f55 100644
--- a/src/com/android/settings/vpn2/AppManagementFragment.java
+++ b/src/com/android/settings/vpn2/AppManagementFragment.java
@@ -224,8 +224,14 @@
             mPreferenceForget.checkRestrictionAndSetDisabled(UserManager.DISALLOW_CONFIG_VPN,
                     mUserId);
 
-            if (!checkTargetVersion()) {
+            if (checkTargetVersion()) {
+                // setSummary doesn't override the admin message when user restriction is applied
+                mPreferenceAlwaysOn.setSummary(null);
+                // setEnabled is not required here, as checkRestrictionAndSetDisabled
+                // should have refreshed the enable state.
+            } else {
                 mPreferenceAlwaysOn.setEnabled(false);
+                mPreferenceAlwaysOn.setSummary(R.string.vpn_not_supported_by_this_app);
             }
         }
     }
diff --git a/src/com/android/settings/widget/SlidingTabLayout.java b/src/com/android/settings/widget/SlidingTabLayout.java
new file mode 100644
index 0000000..219d37b
--- /dev/null
+++ b/src/com/android/settings/widget/SlidingTabLayout.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.widget;
+
+import android.content.Context;
+import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.android.settings.R;
+
+/**
+ * To be used with ViewPager to provide a tab indicator component which give constant feedback as
+ * to the user's scroll progress.
+ */
+public final class SlidingTabLayout extends FrameLayout implements View.OnClickListener {
+
+    private final LinearLayout mTitleView;
+    private final View mIndicatorView;
+    private final LayoutInflater mLayoutInflater;
+
+    private ViewPager mViewPager;
+    private int mSelectedPosition;
+    private float mSelectionOffset;
+
+    public SlidingTabLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mLayoutInflater = LayoutInflater.from(context);
+        mTitleView = new LinearLayout(context);
+        mTitleView.setGravity(Gravity.CENTER_HORIZONTAL);
+        mIndicatorView = mLayoutInflater.inflate(R.layout.sliding_tab_indicator_view, this, false);
+
+        addView(mTitleView, LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
+        addView(mIndicatorView, mIndicatorView.getLayoutParams());
+    }
+
+    /**
+     * Sets the associated view pager. Note that the assumption here is that the pager content
+     * (number of tabs and tab titles) does not change after this call has been made.
+     */
+    public void setViewPager(ViewPager viewPager) {
+        mTitleView.removeAllViews();
+
+        mViewPager = viewPager;
+        if (viewPager != null) {
+            viewPager.addOnPageChangeListener(new InternalViewPagerListener());
+            populateTabStrip();
+        }
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        final int titleCount = mTitleView.getChildCount();
+        if (titleCount > 0) {
+            final int width = MeasureSpec.makeMeasureSpec(
+                    mTitleView.getMeasuredWidth() / titleCount, MeasureSpec.EXACTLY);
+            final int height = MeasureSpec.makeMeasureSpec(
+                    mIndicatorView.getMeasuredHeight(), MeasureSpec.EXACTLY);
+            mIndicatorView.measure(width, height);
+        }
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        if (mTitleView.getChildCount() > 0) {
+            mTitleView.layout(0, 0, mTitleView.getMeasuredWidth(), mTitleView.getMeasuredHeight());
+            final int indicatorBottom = getMeasuredHeight();
+            final int indicatorHeight = mIndicatorView.getMeasuredHeight();
+            mIndicatorView.layout(0, indicatorBottom - indicatorHeight,
+                    mIndicatorView.getMeasuredWidth(), indicatorBottom);
+        }
+    }
+
+    @Override
+    public void onClick(View v) {
+        final int titleCount = mTitleView.getChildCount();
+        for (int i = 0; i < titleCount; i++) {
+            if (v == mTitleView.getChildAt(i)) {
+                mViewPager.setCurrentItem(i);
+                return;
+            }
+        }
+    }
+
+    private void onViewPagerPageChanged(int position, float positionOffset) {
+        mSelectedPosition = position;
+        mSelectionOffset = positionOffset;
+        mIndicatorView.setTranslationX(getIndicatorLeft());
+    }
+
+    private void populateTabStrip() {
+        final PagerAdapter adapter = mViewPager.getAdapter();
+
+        for (int i = 0; i < adapter.getCount(); i++) {
+            final TextView tabTitleView = (TextView) mLayoutInflater.inflate(
+                    R.layout.sliding_tab_title_view, mTitleView, false);
+
+            tabTitleView.setText(adapter.getPageTitle(i));
+            tabTitleView.setOnClickListener(this);
+
+            mTitleView.addView(tabTitleView);
+            tabTitleView.setSelected(i == mViewPager.getCurrentItem());
+        }
+    }
+
+    private int getIndicatorLeft() {
+        View selectedTitle = mTitleView.getChildAt(mSelectedPosition);
+        int left = selectedTitle.getLeft();
+        if (mSelectionOffset > 0f && mSelectedPosition < (getChildCount() - 1)) {
+            View nextTitle = mTitleView.getChildAt(mSelectedPosition + 1);
+            left = (int) (mSelectionOffset * nextTitle.getLeft()
+                    + (1.0f - mSelectionOffset) * left);
+        }
+        return left;
+    }
+
+    private final class InternalViewPagerListener implements ViewPager.OnPageChangeListener {
+        private int mScrollState;
+
+        @Override
+        public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+            final int titleCount = mTitleView.getChildCount();
+            if ((titleCount == 0) || (position < 0) || (position >= titleCount)) {
+                return;
+            }
+            onViewPagerPageChanged(position, positionOffset);
+        }
+
+        @Override
+        public void onPageScrollStateChanged(int state) {
+            mScrollState = state;
+        }
+
+        @Override
+        public void onPageSelected(int position) {
+            if (mScrollState == ViewPager.SCROLL_STATE_IDLE) {
+                onViewPagerPageChanged(position, 0f);
+            }
+            final int titleCount = mTitleView.getChildCount();
+            for (int i = 0; i < titleCount; i++) {
+                mTitleView.getChildAt(i).setSelected(position == i);
+            }
+        }
+    }
+}